diff --git a/00_example_libretro.info b/00_example_libretro.info
index 452d7c7..7c633d5 100644
--- a/00_example_libretro.info
+++ b/00_example_libretro.info
@@ -71,12 +71,14 @@
 # load_subsystem = "false"
 # Whether or not the core requires an external file to work:
 # supports_no_game = "false"
+# Does the core have a single purpose? Does it represent one game or application, requiring predetermined support files or no external data? Used to indicate to a frontend that the core may be presented/handled independently from 'regular' cores that run a variety of content.
+# single_purpose = "false"
 # Name of the database that the core supports (optional):
 # database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
 # Does the core support/require support for libretro-gl or other hardware-acceleration in the frontend?
 # hw_render = "false"
 # Which hardware-rendering APIs does the core support? Delimited by pipe characters.
-required_hw_api = "Vulkan >= 1.0 | Direct3D >= 10.0 | OpenGL Core >= 3.3 | OpenGL ES >= 3.0"
+# required_hw_api = "Vulkan >= 1.0 | Direct3D >= 10.0 | OpenGL Core >= 3.3 | OpenGL ES >= 3.0"
 # Does the core require ongoing access to the file after loading? Mostly used for softpatching and streaming of data
 # needs_fullpath = "false"
 # Does the core support the libretro disk control interface for swapping disks on the fly?
diff --git a/2048_libretro.info b/2048_libretro.info
index 9f65130..df66c7f 100644
--- a/2048_libretro.info
+++ b/2048_libretro.info
@@ -14,7 +14,9 @@ systemid = "2048"
 manufacturer = "N/A"
 
 # Libretro Features
+database = "2048"
 supports_no_game = "true"
+single_purpose = "true"
 savestate = "true"
 savestate_features = "serialized"
 cheats = "false"
diff --git a/bsnes2014_accuracy_libretro.info b/bsnes2014_accuracy_libretro.info
index 4f4bb9b..309255f 100644
--- a/bsnes2014_accuracy_libretro.info
+++ b/bsnes2014_accuracy_libretro.info
@@ -81,7 +81,7 @@ libretro_saves = "true"
 core_options = "false"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/bsnes2014_balanced_libretro.info b/bsnes2014_balanced_libretro.info
index ff0cad0..d3e775a 100644
--- a/bsnes2014_balanced_libretro.info
+++ b/bsnes2014_balanced_libretro.info
@@ -81,7 +81,7 @@ libretro_saves = "true"
 core_options = "false"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/bsnes2014_performance_libretro.info b/bsnes2014_performance_libretro.info
index 4390a9f..aa0f4ff 100644
--- a/bsnes2014_performance_libretro.info
+++ b/bsnes2014_performance_libretro.info
@@ -78,7 +78,7 @@ libretro_saves = "true"
 core_options = "false"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/bsnes_cplusplus98_libretro.info b/bsnes_cplusplus98_libretro.info
index b690350..4cdc27f 100644
--- a/bsnes_cplusplus98_libretro.info
+++ b/bsnes_cplusplus98_libretro.info
@@ -23,7 +23,7 @@ libretro_saves = "true"
 core_options = "false"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/bsnes_hd_beta_libretro.info b/bsnes_hd_beta_libretro.info
index 7ff6075..03fe8bb 100644
--- a/bsnes_hd_beta_libretro.info
+++ b/bsnes_hd_beta_libretro.info
@@ -85,7 +85,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/bsnes_libretro.info b/bsnes_libretro.info
index a0ce42f..1164ed6 100644
--- a/bsnes_libretro.info
+++ b/bsnes_libretro.info
@@ -88,7 +88,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/bsnes_mercury_accuracy_libretro.info b/bsnes_mercury_accuracy_libretro.info
index e23c2a1..e5b2362 100644
--- a/bsnes_mercury_accuracy_libretro.info
+++ b/bsnes_mercury_accuracy_libretro.info
@@ -82,7 +82,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/bsnes_mercury_balanced_libretro.info b/bsnes_mercury_balanced_libretro.info
index 3848e3a..f44da88 100644
--- a/bsnes_mercury_balanced_libretro.info
+++ b/bsnes_mercury_balanced_libretro.info
@@ -82,7 +82,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/bsnes_mercury_performance_libretro.info b/bsnes_mercury_performance_libretro.info
index 9a968d4..6754eef 100644
--- a/bsnes_mercury_performance_libretro.info
+++ b/bsnes_mercury_performance_libretro.info
@@ -79,7 +79,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/cannonball_libretro.info b/cannonball_libretro.info
index 6aa6830..63d5881 100644
--- a/cannonball_libretro.info
+++ b/cannonball_libretro.info
@@ -14,7 +14,8 @@ systemname = "Outrun Game Engine"
 
 # Libretro Features
 database = "Cannonball"
-supports_no_game = "false"
+supports_no_game = "true"
+single_purpose = "true"
 savestate = "false"
 savestate_features = "null"
 cheats = "false"
diff --git a/craft_libretro.info b/craft_libretro.info
index e079013..e6fa30b 100644
--- a/craft_libretro.info
+++ b/craft_libretro.info
@@ -14,7 +14,9 @@ systemname = "Minecraft Game Clone"
 systemid = "craft"
 
 # Libretro Features
+database = "Minecraft"
 supports_no_game = "true"
+single_purpose = "true"
 savestate = "false"
 savestate_features = "null"
 cheats = "false"
diff --git a/daphne_libretro.info b/daphne_libretro.info
index 0bfa244..2d9268f 100644
--- a/daphne_libretro.info
+++ b/daphne_libretro.info
@@ -14,7 +14,6 @@ systemname = "Arcade (various)"
 systemid = "daphne"
 
 # Libretro Features
-database = "Daphne"
 database_match_archive_member = "true"
 supports_no_game = "false"
 savestate = "false"
diff --git a/desmume2015_libretro.info b/desmume2015_libretro.info
index 5f610c9..114c4d1 100644
--- a/desmume2015_libretro.info
+++ b/desmume2015_libretro.info
@@ -10,11 +10,11 @@ categories = "Emulator"
 
 # Hardware Information
 manufacturer = "Nintendo"
-systemname = "DS"
+systemname = "Nintendo DS"
 systemid = "nds"
 
 # Libretro Features
-database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
+database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS (Download Play)"
 supports_no_game = "false"
 savestate = "true"
 savestate_features = "serialized"
diff --git a/desmume_libretro.info b/desmume_libretro.info
index caf3f3d..d395f55 100644
--- a/desmume_libretro.info
+++ b/desmume_libretro.info
@@ -10,11 +10,11 @@ categories = "Emulator"
 
 # Hardware Information
 manufacturer = "Nintendo"
-systemname = "DS"
+systemname = "Nintendo DS"
 systemid = "nds"
 
 # Libretro Features
-database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS Decrypted|Nintendo - Nintendo DS (Download Play)"
+database = "Nintendo - Nintendo DS|Nintendo - Nintendo DS (Download Play)"
 supports_no_game = "false"
 savestate = "true"
 savestate_features = "serialized"
diff --git a/dinothawr_libretro.info b/dinothawr_libretro.info
index d870a03..ec1748f 100644
--- a/dinothawr_libretro.info
+++ b/dinothawr_libretro.info
@@ -15,7 +15,8 @@ systemid = "dinothawr"
 
 # Libretro Features
 database = "Dinothawr"
-supports_no_game = "false"
+supports_no_game = "true"
+single_purpose = "true"
 savestate = "false"
 savestate_features = "null"
 libretro_saves = "true"
diff --git a/dosbox_core_libretro.info b/dosbox_core_libretro.info
index 3f526c8..1107243 100644
--- a/dosbox_core_libretro.info
+++ b/dosbox_core_libretro.info
@@ -48,20 +48,21 @@ firmware9_opt = "true"
 notes = "(!) MT32_CONTROL.ROM (md5): 5626206284b22c2734f3e9efefcd2675|(!) MT32_PCM.ROM (md5): 89e42e386e82e0cacb4a2704a03706ca|(!) CM32L_CONTROL.ROM (md5): bfff32b6144c1d706109accb6e6b1113|(!) CM32L_PCM.ROM (md5): 08cdcfa0ed93e9cb16afa76e6ac5f0a4|(!) libbass.so|(!) libbassmidi.so|(!) bass.dll|(!) bassmidi.dll|(!) libbass.dylib|(!) libbassmidi.dylib"
 
 # Libretro Features
-database = "DOS"
-supports_no_game = "true"
 savestate = "false"
 savestate_features = "null"
-libretro_saves = "false"
 cheats = "false"
 input_descriptors = "true"
 memory_descriptors = "false"
+libretro_saves = "false"
 core_options = "true"
-core_options_version = "1.0"
+core_options_version = "2.0"
 load_subsystem = "false"
+supports_no_game = "true"
+single_purpose = "false"
+database = "DOS"
 hw_render = "false"
 needs_fullpath = "true"
-disk_control = "false"
+disk_control = "true"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
 
diff --git a/easyrpg_libretro.info b/easyrpg_libretro.info
index 42291d6..659c38e 100644
--- a/easyrpg_libretro.info
+++ b/easyrpg_libretro.info
@@ -12,7 +12,7 @@ display_version = "0.7.0.0"
 systemname = "RPG Maker 2000/2003 Game Engine"
 
 # Libretro Features
-database = "RPG Maker 2000|RPG Maker 2003|RPG Maker"
+database = "RPG Maker"
 supports_no_game = "false"
 savestate = "false"
 savestate_features = "null"
diff --git a/freechaf_libretro.info b/freechaf_libretro.info
index 9f361d3..3cd06f8 100644
--- a/freechaf_libretro.info
+++ b/freechaf_libretro.info
@@ -13,7 +13,7 @@ manufacturer = "Fairchild"
 systemname = "FreeChaF"
 
 # Libretro Features
-database = "FreeChaF"
+database = "Fairchild - Channel F"
 supports_no_game = "false"
 
 # BIOS / Firmware
diff --git a/gong_libretro.info b/gong_libretro.info
index 30ae642..299c72a 100644
--- a/gong_libretro.info
+++ b/gong_libretro.info
@@ -15,6 +15,7 @@ manufacturer = "N/A"
 
 # Libretro Features
 supports_no_game = "true"
+single_purpose = "true"
 savestate = "true"
 savestate_features = "serialized"
 cheats = "false"
diff --git a/gpsp_libretro.info b/gpsp_libretro.info
index bca2c11..df4023b 100644
--- a/gpsp_libretro.info
+++ b/gpsp_libretro.info
@@ -14,7 +14,7 @@ systemname = "Game Boy Advance"
 systemid = "game_boy_advance"
 
 # Libretro Features
-database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+database = "Nintendo - Game Boy Advance"
 supports_no_game = "false"
 savestate = "true"
 savestate_features = "deterministic"
diff --git a/higan_sfc_balanced_libretro.info b/higan_sfc_balanced_libretro.info
index cbf9976..6915a25 100644
--- a/higan_sfc_balanced_libretro.info
+++ b/higan_sfc_balanced_libretro.info
@@ -15,7 +15,7 @@ systemid = "super_nes"
 
 # Libretro Features
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Game Boy|Nintendo - Game Boy Color"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Game Boy|Nintendo - Game Boy Color"
 savestate = "true"
 savestate_features = "serialized"
 cheats = "false"
diff --git a/higan_sfc_libretro.info b/higan_sfc_libretro.info
index a4d6bc3..9bdcf2d 100644
--- a/higan_sfc_libretro.info
+++ b/higan_sfc_libretro.info
@@ -15,7 +15,7 @@ systemid = "super_nes"
 
 # Libretro Features
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Game Boy|Nintendo - Game Boy Color"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Game Boy|Nintendo - Game Boy Color"
 savestate = "true"
 savestate_features = "serialized"
 cheats = "false"
diff --git a/mednafen_gba_libretro.info b/mednafen_gba_libretro.info
index 4193a28..786e4c6 100644
--- a/mednafen_gba_libretro.info
+++ b/mednafen_gba_libretro.info
@@ -14,7 +14,7 @@ systemname = "Game Boy Advance"
 systemid = "game_boy_advance"
 
 # Libretro Features
-database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+database = "Nintendo - Game Boy Advance"
 supports_no_game = "false"
 
 # Firmware / BIOS
diff --git a/mednafen_snes_libretro.info b/mednafen_snes_libretro.info
index 87359cd..8f22a53 100644
--- a/mednafen_snes_libretro.info
+++ b/mednafen_snes_libretro.info
@@ -9,7 +9,7 @@ manufacturer = "Nintendo"
 categories = "Emulator"
 systemname = "Super Nintendo Entertainment System"
 systemid = "super_nes"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.9.26"
diff --git a/mednafen_supafaust_libretro.info b/mednafen_supafaust_libretro.info
index e1409d8..96f7b7a 100644
--- a/mednafen_supafaust_libretro.info
+++ b/mednafen_supafaust_libretro.info
@@ -24,7 +24,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "false"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks"
+database = "Nintendo - Super Nintendo Entertainment System"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/mesen-s_libretro.info b/mesen-s_libretro.info
index 557f5e0..d14bfd4 100644
--- a/mesen-s_libretro.info
+++ b/mesen-s_libretro.info
@@ -15,7 +15,7 @@ systemid = "super_nes"
 
 # Libretro Features
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Satellaview|Nintendo - Game Boy|Nintendo - Game Boy Color"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Satellaview|Nintendo - Game Boy|Nintendo - Game Boy Color"
 
 # BIOS / Firmware
 firmware_count = 21
diff --git a/meteor_libretro.info b/meteor_libretro.info
index 3ca789b..871d3b2 100644
--- a/meteor_libretro.info
+++ b/meteor_libretro.info
@@ -16,6 +16,6 @@ systemid = "game_boy_advance"
 # Libretro Features
 supports_no_game = "false"
 is_experimental = "true"
-database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+database = "Nintendo - Game Boy Advance"
 
 description = "A very early, incomplete Game Boy Advance emulator, ported to libretro. This emulator was never completed and the libretro core should not be used by anyone for any reason. It remains only for historical and research purposes."
diff --git a/mgba_libretro.info b/mgba_libretro.info
index 87f29f9..a908bc3 100644
--- a/mgba_libretro.info
+++ b/mgba_libretro.info
@@ -14,7 +14,7 @@ systemid = "game_boy_advance"
 
 # Libretro Features
 supports_no_game = "false"
-database = "Nintendo - Game Boy|Nintendo - Game Boy Color|Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color|Nintendo - Game Boy Advance"
 savestate = "true"
 savestate_features = "deterministic"
 cheats = "true"
diff --git a/mrboom_libretro.info b/mrboom_libretro.info
index 03f350b..00144a6 100644
--- a/mrboom_libretro.info
+++ b/mrboom_libretro.info
@@ -14,6 +14,7 @@ systemid = "bomberman"
 
 # Libretro Features
 supports_no_game = "true"
+single_purpose = "true"
 database = "MrBoom"
 savestate = "true"
 savestate_features = "deterministic"
diff --git a/nekop2_libretro.info b/nekop2_libretro.info
index 9df0173..53b9133 100644
--- a/nekop2_libretro.info
+++ b/nekop2_libretro.info
@@ -15,7 +15,7 @@ systemid = "pc_98"
 
 # Libretro Features
 supports_no_game = "false"
-database = "PC-98"
+database = "NEC - PC-98"
 savestate = "true"
 savestate_features = "serialized"
 cheats = "false"
diff --git a/nxengine_libretro.info b/nxengine_libretro.info
index 3cf6af7..e49b16e 100644
--- a/nxengine_libretro.info
+++ b/nxengine_libretro.info
@@ -14,7 +14,8 @@ systemid = "nxengine"
 
 # Libretro Features
 database = "Cave Story"
-supports_no_game = "false"
+supports_no_game = "true"
+single_purpose = "true"
 savestate = "false"
 cheats = "false"
 input_descriptors = "true"
diff --git a/pcsx_rearmed_libretro_neon.info b/pcsx_rearmed_neon_libretro.info
similarity index 100%
rename from pcsx_rearmed_libretro_neon.info
rename to pcsx_rearmed_neon_libretro.info
diff --git a/snes9x2002_libretro.info b/snes9x2002_libretro.info
index 1e53a32..1535b62 100644
--- a/snes9x2002_libretro.info
+++ b/snes9x2002_libretro.info
@@ -24,7 +24,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "false"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/snes9x2005_libretro.info b/snes9x2005_libretro.info
index 43211cf..93ec360 100644
--- a/snes9x2005_libretro.info
+++ b/snes9x2005_libretro.info
@@ -24,7 +24,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "false"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/snes9x2005_plus_libretro.info b/snes9x2005_plus_libretro.info
index 522193e..b7436a7 100644
--- a/snes9x2005_plus_libretro.info
+++ b/snes9x2005_plus_libretro.info
@@ -24,7 +24,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "false"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/snes9x2010_libretro.info b/snes9x2010_libretro.info
index b4e2e69..a6eecb5 100644
--- a/snes9x2010_libretro.info
+++ b/snes9x2010_libretro.info
@@ -24,7 +24,7 @@ core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "false"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/snes9x_libretro.info b/snes9x_libretro.info
index aa094f5..1197ef8 100644
--- a/snes9x_libretro.info
+++ b/snes9x_libretro.info
@@ -34,7 +34,7 @@ core_options = "true"
 core_options_version = "1.3"
 load_subsystem = "true"
 supports_no_game = "false"
-database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Sufami Turbo|Nintendo - Satellaview"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Sufami Turbo|Nintendo - Satellaview"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
diff --git a/superbroswar_libretro.info b/superbroswar_libretro.info
new file mode 100644
index 0000000..8a4f806
--- /dev/null
+++ b/superbroswar_libretro.info
@@ -0,0 +1,24 @@
+display_name = "Super Bros War"
+categories = "Game engine"
+authors = "Philippe Simons"
+corename = "superbroswar"
+supported_extensions = "game"
+license = "GPLv2"
+display_version = "v0.1"
+systemid = "superbroswar"
+
+savestate = "false"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "false"
+core_options_version = "1.0"
+load_subsystem = "false"
+supports_no_game = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "false"
+is_experimental = "false"
+
+description = "A fan-made multiplayer style deathmatch game."
diff --git a/thepowdertoy_libretro.info b/thepowdertoy_libretro.info
index a842062..e54f44c 100644
--- a/thepowdertoy_libretro.info
+++ b/thepowdertoy_libretro.info
@@ -13,6 +13,7 @@ systemname = "Physics Toy"
 
 # Libretro Features
 supports_no_game = "true"
+single_purpose = "true"
 savestate = "true"
 savestate_features = "serialized"
 cheats = "false"
diff --git a/vaporspec_libretro.info b/vaporspec_libretro.info
new file mode 100644
index 0000000..39e6e4a
--- /dev/null
+++ b/vaporspec_libretro.info
@@ -0,0 +1,18 @@
+# Software Information
+display_name = "VaporSpec (VaporSpec)"
+authors = "Will Smith|Vladimir Serbinenko"
+supported_extensions = "vaporbin"
+corename = "VaporSpec"
+manufacturer = "VaporSpec"
+categories = "Emulator"
+
+# Hardware Information
+systemname = "VaporSpec"
+database = "VaporSpec"
+system_id = "vaporspec"
+license = "MIT"
+permissions = ""
+display_version = "GIT"
+supports_no_game = "false"
+firmware_count = 0
+description = "A virtual game platform with capabilities similar to 80s game consoles."
diff --git a/vba_next_libretro.info b/vba_next_libretro.info
index 1de4ad0..edbdb88 100644
--- a/vba_next_libretro.info
+++ b/vba_next_libretro.info
@@ -15,7 +15,7 @@ systemid = "game_boy_advance"
 
 # Libretro Features
 supports_no_game = "false"
-database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+database = "Nintendo - Game Boy Advance"
 savestate = "true"
 savestate_features = "deterministic"
 cheats = "false"
diff --git a/vbam_libretro.info b/vbam_libretro.info
index a2ce4b6..543f5b5 100644
--- a/vbam_libretro.info
+++ b/vbam_libretro.info
@@ -14,7 +14,7 @@ systemname = "Game Boy/Game Boy Color/Game Boy Advance"
 systemid = "game_boy_advance"
 
 # Libretro Features
-database = "Nintendo - Game Boy|Nintendo - Game Boy Color|Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color|Nintendo - Game Boy Advance"
 supports_no_game = "false"
 savestate = "true"
 savestate_features = "serialized"
diff --git a/vice_xpet_libretro.info b/vice_xpet_libretro.info
index ff235b1..7753439 100644
--- a/vice_xpet_libretro.info
+++ b/vice_xpet_libretro.info
@@ -14,7 +14,6 @@ systemname = "PET"
 systemid = "commodore_pet"
 
 # Libretro Features
-database = "Commodore - PET"
 supports_no_game = "true"
 savestate = "true"
 savestate_features = "serialized"
diff --git a/vice_xplus4_libretro.info b/vice_xplus4_libretro.info
index 8d97c32..3364547 100644
--- a/vice_xplus4_libretro.info
+++ b/vice_xplus4_libretro.info
@@ -14,7 +14,7 @@ systemname = "PLUS/4"
 systemid = "commodore_plus4"
 
 # Libretro Features
-database = "Commodore - PLUS-4"
+database = "Commodore - Plus-4"
 supports_no_game = "true"
 savestate = "true"
 savestate_features = "serialized"
diff --git a/vitaquake3_libretro.info b/vitaquake3_libretro.info
index 0792377..0fa5379 100644
--- a/vitaquake3_libretro.info
+++ b/vitaquake3_libretro.info
@@ -15,7 +15,7 @@ systemid = "quake_3"
 
 # Libretro Features
 supports_no_game = "false"
-database = "Quake 3"
+database = "Quake III"
 savestate = "false"
 
 description = "A port of the VitaQuake 3 source port of iD's ioquake3 engine to libretro. This core loads games in the *.pk3 format."
diff --git a/vitavoyager_libretro.info b/vitavoyager_libretro.info
index 532b4a0..0e17542 100644
--- a/vitavoyager_libretro.info
+++ b/vitavoyager_libretro.info
@@ -15,7 +15,7 @@ systemid = "quake_3"
 
 # Libretro Features
 supports_no_game = "false"
-database = "Quake 3"
+database = "Quake III"
 savestate = "false"
 
 description = "A port of the Lilium Voyager engine, which runs the Star Trek: Voyager - Elite Force game and is itself based on the ioquake3 port of iD's Quake 3 engine, to libretro. This core loads games in the *.pk3 format."
diff --git a/xrick_libretro.info b/xrick_libretro.info
index e204948..2bb032e 100644
--- a/xrick_libretro.info
+++ b/xrick_libretro.info
@@ -14,7 +14,8 @@ systemid = "xrick"
 
 # Libretro Features
 database = "Rick Dangerous"
-supports_no_game = "false"
+supports_no_game = "true"
+single_purpose = "true"
 savestate = "false"
 
 notes = "(!) XRick requires data ROM 'data.zip'.|(!) Load Content 'data.zip'"