diff --git a/dist/info/2048_libretro.info b/dist/info/2048_libretro.info
index 198c2973..9f651307 100644
--- a/dist/info/2048_libretro.info
+++ b/dist/info/2048_libretro.info
@@ -27,4 +27,6 @@ load_subsystem = "false"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
-is_experimental = "false"
\ No newline at end of file
+is_experimental = "false"
+
+description = "A port of the popular puzzle game 2048 to libretro. In addition to being fun and deceptively simple in mechanics, this core also has extremely low requirements and can be useful as a benchmark in some cases."
diff --git a/dist/info/3dengine_libretro.info b/dist/info/3dengine_libretro.info
index af75ed8f..f93e2625 100644
--- a/dist/info/3dengine_libretro.info
+++ b/dist/info/3dengine_libretro.info
@@ -25,4 +25,6 @@ supports_no_game = "false"
 database = "null"
 needs_fullpath = "false"
 disk_control = "false"
-is_experimental = "true"
\ No newline at end of file
+is_experimental = "true"
+
+description = "This is a test core that is mostly useful to developers. It is intended as a reference for core authors and a functionality check for frontend authors. This core demonstrates how to create a hardware-rendered core--in this case, using OpenGL/ES--in a libretro context. This core can load basic *.obj 3D models, which can then be rotated and viewed using the retropad controls."
diff --git a/dist/info/4do_libretro.info b/dist/info/4do_libretro.info
index 9d93551b..803377d8 100644
--- a/dist/info/4do_libretro.info
+++ b/dist/info/4do_libretro.info
@@ -81,3 +81,5 @@ firmware9_desc = "panafz10ja-anvil-kanji.bin (Panasonic FZ-10JA Kanji Font ROM)"
 firmware9_path = "panafz10ja-anvil-kanji.bin"
 firmware9_opt = "true"
 notes = "(!) panafz10ja-anvil-kanji.bin (md5): 428577250f43edc902ea239c50d2240d"
+
+description = "A port of 4DO, itself a fork of FreeDO, to libretro. One of several BIOS ROMs must be placed into your RetroArch / libretro "System Directory" folder. "norsa" versions have the RSA encryption check disabled which should allow unsigned software to run. This core is very demanding and is still in development, so many games have varying levels of compatibility and/or bugs."
diff --git a/dist/info/81_libretro.info b/dist/info/81_libretro.info
index f6501f31..4e0c43e1 100644
--- a/dist/info/81_libretro.info
+++ b/dist/info/81_libretro.info
@@ -30,3 +30,5 @@ needs_fullpath = "false"
 disk_control = "false"
 is_experimental = "false"
 notes = "[1] Amstrad have kindly given their permission for the redistribution|[^] of their copyrighted material but retain that copyright."
+
+description = "A work-in-progress port of EightyOne (a.k.a. THE Sinclair Emulator) to libretro. The core currently only emulates the Sinclair ZX81 with 16Kb RAM and correctly loads and runs many games in the "p" and "tzx" formats. The core will attempt to autoconfigure any games that are included in its internal database, which includes many homebrew and colorized games. While EightyOne is capable of emulating some ZX Spectrum machines, they are not included in this core, as they are already covered by the Fuse libretro core."
diff --git a/dist/info/atari800_libretro.info b/dist/info/atari800_libretro.info
index 884f3a51..b6218a0c 100644
--- a/dist/info/atari800_libretro.info
+++ b/dist/info/atari800_libretro.info
@@ -37,3 +37,5 @@ firmware0_desc = "5200.rom (5200 BIOS)"
 firmware0_path = "5200.rom"
 firmware0_opt = "false"
 notes = "(!) 5200.rom (md5): 281f20ea4320404ec820fb7ec0693b38"
+
+description = "A port of the free and portable Atari800 emulator to libretro. This core supports games and programs written for the Atari 8-bit computers (400, 800, 600 XL, 800XL, 130XE) and 5200 console. When loaded, the core should boot to the Atari Computer - Memo Pad screen and will generate a .atari800.cfg config file in the frontend's home directory and will add the required BIOS files it detects in the frontend's system directory to the config file. Once that is done, users may manually select which Atari system to emulate through the Atari System core option. These and other options can also be modified through the core's own menu, accessible through the retrokeyboard's F1 key."
diff --git a/dist/info/bk_libretro.info b/dist/info/bk_libretro.info
index 71626327..dd1d5433 100644
--- a/dist/info/bk_libretro.info
+++ b/dist/info/bk_libretro.info
@@ -46,3 +46,5 @@ firmware7_path = "bk/MONIT10.ROM"
 firmware7_opt = "true"
 
 notes = "(!) bk/B11M_BOS.ROM (md5): fe4627d1e3a1535874085050733263e7|(!) bk/B11M_EXT.ROM (md5): dc52f365d56fa1951f5d35b1101b9e3f|(!) bk/BAS11M_0.ROM (md5): 946f6f23ded03c0e26187f0b3ca75993|(!) bk/BAS11M_1.ROM (md5): 1e6637f32aa7d1de03510030cac40bcf|(!) bk/DISK_327.ROM (md5): 5015228eeeb238e65da8edcd1b6dfac7|(!) bk/BASIC10.ROM (md5): 3fa774326d75410a065659aea80252f0|(!) bk/FOCAL10.ROM (md5): 5737f972e8638831ab71e9139abae052|(!) bk/MONIT10.ROM (md5): 95f8c41c6abf7640e35a6a03cecebd01"
+
+description = "A port of the PDP11 emulator to libretro. This core emulates the Soviet Electronica BK computers series, including the BK-0010, BK-0010.01 and BK-0011(M), as well as the Terak 8510/a, which is a 1976 American PDP-11/03 platform that the Electronica BK series were designed after. The BK series computers were the first mass-produced, affordable personal computers in Russia in the 1980s and they had a tremendous effect on the development of the Russian-speaking software community, similar to the C64, ZX Spectrum and Atari 2600 communities elsewhere in the world. These computers will accept console commands in English but respond mostly in Russian, so this core is mostly of use to Russian-speaking users."
diff --git a/dist/info/blastem_libretro.info b/dist/info/blastem_libretro.info
index 2a391c43..9741d993 100644
--- a/dist/info/blastem_libretro.info
+++ b/dist/info/blastem_libretro.info
@@ -38,3 +38,5 @@ firmware0_path = "rom.db"
 firmware0_opt = "true"
 
 notes = "(!) rom.db (md5): ff4a3572475236e859e3e9ac5c87d1f1"
+
+description = "A port of the BlastEm Sega Genesis/Mega Drive emulator to libretro. This emulator is focused on being both extremely accurate and extremely fast. While it is not as mature as Genesis Plus GX, its extreme accuracy makes it capable of running many demos and test ROMs that choke other emulators, including the notoriously complex Titan Overdrive I and II demos."
diff --git a/dist/info/bluemsx_libretro.info b/dist/info/bluemsx_libretro.info
index d0b1b5cf..eb935a1e 100644
--- a/dist/info/bluemsx_libretro.info
+++ b/dist/info/bluemsx_libretro.info
@@ -31,3 +31,5 @@ disk_control = "true"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
 notes = "(!) The libretro port of blueMSX requires the BIOS files|from full standalone package inside the 'System\Machines' directory |and media database files into 'System\Databases' directory.|https://docs.libretro.com/library/bluemsx/#bios|(!) ColecoVision Gamepad Mapping is as follow:|Button 1 as Retropad A|Button 2 as Retropad B|Dial keys 1 to 8 as X, Y, R, L, R2, L2, R3, L3|Star as Select, Hash as Start|0 & 9 are on keyboard 1 & 2 for Player 1|0 & 9 are on keyboard 3 & 4 for Player 2.|(!) To play SpectraVideo cassettes type 'cload' then 'run'|or BLOAD ''CAS:'',R depending of game."
+
+description = "A port of the blueMSX emulator to libretro. This emulator is cycle accurate and covers all generations of MSX computers, as well as SVI, ColecoVision and Sega SG-1000 machines. This core requires the 'Databases' and 'Machines' folders from a standalone installation of blueMSX to be placed in the frontend's system directory to function."
diff --git a/dist/info/bnes_libretro.info b/dist/info/bnes_libretro.info
index 9c6ef32d..257c4f55 100644
--- a/dist/info/bnes_libretro.info
+++ b/dist/info/bnes_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - NES / Famicom (bnes)"
 categories = "Emulator"
-authors = "byuu|Ryphecha"
+authors = "Near|Ryphecha"
 corename = "bnes/higan"
 supported_extensions = "nes"
 license = "GPLv3"
@@ -28,4 +28,6 @@ database = "Nintendo - Nintendo Entertainment System"
 hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
-is_experimental = "true"
\ No newline at end of file
+is_experimental = "true"
+
+description = "An initial and long-out-of-date port of Near's bnes emulator to libretro. This core was based on Near's first foray into NES/Famicom emulation and was not kept up-to-date with later improvements, and, as such, it is broken in many ways. No one should use this core to actually play games and it is only here for historical and research purposes."
diff --git a/dist/info/boom3_libretro.info b/dist/info/boom3_libretro.info
index 688403d0..c7d1333c 100644
--- a/dist/info/boom3_libretro.info
+++ b/dist/info/boom3_libretro.info
@@ -30,3 +30,5 @@ needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "false"
 database = "Doom 3"
+
+description = "A source port of the Doom 3 engine to libretro. This release does not contain any game data, which is still covered by the original EULA and must be obeyed as usual. The core requires games to be patched to the latest 1.3.1 version and is compatible with data from the Doom 3 and Doom 3: Resurrection of Evil releases available via Steam and Humble Store."
diff --git a/dist/info/boom3_xp_libretro.info b/dist/info/boom3_xp_libretro.info
index a144e6d4..09f85619 100644
--- a/dist/info/boom3_xp_libretro.info
+++ b/dist/info/boom3_xp_libretro.info
@@ -30,3 +30,5 @@ needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "false"
 database = "Doom 3"
+
+description = "A source port of the Doom 3 engine to libretro. This release does not contain any game data, which is still covered by the original EULA and must be obeyed as usual. The core requires games to be patched to the latest 1.3.1 version and is compatible with data from the Doom 3 and Doom 3: Resurrection of Evil releases available via Steam and Humble Store."
diff --git a/dist/info/bsnes2014_accuracy_libretro.info b/dist/info/bsnes2014_accuracy_libretro.info
index af8d5a8f..4f4bb9b3 100644
--- a/dist/info/bsnes2014_accuracy_libretro.info
+++ b/dist/info/bsnes2014_accuracy_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - SNES / SFC (bsnes 2014 Accuracy)"
 categories = "Emulator"
-authors = "byuu"
+authors = "Near"
 corename = "bsnes 2014 Accuracy"
 supported_extensions = "sfc|smc|bml"
 license = "GPLv3"
diff --git a/dist/info/bsnes2014_balanced_libretro.info b/dist/info/bsnes2014_balanced_libretro.info
index 990be64c..ff0cad04 100644
--- a/dist/info/bsnes2014_balanced_libretro.info
+++ b/dist/info/bsnes2014_balanced_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - SNES / SFC (bsnes 2014 Balanced)"
 categories = "Emulator"
-authors = "byuu"
+authors = "Near"
 corename = "bsnes 2014 Balanced"
 supported_extensions = "sfc|smc|bml"
 license = "GPLv3"
diff --git a/dist/info/bsnes2014_performance_libretro.info b/dist/info/bsnes2014_performance_libretro.info
index 4361c12d..4390a9ff 100644
--- a/dist/info/bsnes2014_performance_libretro.info
+++ b/dist/info/bsnes2014_performance_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - SNES / SFC (bsnes 2014 Performance)"
 categories = "Emulator"
-authors = "byuu"
+authors = "Near"
 corename = "bsnes 2014 Performance"
 supported_extensions = "sfc|smc|bml"
 license = "GPLv3"
diff --git a/dist/info/bsnes_cplusplus98_libretro.info b/dist/info/bsnes_cplusplus98_libretro.info
index 9967a88e..b6903507 100644
--- a/dist/info/bsnes_cplusplus98_libretro.info
+++ b/dist/info/bsnes_cplusplus98_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - SNES / SFC (bsnes C++98 (v085))"
 categories = "Emulator"
-authors = "byuu|Themaister|Ver GreenEyes"
+authors = "Near|Themaister|Ver GreenEyes"
 corename = "bsnes C++98 (v085)"
 supported_extensions = "sfc|smc"
 license = "GPLv3"
diff --git a/dist/info/bsnes_hd_beta_libretro.info b/dist/info/bsnes_hd_beta_libretro.info
index 2d458d6b..7ff60751 100644
--- a/dist/info/bsnes_hd_beta_libretro.info
+++ b/dist/info/bsnes_hd_beta_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - SNES / SFC (bsnes-hd beta)"
 categories = "Emulator"
-authors = "byuu|DerKoun"
+authors = "Near|DerKoun"
 corename = "bsnes-hd beta"
 supported_extensions = "sfc|smc|gb|gbc"
 license = "GPLv3"
@@ -77,10 +77,10 @@ notes = "[1] bsnes uses split ROMS for special chip games.|[*] Notable DSP1/DSP1
 # Libretro Features
 savestate = "true"
 savestate_features = "serialized"
-cheats = "true"
+cheats = "false"
 input_descriptors = "true"
-memory_descriptors = "true"
-libretro_saves = "false"
+memory_descriptors = "false"
+libretro_saves = "true"
 core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "true"
diff --git a/dist/info/bsnes_libretro.info b/dist/info/bsnes_libretro.info
index 30f5b2d5..a0ce42f2 100644
--- a/dist/info/bsnes_libretro.info
+++ b/dist/info/bsnes_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - SNES / SFC (bsnes)"
 categories = "Emulator"
-authors = "byuu"
+authors = "Near"
 corename = "bsnes"
 supported_extensions = "sfc|smc|gb|gbc|bs"
 license = "GPLv3"
@@ -80,10 +80,10 @@ notes = "[1] bsnes uses split ROMS for special chip games.|[*] Notable DSP1/DSP1
 # Libretro Features
 savestate = "true"
 savestate_features = "serialized"
-cheats = "true"
+cheats = "false"
 input_descriptors = "true"
-memory_descriptors = "true"
-libretro_saves = "false"
+memory_descriptors = "false"
+libretro_saves = "true"
 core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "true"
diff --git a/dist/info/bsnes_mercury_accuracy_libretro.info b/dist/info/bsnes_mercury_accuracy_libretro.info
index e372cbc9..e23c2a18 100644
--- a/dist/info/bsnes_mercury_accuracy_libretro.info
+++ b/dist/info/bsnes_mercury_accuracy_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - SNES / SFC (bsnes-mercury Accuracy)"
 categories = "Emulator"
-authors = "byuu|Alcaro"
+authors = "Near|Alcaro"
 corename = "bsnes-mercury Accuracy"
 supported_extensions = "sfc|smc|bml"
 license = "GPLv3"
diff --git a/dist/info/bsnes_mercury_balanced_libretro.info b/dist/info/bsnes_mercury_balanced_libretro.info
index 7fa3c8a3..3848e3ab 100644
--- a/dist/info/bsnes_mercury_balanced_libretro.info
+++ b/dist/info/bsnes_mercury_balanced_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - SNES / SFC (bsnes-mercury Balanced)"
 categories = "Emulator"
-authors = "byuu|Alcaro"
+authors = "Near|Alcaro"
 corename = "bsnes-mercury Balanced"
 supported_extensions = "sfc|smc|bml"
 license = "GPLv3"
diff --git a/dist/info/bsnes_mercury_performance_libretro.info b/dist/info/bsnes_mercury_performance_libretro.info
index 4e2320bc..9a968d4d 100644
--- a/dist/info/bsnes_mercury_performance_libretro.info
+++ b/dist/info/bsnes_mercury_performance_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - SNES / SFC (bsnes-mercury Performance)"
 categories = "Emulator"
-authors = "byuu|Alcaro"
+authors = "Near|Alcaro"
 corename = "bsnes-mercury Performance"
 supported_extensions = "sfc|smc|bml"
 license = "GPLv3"
diff --git a/dist/info/cannonball_libretro.info b/dist/info/cannonball_libretro.info
index a59c33a7..6aa68303 100644
--- a/dist/info/cannonball_libretro.info
+++ b/dist/info/cannonball_libretro.info
@@ -29,3 +29,5 @@ needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "false"
 notes = "(!) You need to have a dummy file with the extension .game inside your MAME rom outrun folder."
+
+description = "A port of the Cannonball enhanced OutRun engine to libretro. This core includes support for increased framerate (true 60 fps, some 120 fps content), true widescreen, new game modes and many more enhancements. To run the core/game, you will need to extract the contents of an OutRun Revision B ROM archive alongside a dummy file that ends in the *.game file extension (the frontend will load this 'game' file)."
diff --git a/dist/info/cap32_libretro.info b/dist/info/cap32_libretro.info
index c6e84fea..527dbc46 100644
--- a/dist/info/cap32_libretro.info
+++ b/dist/info/cap32_libretro.info
@@ -30,3 +30,5 @@ needs_fullpath = "true"
 disk_control = "true"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
+
+description = "A port of the Caprice32 emulator to libretro. This core emulates the Amstrad CPC 8-bit home computer series, including the CPC464, CPC664, CPC128, CPC6128+ and GX4000 models, with a high degree of accuracy and compatibility. While the core's autoloaunch options do a pretty good job of guessing the command required to launch a game, users may specify a command to be executed on launch via an m3u playlist. See the core's documentation for further details."
diff --git a/dist/info/chailove_libretro.info b/dist/info/chailove_libretro.info
index 88e2cb67..a344742b 100644
--- a/dist/info/chailove_libretro.info
+++ b/dist/info/chailove_libretro.info
@@ -29,3 +29,5 @@ hw_render = "false"
 needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "false"
+
+description = "A free, open-source framework used to make 2D games in ChaiScript, ported to libretro. The ChaiLove API is roughly inspired by the LOVE API, and a number of simple 2D games are already available for it."
diff --git a/dist/info/citra_canary_libretro.info b/dist/info/citra_canary_libretro.info
index f52a2a33..a34d7c2c 100644
--- a/dist/info/citra_canary_libretro.info
+++ b/dist/info/citra_canary_libretro.info
@@ -30,3 +30,5 @@ required_hw_api = "OpenGL Core >= 3.3"
 needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "false"
+
+description = "A port of the Citra 3DS emulator to libretro. This core is based on the 'Canary' branch, which includes some experimental changes/features that are not considered ready for inclusion in the main branch. The core requires decrypted ROMs to function, and some games require Mii data to be dumped from your own 3DS console."
diff --git a/dist/info/citra_libretro.info b/dist/info/citra_libretro.info
index 32d8ed50..6b3c945b 100644
--- a/dist/info/citra_libretro.info
+++ b/dist/info/citra_libretro.info
@@ -29,4 +29,6 @@ hw_render = "true"
 required_hw_api = "OpenGL Core >= 3.3"
 needs_fullpath = "true"
 disk_control = "false"
-is_experimental = "false"
\ No newline at end of file
+is_experimental = "false"
+
+description = "A port of the Citra 3DS emulator to libretro. The core requires decrypted ROMs to function, and some games require Mii data to be dumped from your own 3DS console."
diff --git a/dist/info/craft_libretro.info b/dist/info/craft_libretro.info
index 9f9bf799..e0790133 100644
--- a/dist/info/craft_libretro.info
+++ b/dist/info/craft_libretro.info
@@ -28,3 +28,5 @@ hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
 is_experimental = "false"
+
+description = "A basic clone of the Minecraft sandbox game, ported to libretro. This core is written in native code (i.e., not Java) and is hardware-accelerated, making it extremely fast and smooth. However, it lacks many of the advanced functionalities familiar to Minecraft, such as redstone."
diff --git a/dist/info/crocods_libretro.info b/dist/info/crocods_libretro.info
index 0017b769..e3510a13 100644
--- a/dist/info/crocods_libretro.info
+++ b/dist/info/crocods_libretro.info
@@ -30,3 +30,5 @@ needs_fullpath = "false"
 disk_control = "false"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
+
+description = "A port of the CrocoDS Amstrad CPC emulator to libretro. This emulator was originally written for use on the Nintendo DS console via homebrew, and, as such, runs well even on very weak hardware."
diff --git a/dist/info/daphne_libretro.info b/dist/info/daphne_libretro.info
index c2c4f7c3..0bfa2442 100644
--- a/dist/info/daphne_libretro.info
+++ b/dist/info/daphne_libretro.info
@@ -30,3 +30,5 @@ hw_render = "false"
 needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "true"
+
+description = "A port of the Daphne Laserdisc emulator to libretro. This core plays classic full-motion video games as they appeared in arcades."
diff --git a/dist/info/desmume2015_libretro.info b/dist/info/desmume2015_libretro.info
index 723b99b5..5f610c97 100644
--- a/dist/info/desmume2015_libretro.info
+++ b/dist/info/desmume2015_libretro.info
@@ -42,3 +42,5 @@ firmware2_desc = "bios9.bin (ARM9 BIOS)"
 firmware2_path = "bios9.bin"
 firmware2_opt = "true"
 notes = "(!) firmware.bin (md5): 145eaef5bd3037cbc247c213bb3da1b3|(!) bios7.bin (md5): df692a80a5b1bc90728bc3dfc76cd948|(!) bios9.bin (md5): a392174eb3e572fed6447e956bde4b25|[1] Enable 'Use External BIOS/Firmware' core option to use firmware files"
+
+description = "A port of the mature and longstanding DeSmuME emulator for Nintendo's DS console to libretro. The core has very good compatibility and many modern features, but since this is an older snapshot (circa 2015), most users should try the up-to-date core and only fall back to this one if needed for performance reasons."
diff --git a/dist/info/desmume_libretro.info b/dist/info/desmume_libretro.info
index 03bca324..caf3f3d3 100644
--- a/dist/info/desmume_libretro.info
+++ b/dist/info/desmume_libretro.info
@@ -43,3 +43,5 @@ firmware2_desc = "bios9.bin (ARM9 BIOS)"
 firmware2_path = "bios9.bin"
 firmware2_opt = "true"
 notes = "(!) firmware.bin (md5): 145eaef5bd3037cbc247c213bb3da1b3|(!) bios7.bin (md5): df692a80a5b1bc90728bc3dfc76cd948|(!) bios9.bin (md5): a392174eb3e572fed6447e956bde4b25|[1] Enable 'Use External BIOS/Firmware' core option to use firmware files"
+
+description = "A port of the mature and longstanding DeSmuME emulator for Nintendo's DS console to libretro. The core has very good compatibility and many modern features, including increased internal resolution (very demanding)."
diff --git a/dist/info/dinothawr_libretro.info b/dist/info/dinothawr_libretro.info
index bd6c6fdd..d870a037 100644
--- a/dist/info/dinothawr_libretro.info
+++ b/dist/info/dinothawr_libretro.info
@@ -30,3 +30,5 @@ needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "false"
 notes = "(!) Dinothawr requires data ROM 'Dinothawr.zip'.|(!) Load Content 'dinothawr.game'."
+
+description = "A clever and cute push-the-block-in-a-straight-line puzzle game in the spirit of Kickle Cubicle written from the ground up for libretro. The core includes the puzzle game engine, while the game content (artwork and puzzle layouts) are included in the separate content package."
diff --git a/dist/info/directxbox_libretro.info b/dist/info/directxbox_libretro.info
index 0dffcc86..a22c5e75 100644
--- a/dist/info/directxbox_libretro.info
+++ b/dist/info/directxbox_libretro.info
@@ -15,3 +15,6 @@ systemid = "xbox"
 
 # Libretro Features
 database = "Microsoft - Xbox"
+is_experimental = "true"
+
+description = "A very preliminary and WIP emulator for Microsoft's original Xbox console. This emulator does not play any games and is only of interest to developers who wish to work on it."
diff --git a/dist/info/dolphin_launcher_libretro.info b/dist/info/dolphin_launcher_libretro.info
index 2841632e..6af44033 100644
--- a/dist/info/dolphin_launcher_libretro.info
+++ b/dist/info/dolphin_launcher_libretro.info
@@ -29,4 +29,6 @@ hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
 is_experimental = "false"
-notes = "(!) This core launches an external Dolphin Emulator installation, which runs outside of the libretro frontend."
\ No newline at end of file
+notes = "(!) This core launches an external Dolphin Emulator installation, which runs outside of the libretro frontend."
+
+description = "A basic skeleton core which has the sole purpose of launching an external instance of the popular Dolphin emulator. This allows users to launch Gamecube and/or Wii games from a libretro frontend while using the external Dolphin emulator, which will then run outside of the libretro frontend (that is, features of the frontend will not be available). Many/most users will be better served by using the libretro-native dolphin-libretro core, which provides a normal libretro experience, but this core may be useful to access features that are not exposed to the native libretro core."
diff --git a/dist/info/dolphin_libretro.info b/dist/info/dolphin_libretro.info
index b0ad8700..289814e7 100644
--- a/dist/info/dolphin_libretro.info
+++ b/dist/info/dolphin_libretro.info
@@ -37,3 +37,5 @@ firmware0_desc = "Dolphin 'Sys' folder"
 firmware0_path = "dolphin-emu/Sys/codehandler.bin"
 firmware0_opt = "false"
 notes = "(!) You need the Dolphin 'Sys' folder in 'system/dolphin-emu'.|(!) Check https://docs.libretro.com/library/dolphin/#setup for more details."
+
+description = "A port of the popular Dolphin Gamecube/Wii emulator to libretro. This core exposes only a subset of the many features included in the standalone Dolphin emulator, but it can provide a simplified and libretro-native experience for playing these games. The core needs the 'Sys' directory copied from the standalone emulator's files into the frontend's system directory, as this is where the emulator looks to apply per-game settings/hacks for better compatibility and performance. For Dolphin power-users, the reduced functionality of the core may be stifling, in which case the dolphin-launcher core may be a better fit."
diff --git a/dist/info/dosbox_core_libretro.info b/dist/info/dosbox_core_libretro.info
index d3fd89ef..3f526c8b 100644
--- a/dist/info/dosbox_core_libretro.info
+++ b/dist/info/dosbox_core_libretro.info
@@ -64,3 +64,5 @@ needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
+
+description = "A port of the mature and well-known DOSBox emulator to libretro. This core is kept up-to-date with the latest sources from DOSBox's SVN trunk and provides some improvements over the DOSBox-SVN core, including native MIDI support (as well as Soundfont-based MIDI support via FluidSynth and BASSMIDI), cycle-accurate OPL3 (YMF262) emulation courtesy of Nuked OPL3, MT-32 emulation courtesy of MUNT and experimental 3dfx Voodoo support. This is a good core for users who want a more traditional DOSBox experience vs the DOSBox-Pure core, which is focused on providing a turnkey, game-focused libretro experience."
diff --git a/dist/info/dosbox_libretro.info b/dist/info/dosbox_libretro.info
index a1b8694e..b9979165 100644
--- a/dist/info/dosbox_libretro.info
+++ b/dist/info/dosbox_libretro.info
@@ -30,3 +30,5 @@ needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
+
+description = "A port of the mature and well-known DOSBox emulator to libretro. This core is based on an older snapshot of the upstream code and, as a result, many users will have a better experience with the DOSBox-SVN, DOSBox-Core or DOSBox-Pure cores. This core provides a more traditional DOSBox experience vs the DOSBox-Pure core, which is focused on providing a turnkey, game-focused libretro experience."
diff --git a/dist/info/dosbox_pure_libretro.info b/dist/info/dosbox_pure_libretro.info
index 16189a23..e05620ec 100644
--- a/dist/info/dosbox_pure_libretro.info
+++ b/dist/info/dosbox_pure_libretro.info
@@ -30,3 +30,5 @@ needs_fullpath = "true"
 disk_control = "true"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
+
+description = "A port of the mature and well-known DOSBox emulator to libretro with a goal of simplicty and ease of use. This core includes a streamlined workflow for launching games directly from ZIP archives (including disk images therein) with automated mapping of controls to gamepads and a native onscreen keyboard. This is a good core for most users who just want to play games and are not looking for a traditional DOS experience."
diff --git a/dist/info/dosbox_svn_ce_libretro.info b/dist/info/dosbox_svn_ce_libretro.info
index 950c5005..8f06959e 100644
--- a/dist/info/dosbox_svn_ce_libretro.info
+++ b/dist/info/dosbox_svn_ce_libretro.info
@@ -31,3 +31,5 @@ disk_control = "false"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
 notes = "(!) This core requires libsdl1.2 and libsdl-net1.2.|"
+
+description = "A port of 'SVN' fork of the mature and well-known DOSBox emulator to libretro. This core is up-to-date with the latest DOSBox-SVN trunk and allows on-the-fly configuration and different sync methods (including the potential for perfect sync without tearing on VRR monitors). This core provides a more traditional DOSBox experience vs the DOSBox-Pure core, which is focused on providing a turnkey, game-focused libretro experience."
diff --git a/dist/info/dosbox_svn_libretro.info b/dist/info/dosbox_svn_libretro.info
index 61485142..2d9605d7 100644
--- a/dist/info/dosbox_svn_libretro.info
+++ b/dist/info/dosbox_svn_libretro.info
@@ -31,3 +31,5 @@ disk_control = "false"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
 notes = "(!) This core requires libsdl1.2 and libsdl-net1.2.|"
+
+description = "A port of 'SVN' fork of the mature and well-known DOSBox emulator to libretro. This core is up-to-date with the latest DOSBox-SVN trunk and allows on-the-fly configuration and different sync methods (including the potential for perfect sync without tearing on VRR monitors). This core provides a more traditional DOSBox experience vs the DOSBox-Pure core, which is focused on providing a turnkey, game-focused libretro experience."
diff --git a/dist/info/duckstation_libretro.info b/dist/info/duckstation_libretro.info
index f5a56956..baacdcd3 100644
--- a/dist/info/duckstation_libretro.info
+++ b/dist/info/duckstation_libretro.info
@@ -1,16 +1,28 @@
+# Software Information
 display_name = "Sony - PlayStation (SwanStation)"
 authors = "stenzek"
 supported_extensions = "cue|bin|img|chd|m3u"
 corename = "SwanStation"
-manufacturer = "Sony"
 categories = "Emulator"
-systemname = "PlayStation"
-systemid = "playstation"
-database = "Sony - PlayStation"
 license = "GPLv3"
 permissions = ""
+
+# Hardware Information
+manufacturer = "Sony"
+systemname = "PlayStation"
+systemid = "playstation"
+
+# Libretro Information
+database = "Sony - PlayStation"
 display_version = "v0.1"
 supports_no_game = "false"
+hw_render = "true"
+required_hw_api = "OpenGL >= 3.0 | OpenGL Core >= 3.1 | Vulkan >= 1.0 | Direct3D >= 11.0"
+is_experimental = "false"
+savestate = "true"
+savestate_features = "serialized"
+input_descriptors = "true"
+disk_control = "true"
 firmware_count = 3
 firmware0_desc = "scph5500.bin (PS1 JP BIOS)"
 firmware0_path = "scph5500.bin"
@@ -22,6 +34,5 @@ firmware2_desc = "scph5502.bin (PS1 EU BIOS)"
 firmware2_path = "scph5502.bin"
 firmware2_opt = "true"
 notes = "(!) scph5500.bin (md5): 8dd7d5296a650fac7319bce665a6a53c|(!) scph5501.bin (md5): 490f666e1afb15b7362b406ed1cea246|(!) scph5502.bin (md5): 32736f17079d0b2b7024407c39bd3050| This core also supports No-Intro BIOS images."
-description = "SwanStation is a totally new PlayStation 1 (aka PSX) emulator focusing on playability, speed, and long-term maintainability. Accuracy is not the main focus of the emulator, but the goal is to be as accurate as possible while maintaining performance suitable for low-end devices. "Hack" options are discouraged, the default configuration should support all playable games with only some of the enhancements having compatibility issues. A "BIOS" ROM image is required to start the emulator and to play games. You can use an image from any hardware version or region, although mismatching game regions and BIOS regions may have compatibility issues. A ROM image is not provided with the emulator for legal reasons, you should dump this from your own console using Caetla or other means. DuckStation includes hardware rendering (OpenGL, Vulkan and D3D11), upscaling and 24-bit color and a 64-bit dynarec."
-hw_render = "true"
-required_hw_api = "OpenGL >= 3.0 | OpenGL Core >= 3.1 | Vulkan >= 1.0 | Direct3D >= 11.0"
+
+description = "SwanStation is a fork of the Duckstation PlayStation 1 (aka PSX) emulator focusing on playability, speed, and long-term maintainability ported to libretro. Accuracy is not the main focus of the emulator, but the goal is to be as accurate as possible while maintaining performance suitable for low-end devices. 'Hack' options are discouraged, the default configuration should support all playable games with only some of the enhancements having compatibility issues. A 'BIOS' ROM image is required to start the emulator and to play games. You can use an image from any hardware version or region, although mismatching game regions and BIOS regions may have compatibility issues. A ROM image is not provided with the emulator for legal reasons, you should dump this from your own console using Caetla or other means. SwanStation includes hardware rendering (OpenGL, Vulkan and D3D11), upscaling and 24-bit color and a 64-bit dynarec."
diff --git a/dist/info/easyrpg_libretro.info b/dist/info/easyrpg_libretro.info
index 8e259024..8b716f29 100644
--- a/dist/info/easyrpg_libretro.info
+++ b/dist/info/easyrpg_libretro.info
@@ -28,3 +28,5 @@ needs_fullpath = "true"
 disk_control = "false"
 needs_kbd_mouse_focus = "true"
 is_experimental = "false"
+
+description = "A port of the EasyRPG game engine to libretro. This core is compatible with many RPG Maker homebrew games, primarily those created with the 2000 and 2003 flavors of the program."
diff --git a/dist/info/ecwolf_libretro.info b/dist/info/ecwolf_libretro.info
index 3d18e0cf..ab3d41f8 100644
--- a/dist/info/ecwolf_libretro.info
+++ b/dist/info/ecwolf_libretro.info
@@ -15,3 +15,5 @@ notes = "(!) ecwolf.pk3 (md5): d68107770b3ba230d10aa27472a7617b"
 firmware_count = 1
 firmware0_desc = "ecwolf.pk3 (ECWolf System File)"
 firmware0_path = "ecwolf.pk3"
+
+description = "A source port of the Wolfenstein 3D engine to libretro. This core provides a basic/traditional experience and is compatible with Wolfenstein 3D, Spear of Destiny and Super 3D Noah's Ark content, including shareware releases. The core removes menus and goes straight to the episode or skill selection and supports arbitrary framerates up to 360 fps."
diff --git a/dist/info/emux_chip8_libretro.info b/dist/info/emux_chip8_libretro.info
index 4d652d35..76b0e060 100644
--- a/dist/info/emux_chip8_libretro.info
+++ b/dist/info/emux_chip8_libretro.info
@@ -29,3 +29,5 @@ needs_fullpath = "true"
 disk_control = "false"
 needs_kbd_mouse_focus = "false"
 is_experimental = "true"
+
+description = "Emux is a cross-platform emulator project with a goal of emulating multiple kinds of machines related to gaming, such as consoles or arcades. Its philosophy is very much inspired by the Linux kernel (hence the name), which  brilliantly manages to support multiple machines while keeping drivers entirely platform-independent. Emux is designed in the same way, keeping a code base of CPUs and controllers separate from machines. This emulator was never fully developed and remains here for historical purposes or in case someone wishes to contribute to its development."
diff --git a/dist/info/emux_gb_libretro.info b/dist/info/emux_gb_libretro.info
index b2a5862a..1b02ddb0 100644
--- a/dist/info/emux_gb_libretro.info
+++ b/dist/info/emux_gb_libretro.info
@@ -37,3 +37,5 @@ firmware0_desc = "dmg_boot.bin (Game Boy Boot ROM)"
 firmware0_path = "dmg_boot.bin"
 firmware0_opt = "false"
 notes = "(!) dmg_boot.bin (md5): 32fbbd84168d3482956eb3c5051637f5"
+
+description = "Emux is a cross-platform emulator project with a goal of emulating multiple kinds of machines related to gaming, such as consoles or arcades. Its philosophy is very much inspired by the Linux kernel (hence the name), which  brilliantly manages to support multiple machines while keeping drivers entirely platform-independent. Emux is designed in the same way, keeping a code base of CPUs and controllers separate from machines. This emulator was never fully developed and remains here for historical purposes or in case someone wishes to contribute to its development."
diff --git a/dist/info/emux_nes_libretro.info b/dist/info/emux_nes_libretro.info
index 5a381b6d..043810ea 100644
--- a/dist/info/emux_nes_libretro.info
+++ b/dist/info/emux_nes_libretro.info
@@ -30,3 +30,5 @@ needs_fullpath = "true"
 disk_control = "false"
 needs_kbd_mouse_focus = "false"
 is_experimental = "true"
+
+description = "Emux is a cross-platform emulator project with a goal of emulating multiple kinds of machines related to gaming, such as consoles or arcades. Its philosophy is very much inspired by the Linux kernel (hence the name), which  brilliantly manages to support multiple machines while keeping drivers entirely platform-independent. Emux is designed in the same way, keeping a code base of CPUs and controllers separate from machines. This emulator was never fully developed and remains here for historical purposes or in case someone wishes to contribute to its development."
diff --git a/dist/info/emux_sms_libretro.info b/dist/info/emux_sms_libretro.info
index 0c8bead2..3ecf2b45 100644
--- a/dist/info/emux_sms_libretro.info
+++ b/dist/info/emux_sms_libretro.info
@@ -37,3 +37,5 @@ firmware0_desc = "bios.sms (Master System BIOS)"
 firmware0_path = "bios.sms"
 firmware0_opt = "false"
 notes = "(!) bios.sms (md5): missing"
+
+description = "Emux is a cross-platform emulator project with a goal of emulating multiple kinds of machines related to gaming, such as consoles or arcades. Its philosophy is very much inspired by the Linux kernel (hence the name), which  brilliantly manages to support multiple machines while keeping drivers entirely platform-independent. Emux is designed in the same way, keeping a code base of CPUs and controllers separate from machines. This emulator was never fully developed and remains here for historical purposes or in case someone wishes to contribute to its development."
diff --git a/dist/info/ffmpeg_libretro.info b/dist/info/ffmpeg_libretro.info
index 72054891..1278a6ee 100644
--- a/dist/info/ffmpeg_libretro.info
+++ b/dist/info/ffmpeg_libretro.info
@@ -1,3 +1,4 @@
+# Software Information
 display_name = "FFmpeg"
 authors = "Fabrice Bellard|FFmpeg team"
 supported_extensions = "mkv|avi|f4v|f4f|3gp|ogm|flv|mp4|mp3|flac|ogg|m4a|webm|3g2|mov|wmv|mpg|mpeg|vob|asf|divx|m2p|m2ts|ps|ts|mxf|wma|wav"
@@ -7,4 +8,10 @@ systemname = "FFmpeg"
 license = "LGPLv2, GPLv2"
 permissions = ""
 display_version = "Git"
+
+# Libretro Information
 supports_no_game = "false"
+hw_render = "true"
+required_hw_api = "OpenGL Core >= 3.3"
+
+description = "A port of the powerful audio/video encoding/decoding library FFmpeg to libretro. This core allows playback of a variety of audio and video formats, with a fancy audio visualizer and the ability to do interframe blending for smoother scrolling of non-native framerates."
diff --git a/dist/info/fixgb_libretro.info b/dist/info/fixgb_libretro.info
index 461c32e7..b0548285 100644
--- a/dist/info/fixgb_libretro.info
+++ b/dist/info/fixgb_libretro.info
@@ -1,18 +1,26 @@
+# Software Information
 display_name = "Nintendo - Game Boy / Color (fixGB)"
 authors = "FIX94"
 supported_extensions = "gb|gbc|gbs"
 corename = "fixGB"
-manufacturer = "Nintendo"
 categories = "Emulator"
-systemname = "Game Boy/Game Boy Color"
-systemid = "game_boy"
-database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "MIT"
 permissions = ""
 display_version = "Alpha v0.8.1"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy/Game Boy Color"
+systemid = "game_boy"
+
+# Libretro Information
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 supports_no_game = "false"
+is_experimental = "true"
 firmware_count = 1
 firmware0_desc = "gbc_bios.bin (Game Boy Color BIOS)"
 firmware0_path = "gbc_bios.bin"
 firmware0_opt = "true"
 notes = "(!) gbc_bios.bin (md5): dbfce9db9deaa2567f6a84fde55f9680"
+
+description = "A preliminary Game Boy emulator written as a learning experience, this core still supports many of the games and features that are attractive to users, such as support for Game Boy Color palettes via BIOS and support for older colorization hacks by adding 'InvVRAM' to the filename (like this: foo.gb -> foo (InvVRAM).gb). However, users looking for a simple, turnkey GB/C emulator will probably have better luck with more mature options, such as SameBoy, Gambatte or GearBoy, depending on their use-case."
diff --git a/dist/info/fixnes_libretro.info b/dist/info/fixnes_libretro.info
index 8cbd0f17..51d2296d 100644
--- a/dist/info/fixnes_libretro.info
+++ b/dist/info/fixnes_libretro.info
@@ -1,15 +1,20 @@
+# Software Information
 display_name = "Nintendo - NES / Famicom (fixNES)"
 authors = "FIX94"
 supported_extensions = "nes|fds|qd|nsf"
 corename = "fixNES"
-manufacturer = "Nintendo"
 categories = "Emulator"
-systemname = "Nintendo Entertainment System"
-systemid = "nes"
-database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 license = "MIT"
 permissions = ""
 display_version = "Alpha v1.1"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Nintendo Entertainment System"
+systemid = "nes"
+
+# Libretro Information
+database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 supports_no_game = "false"
 firmware_count = 1
 firmware0_desc = "disksys.rom (Family Computer Disk System BIOS)"
diff --git a/dist/info/flycast_gles2_libretro.info b/dist/info/flycast_gles2_libretro.info
index 35d9bcb8..3383e667 100644
--- a/dist/info/flycast_gles2_libretro.info
+++ b/dist/info/flycast_gles2_libretro.info
@@ -1,17 +1,21 @@
+# Software Information
 display_name = "Sega - Dreamcast/NAOMI (Flycast GLES2)"
 authors = "flyinghead"
 supported_extensions = "chd|cdi|iso|elf|bin|cue|gdi|lst|zip|dat|7z|m3u"
 corename = "Flycast GLES2"
-manufacturer = "Sega"
-categories = "Emulator"
-systemname = "Sega Dreamcast"
-systemid = "dreamcast"
-database = "Sega - Dreamcast|Sega - NAOMI"
+display_version = "Git"
 license = "GPLv2"
 permissions = "dynarec_optional"
 display_version = "1.0"
-supports_no_game = "false"
-display_version = "Git"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Sega"
+systemname = "Sega Dreamcast"
+systemid = "dreamcast"
+
+# Libretro Information
+database = "Sega - Dreamcast|Sega - NAOMI"
 supports_no_game = "false"
 firmware_count = 8
 firmware0_desc = "dc/dc_boot.bin (Dreamcast BIOS)"
@@ -40,3 +44,5 @@ firmware7_path = "dc/awbios.zip"
 firmware7_opt  = "true"
 notes = "(!) dc_boot.bin (md5): e10c53c2f8b90bab96ead2d368858623|(!) dc_flash.bin (md5): 0a93f7940c455905bea6e392dfde92a4|(!) naomi.zip|(!) hod2bios.zip|(!) f355dlx.zip|(!) f355bios.zip|(!) airlbios.zip|(!) awbios.zip"
 required_hw_api = "OpenGL ES >= 2.0"
+
+description = "A port of the Flycast Dreamcast emulator to libretro. In addition to Dreamcast, the core also supports the NAOMI and Atomiswave arcade platforms (with appropriate BIOS images) and will load these games from the latest MAME ROMset. This particular Flycast variant is specially tuned for compatibility with older mobile GPUs that are limited to GLES2. Anyone with a more modern GPU should use a different version of the core."
diff --git a/dist/info/flycast_libretro.info b/dist/info/flycast_libretro.info
index aeadc270..18b08540 100644
--- a/dist/info/flycast_libretro.info
+++ b/dist/info/flycast_libretro.info
@@ -1,15 +1,20 @@
+# Software Information
 display_name = "Sega - Dreamcast/NAOMI (Flycast)"
 authors = "flyinghead"
 supported_extensions = "chd|cdi|iso|elf|bin|cue|gdi|lst|zip|dat|7z|m3u"
 corename = "Flycast"
-manufacturer = "Sega"
-categories = "Emulator"
-systemname = "Sega Dreamcast"
-systemid = "dreamcast"
-database = "Sega - Dreamcast|Sega - NAOMI"
 license = "GPLv2"
 permissions = ""
+categories = "Emulator"
 display_version = "Git"
+
+# Hardware Information
+manufacturer = "Sega"
+systemname = "Sega Dreamcast"
+systemid = "dreamcast"
+
+# Libretro Information
+database = "Sega - Dreamcast|Sega - NAOMI"
 supports_no_game = "false"
 firmware_count = 8
 firmware0_desc = "dc/dc_boot.bin (Dreamcast BIOS)"
@@ -38,4 +43,6 @@ firmware7_path = "dc/awbios.zip"
 firmware7_opt  = "true"
 notes = "(!) dc_boot.bin (md5): e10c53c2f8b90bab96ead2d368858623|(!) dc_flash.bin (md5): 0a93f7940c455905bea6e392dfde92a4|(!) naomi.zip|(!) hod2bios.zip|(!) f355dlx.zip|(!) f355bios.zip|(!) airlbios.zip|(!) awbios.zip"
 hw_render = "true"
-required_hw_api = "OpenGL >= 3.0 | OpenGL Core >= 3.1 | OpenGL ES >= 2.0"
+required_hw_api = "OpenGL >= 3.0 | OpenGL Core >= 3.1 | OpenGL ES >= 2.0 | Vulkan >= 1.0"
+
+description = "A port of the Flycast Dreamcast emulator to libretro. In addition to Dreamcast, the core also supports the NAOMI and Atomiswave arcade platforms (with appropriate BIOS images) and will load these games from the latest MAME ROMset. This version of the core uses advanced graphics API features, so anyone using an older, limited GPU may need to use the GLES2 version if this one is incompatible with their hardware."
diff --git a/dist/info/fmsx_libretro.info b/dist/info/fmsx_libretro.info
index d5a9146c..72751f4a 100644
--- a/dist/info/fmsx_libretro.info
+++ b/dist/info/fmsx_libretro.info
@@ -1,15 +1,20 @@
+# Software Information
 display_name = "Microsoft - MSX (fMSX)"
 authors = "Marat Fayzullin"
 supported_extensions = "rom|mx1|mx2|dsk|cas"
 corename = "fMSX"
-manufacturer = "Various"
 categories = "Emulator"
-systemname = "MSX"
-systemid = "msx"
-database = "Microsoft - MSX|Microsoft - MSX2"
 license = "Non-commercial"
 permissions = ""
 display_version = "4.9"
+
+# Hardware Information
+manufacturer = "Various"
+systemname = "MSX"
+systemid = "msx"
+
+# Libretro Information
+database = "Microsoft - MSX|Microsoft - MSX2"
 supports_no_game = "false"
 firmware_count = 10
 firmware0_desc = "MSX.ROM (MSX BIOS)"
@@ -43,3 +48,5 @@ firmware9_desc = "KANJI.ROM (Kanji Font)"
 firmware9_path = "KANJI.ROM"
 firmware9_opt = "true"
 notes = "(!) MSX.ROM (md5): 364a1a579fe5cb8dba54519bcfcdac0d|(!) MSX2.ROM (md5): ec3a01c91f24fbddcbcab0ad301bc9ef|(!) MSX2EXT.ROM (md5): 2183c2aff17cf4297bdb496de78c2e8a|(!) MSX2P.ROM (md5): 847cc025ffae665487940ff2639540e5|(!) MSX2PEXT.ROM (md5): 7c8243c71d8f143b2531f01afa6a05dc |(!) DISK.ROM (md5): 80dcd1ad1a4cf65d64b7ba10504e8190 |(!) FMPAC.ROM (md5): 6f69cc8b5ed761b03afd78000dfb0e19 |(!) MSXDOS2.ROM (md5): 6418d091cd6907bbcf940324339e43bb |(!) PAINTER.ROM (md5): 403cdea1cbd2bb24fae506941f8f655e |(!) KANJI.ROM (md5): febe8782b466d7c3b16de6d104826b34"
+
+description = "A port of the Marat Fayzullin's fMSX emulator to libretro. This core emulates MSX, MSX2 and MSX2+ 8-bit home consoles."
diff --git a/dist/info/freechaf_libretro.info b/dist/info/freechaf_libretro.info
index 49589da4..c6c64a57 100644
--- a/dist/info/freechaf_libretro.info
+++ b/dist/info/freechaf_libretro.info
@@ -1,14 +1,19 @@
+# Software Information
 display_name = "Fairchild ChannelF (FreeChaF)"
 authors = "David Richardson"
 supported_extensions = "bin|chf"
 corename = "FreeChaF"
-manufacturer = "Fairchild"
-categories = "Emulator"
-systemname = "FreeChaF"
-database = "FreeChaF"
 license = "GPLv3"
 permissions = ""
 display_version = "GIT"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Fairchild"
+systemname = "FreeChaF"
+
+# Libretro Information
+database = "FreeChaF"
 supports_no_game = "false"
 firmware_count = 3
 firmware0_desc = "sl31253.bin"
@@ -21,3 +26,5 @@ firmware2_desc = "sl90025.bin"
 firmware2_path = "sl90025.bin"
 firmware2_opt = "false"
 notes = "(!) sl31253.bin (md5): ac9804d4c0e9d07e33472e3726ed15c3|(!) sl31254.bin (md5): da98f4bb3242ab80d76629021bb27585|(!) sl90025.bin (md5): 95d339631d867c8f1d15a5f2ec26069d"
+
+description = "A lightweight Fairchild ChannelF / Video Entertainment System designed for libretro. This core was written specifically for use with low-power devices, such as Raspberry Pi, and supports loading a 'no cart' ROM to play the built-in games, controller swapping and dual-analog controls. The core requires the sl31253 and sl31254 BIOS images but the sl90025 BIOS will supersede the sl31253 version if found."
diff --git a/dist/info/freeintv_libretro.info b/dist/info/freeintv_libretro.info
index cf286c88..1218e042 100644
--- a/dist/info/freeintv_libretro.info
+++ b/dist/info/freeintv_libretro.info
@@ -1,15 +1,20 @@
+# Software Information
 display_name = "Mattel - Intellivision (FreeIntv)"
 authors = "David Richardson"
 supported_extensions = "int|bin|rom"
 corename = "FreeIntv"
-manufacturer = "Mattel"
 categories = "Emulator"
-systemname = "Intellivision"
-systemid = "intellivision"
-database = "Mattel - Intellivision"
 license = "GPLv3"
 permissions = ""
 display_version = "2018.1.5"
+
+# Hardware Information
+manufacturer = "Mattel"
+systemname = "Intellivision"
+systemid = "intellivision"
+
+# Libretro Information
+database = "Mattel - Intellivision"
 supports_no_game = "false"
 firmware_count = 2
 firmware0_desc = "exec.bin"
@@ -19,3 +24,5 @@ firmware1_desc = "grom.bin"
 firmware1_path = "grom.bin"
 firmware1_opt = "false"
 notes = "(!) exec.bin (md5): 62e761035cb657903761800f4437b8af|(!) grom.bin (md5): 0cd5946c6473e42e8e4c2137785e427f"
+
+description = "A libretro emulation core for the Mattel Intellivision computer (but not the Entertainment Computer System or Intellivoice). Many Intellivision games relied on controller overlays to provide context for the controls, and many of these can be found online for reference, including at https://arcadepunks.com/intellivision-controller-overlays."
diff --git a/dist/info/freej2me_libretro.info b/dist/info/freej2me_libretro.info
index 126bbfd9..61a3491f 100644
--- a/dist/info/freej2me_libretro.info
+++ b/dist/info/freej2me_libretro.info
@@ -1,15 +1,20 @@
+# Software Information
 display_name = "J2ME (FreeJ2ME)"
 authors = "David Richardson|Saket Dandawate"
 supported_extensions = "jar"
 corename = "FreeJ2ME"
-manufacturer = "Java"
 categories = "Emulator"
-systemname = "J2ME"
-database = "J2ME"
 license = "GPLv3"
 permissions = ""
 display_version = "GIT"
+
+# Hardware Information
+manufacturer = "Java"
+systemname = "J2ME"
+
+# Libretro Information
 supports_no_game = "false"
+database = "J2ME"
 firmware_count = 3
 firmware0_desc = "freej2me-fx.jar"
 firmware0_path = "freej2me-fx.jar"
diff --git a/dist/info/frodo_libretro.info b/dist/info/frodo_libretro.info
index 22ffeaca..22d0ea54 100644
--- a/dist/info/frodo_libretro.info
+++ b/dist/info/frodo_libretro.info
@@ -1,13 +1,18 @@
+# Software Information
 display_name = "Commodore - C64 (Frodo)"
 authors = "Frodo Team Members"
 supported_extensions = "d64|t64|x64|p00|lnx|zip"
 corename = "Frodo"
-manufacturer = "Commodore"
-systemid = "commodore_64"
-categories = "Emulator"
-systemname = "C64"
-database = "Commodore - 64"
 license = "GPLv2"
 permissions = ""
 display_version = "v4.2"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Commodore"
+systemid = "commodore_64"
+systemname = "C64"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Commodore - 64"
diff --git a/dist/info/fsuae_libretro.info b/dist/info/fsuae_libretro.info
index f5e34ae7..31a30230 100644
--- a/dist/info/fsuae_libretro.info
+++ b/dist/info/fsuae_libretro.info
@@ -1,13 +1,20 @@
+# Software Information
 display_name = "Commodore - Amiga (FS-UAE)"
 authors = "FrodeSolheim"
 supported_extensions = "adf|ipf|fs-uae"
 corename = "FS-UAE"
-manufacturer = "Commodore"
 categories = "Emulator"
-systemname = "Commodore Amiga"
-systemid = "amiga"
-database = "Commodore - Amiga"
 license = "GPLv2"
 permissions = ""
 display_version = "v2.7.15"
+
+# Hardware Information
+manufacturer = "Commodore"
+systemname = "Commodore Amiga"
+systemid = "amiga"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Commodore - Amiga"
+
+description = "A port of the FS-UAE Amiga emulator to libretro. The core expects a kickstart to be located in the user's 'saves' directory, in a subdirectory named fsue/Kickstarts. Most users will be better served by the PUAE core, which has received more work to integrate it with libretro and to make it usable with just a gamepad."
diff --git a/dist/info/fuse_libretro.info b/dist/info/fuse_libretro.info
index c3b4a55d..9b64eb8f 100644
--- a/dist/info/fuse_libretro.info
+++ b/dist/info/fuse_libretro.info
@@ -1,14 +1,48 @@
+# Software Information
 display_name = "Sinclair - ZX Spectrum (Fuse)"
 authors = "Team Fuse"
 supported_extensions = "tzx|tap|z80|rzx|scl|trd"
 corename = "Fuse"
-manufacturer = "Sinclair|Amstrad"
 categories = "Emulator"
-systemname = "ZX Spectrum (various)"
-systemid = "zx_spectrum"
-database = "Sinclair - ZX Spectrum +3|Sinclair - ZX Spectrum"
 license = "GPLv3"
 permissions = ""
 display_version = "1.1.1"
+
+# Hardware Information
+manufacturer = "Sinclair|Amstrad"
+systemname = "ZX Spectrum (various)"
+systemid = "zx_spectrum"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Sinclair - ZX Spectrum +3|Sinclair - ZX Spectrum"
+
+# BIOS / Firmware
+firmware_count = 8
+firmware0_desc = "128p-0.rom (Pentagon)"
+firmware0_path = "128p-0.rom"
+firmware0_opt = "true"
+firmware1_desc = "128p-1.rom (Pentagon machines)"
+firmware1_path = "128p-1.rom"
+firmware1_opt = "true"
+firmware2_desc = "trdos.rom (Pentagon machines)"
+firmware2_path = "trdos.rom"
+firmware2_opt = "true"
+firmware3_desc = "gluck.rom (Pentagon 128K / 1024)"
+firmware3_path = "gluck.rom"
+firmware3_opt = "true"
+firmware4_desc = "256p-0.rom (Scorpion 256K)"
+firmware4_path = "256p-0.rom"
+firmware4_opt = "true"
+firmware5_desc = "256p-1.rom (Scorpion 256K)"
+firmware5_path = "256p-1.rom"
+firmware5_opt = "true"
+firmware6_desc = "256p-2.rom (Scorpion 256K)"
+firmware6_path = "256p-2.rom"
+firmware6_opt = "true"
+firmware7_desc = "256p-3.rom (Scorpion 256K)"
+firmware7_path = "256p-3.rom"
+firmware7_opt = "true"
 notes = "[1] Amstrad have kindly given their permission for the redistribution|[^] of their copyrighted material but retain that copyright."
+
+description = "A port of the Fuse Unix Spectrum Emulator to libretro, this core supports many Spectrum, Timex, Pentagon and Scorpion variants. The Pentagon and Scorpion machines need BIOS images placed inside a 'fuse' subdirectory inside the frontend's 'system' directory. This core is a good first choice for playing Spectrum games, with 81 (EightyOne) covering the Sinclair ZX 81 games."
diff --git a/dist/info/gambatte_libretro.info b/dist/info/gambatte_libretro.info
index 1000c76f..5fab0443 100644
--- a/dist/info/gambatte_libretro.info
+++ b/dist/info/gambatte_libretro.info
@@ -1,16 +1,23 @@
+# Software Information
 display_name = "Nintendo - Game Boy / Color (Gambatte)"
 authors = "Sinamas"
 supported_extensions = "gb|gbc|dmg"
 corename = "Gambatte"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Game Boy/Game Boy Color"
-systemid = "game_boy"
-database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv2"
 permissions = ""
 display_version = "v0.5.0"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy/Game Boy Color"
+systemid = "game_boy"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
+
+# BIOS / Firmware
 firmware_count = 2
 firmware0_desc = "gb_bios.bin (Game Boy BIOS)"
 firmware0_path = "gb_bios.bin"
@@ -19,3 +26,5 @@ firmware1_desc = "gbc_bios.bin (Game Boy Color BIOS)"
 firmware1_path = "gbc_bios.bin"
 firmware1_opt = "true"
 notes = "(!) gb_bios.bin (md5): 32fbbd84168d3482956eb3c5051637f5|(!) gbc_bios.bin (md5): dbfce9db9deaa2567f6a84fde55f9680"
+
+description = "A port of the Gambatte Game Boy emulator to libretro. One of the very first libretro cores, this core is reasonably accurate (enough to run all but a scant handful of games with no visible bugs) and blisteringly fast. While Gearboy and SameBoy cores have surpassed it in accuracy, Gambatte is still an excellent choice on low-power systems that cannot handle the more-accurate newcomers while maintaining full speed."
diff --git a/dist/info/gearboy_libretro.info b/dist/info/gearboy_libretro.info
index 369f8482..21de47eb 100644
--- a/dist/info/gearboy_libretro.info
+++ b/dist/info/gearboy_libretro.info
@@ -1,13 +1,20 @@
+# Software Information
 display_name = "Nintendo - Game Boy / Color (Gearboy)"
 authors = "Ignacio Sanchez"
 supported_extensions = "gb|dmg|gbc|cgb|sgb"
 corename = "Gearboy"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Game Boy/Game Boy Color"
-systemid = "game_boy"
-database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv3"
 permissions = ""
 display_version = "3.2.0"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy/Game Boy Color"
+systemid = "game_boy"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Nintendo - Game Boy|Nintendo - Game Boy Color"
+
+description = "A port of the Gearboy Game Boy emulator to libretro. Gearboy is a new and highly accurate Game Boy emulator from indie/homebrew dev and all-around smart guy, drhelius. It supports both Game Boy and Game Boy Color games and is an excellent choice for playing these games on a modern system."
diff --git a/dist/info/gearsystem_libretro.info b/dist/info/gearsystem_libretro.info
index dcbaabfc..61f362ae 100644
--- a/dist/info/gearsystem_libretro.info
+++ b/dist/info/gearsystem_libretro.info
@@ -1,13 +1,20 @@
+# Software Information
 display_name = "Sega - MS/GG/SG-1000 (Gearsystem)"
 authors = "Ignacio Sanchez"
 supported_extensions = "sms|gg|sg|bin|rom"
 corename = "Gearsystem"
-manufacturer = "Sega"
 categories = "Emulator"
-systemname = "Sega 8-bit (MS/GG/SG-1000)"
-systemid = "master_system"
-database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - SG-1000"
 license = "GPLv3"
 permissions = ""
 display_version = "3.2.0"
+
+# Hardware Information
+manufacturer = "Sega"
+systemname = "Sega 8-bit (MS/GG/SG-1000)"
+systemid = "master_system"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - SG-1000"
+
+description = "A port of the highly accurate Sega 8-bit console emulator Gearsystem to libretro. This core supports Sega's Mark III, Master System, Game Gear and Game 1000 (SG-1000) consoles, along with the Othello Multivision. It faithfully emulates all of the hardware, including undocumented features of the Z80 CPU. This core is an excellent choice for emulating these consoles on a modern system."
diff --git a/dist/info/genesis_plus_gx_libretro.info b/dist/info/genesis_plus_gx_libretro.info
index 3fa91b92..268e276e 100644
--- a/dist/info/genesis_plus_gx_libretro.info
+++ b/dist/info/genesis_plus_gx_libretro.info
@@ -1,16 +1,34 @@
+# Software Information
 display_name = "Sega - MS/GG/MD/CD (Genesis Plus GX)"
 authors = "Charles McDonald|Eke-Eke"
 supported_extensions = "mdx|md|smd|gen|bin|cue|iso|sms|bms|gg|sg|68k|chd|m3u"
 corename = "Genesis Plus GX"
-manufacturer = "Sega"
 categories = "Emulator"
-systemname = "Sega 8/16-bit (Various)"
-systemid = "mega_drive"
-database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - Mega-CD - Sega CD|Sega - Mega Drive - Genesis|Sega - PICO|Sega - SG-1000"
 license = "Non-commercial"
 permissions = ""
 display_version = "v1.7.4"
+
+# Hardware Information
+manufacturer = "Sega"
+systemname = "Sega 8/16-bit (Various)"
+systemid = "mega_drive"
+
+# Libretro Information
 supports_no_game = "false"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+core_options_version = "1.0"
+database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - Mega-CD - Sega CD|Sega - Mega Drive - Genesis|Sega - PICO|Sega - SG-1000"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+
+# BIOS / Firmware
 firmware_count = 12
 firmware0_desc = "bios_MD.bin (Mega Drive startup ROM)"
 firmware0_path = "bios_MD.bin"
@@ -49,3 +67,5 @@ firmware11_desc = "ggenie.bin (Game Genie ROM)"
 firmware11_path = "ggenie.bin"
 firmware11_opt = "true"
 notes = "(!) sk2chip.bin (md5): b4e76e416b887f4e7413ba76fa735f16|(!) sk.bin (md5): 4ea493ea4e9f6c9ebfccbdb15110367e"
+
+description = "A port of the Genesis Plus GX emulator to libretro. Originally designed to run on the Wii console via homebrew, Genesis Plus GX was one of the first cores ported to libretro, and it has always been the first choice for any 8- and 16-bit Sega consoles, from Master System to Game Gear to Genesis/Mega Drive to Sega CD. Only the 32X is not supported. The core is both fast and highly accurate and it benefits from a tight and feature-filled integration with libretro."
diff --git a/dist/info/genesis_plus_gx_wide_libretro.info b/dist/info/genesis_plus_gx_wide_libretro.info
index e06cfefb..438749c2 100644
--- a/dist/info/genesis_plus_gx_wide_libretro.info
+++ b/dist/info/genesis_plus_gx_wide_libretro.info
@@ -1,16 +1,34 @@
+# Software Information
 display_name = "Sega - MS/GG/MD/CD (Genesis Plus GX Wide)"
 authors = "Charles McDonald|Eke-Eke|heyjoeway"
 supported_extensions = "mdx|md|smd|gen|bin|cue|iso|sms|bms|gg|sg|68k|chd|m3u"
 corename = "Genesis Plus GX Wide"
-manufacturer = "Sega"
 categories = "Emulator"
-systemname = "Sega 8/16-bit (Various)"
-systemid = "mega_drive"
-database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - Mega-CD - Sega CD|Sega - Mega Drive - Genesis|Sega - PICO|Sega - SG-1000"
 license = "Non-commercial"
 permissions = ""
 display_version = "v1.7.4"
+
+# Hardware Information
+manufacturer = "Sega"
+systemname = "Sega 8/16-bit (Various)"
+systemid = "mega_drive"
+
+# Libretro Information
 supports_no_game = "false"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+core_options_version = "1.0"
+database = "Sega - Game Gear|Sega - Master System - Mark III|Sega - Mega-CD - Sega CD|Sega - Mega Drive - Genesis|Sega - PICO|Sega - SG-1000"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+
+# BIOS / Firmware
 firmware_count = 12
 firmware0_desc = "bios_MD.bin (Mega Drive startup ROM)"
 firmware0_path = "bios_MD.bin"
@@ -49,3 +67,5 @@ firmware11_desc = "ggenie.bin (Game Genie ROM)"
 firmware11_path = "ggenie.bin"
 firmware11_opt = "true"
 notes = "(!) sk2chip.bin (md5): b4e76e416b887f4e7413ba76fa735f16|(!) sk.bin (md5): 4ea493ea4e9f6c9ebfccbdb15110367e"
+
+description = "A port of the Genesis Plus GX emulator to libretro but with the addition of a widescreen hack that can be applied to games automatically (not all games play nicely with the effect, but a surprisingly large number are pretty good). Otherwise identical to the normal Genesis Plus GX libretro core, this core is a great choice for any 8- and 16-bit Sega consoles, from Master System to Game Gear to Genesis/Mega Drive to Sega CD. Only the 32X is not supported. The core is both fast and highly accurate and it benefits from a tight and feature-filled integration with libretro."
diff --git a/dist/info/gme_libretro.info b/dist/info/gme_libretro.info
index 40089986..6c6a9e4d 100644
--- a/dist/info/gme_libretro.info
+++ b/dist/info/gme_libretro.info
@@ -1,10 +1,19 @@
+# Software Information
 display_name = "Game Music Emu"
 authors = "Blargg"
 supported_extensions = "ay|gbs|gym|hes|kss|nsf|nsfe|sap|spc|vgm|vgz|zip"
 corename = "Game Music Emu"
 categories = "Music player"
-systemname = "Music"
 license = "GPLv3"
 permissions = ""
 display_version = "Git"
+
+# Hardware Information
+manufacturer = "Various"
+systemname = "Music"
+systemid = "game_music"
+
+# Libretro Information
 supports_no_game = "false"
+
+description = "A port of blargg's classic Game Music Emu to libretro. This core allows playback of a wide variety of video game music formats and is a good first choice for this purpose, though some emulator cores will also support playback of their respective native formats and may do so with additional options (low-pass filtering, etc.) or accuracy."
diff --git a/dist/info/gpsp_libretro.info b/dist/info/gpsp_libretro.info
index a2c6d1a6..7da52731 100644
--- a/dist/info/gpsp_libretro.info
+++ b/dist/info/gpsp_libretro.info
@@ -1,18 +1,34 @@
+# Software Information
 display_name = "Nintendo - Game Boy Advance (gpSP)"
 authors = "Exophase"
 supported_extensions = "gba|bin"
 corename = "gpSP"
-manufacturer = "Nintendo"
 categories = "Emulator"
-systemname = "Game Boy Advance"
-systemid = "game_boy_advance"
-database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv2"
 permissions = ""
 display_version = "Git"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy Advance"
+systemid = "game_boy_advance"
+
+# Libretro Information
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 supports_no_game = "false"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "false"
+hw_render = "false"
+
+# BIOS / Firmware
 firmware_count = 1
 firmware0_desc = "gba_bios.bin (Game Boy Advance BIOS)"
 firmware0_path = "gba_bios.bin"
 firmware0_opt = "false"
 notes = "(!) gba_bios.bin (md5): a860e8c0b6d573d191e4ec7db1b1e4f6"
+
+description = "A port of the lightweight gpSP Game Boy Advance emulator to libretro. Originally designed for use on the PSP via homebrew and later ported to the OpenPandora hardware, this core runs extremely fast on low-powered hardware. This speed comes at a price, though, as the core has problems with some games. For most users, mGBA or VBA-M will be better options, and this core should only be utilized in cases where those cores cannot maintain full speed."
diff --git a/dist/info/gw_libretro.info b/dist/info/gw_libretro.info
index 20bceff1..492724ad 100644
--- a/dist/info/gw_libretro.info
+++ b/dist/info/gw_libretro.info
@@ -1,12 +1,19 @@
+# Software Information
 display_name = "Handheld Electronic (GW)"
 authors = "Andre Leiradella"
 supported_extensions = "mgw"
 corename = "GW"
-manufacturer = "Various"
 categories = "Emulator"
-systemname = "Handheld Electronic"
-database = "Handheld Electronic Game"
 license = "zlib"
 permissions = ""
 display_version = "Git"
+
+# Hardware Information
+manufacturer = "Various"
+systemname = "Handheld Electronic"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Handheld Electronic Game"
+
+description = "A simulator of various Game and Watch-style handheld electronic games, ported to libretro. Unlike MAME's emulation of these games, which is based on actual emulation, these simulations were created by observing the behavior of the games and then creating new logic that acts similarly. This core is much easier to get up and running than via MAME, so it's a good first choice for playing those games."
diff --git a/dist/info/handy_libretro.info b/dist/info/handy_libretro.info
index 9a73a6eb..2156c52f 100644
--- a/dist/info/handy_libretro.info
+++ b/dist/info/handy_libretro.info
@@ -1,7 +1,10 @@
+# Software Information
 display_name = "Atari - Lynx (Handy)"
 authors = "K. Wilkins"
 supported_extensions = "lnx|o"
 corename = "Handy"
+
+# Hardware Information
 manufacturer = "Atari"
 categories = "Emulator"
 systemname = "Lynx"
@@ -10,9 +13,27 @@ database = "Atari - Lynx"
 license = "Zlib"
 permissions = ""
 display_version = "0.95"
+
+# Libretro Information
 supports_no_game = "false"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "false"
+core_options = "true"
+core_options_version = "1.0"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+
+# BIOS / Firmware
 firmware_count = 1
 firmware0_desc = "lynxboot.img (Lynx Boot Image)"
 firmware0_path = "lynxboot.img"
 firmware0_opt = "true"
 notes = "(!) lynxboot.img (md5): fcd403db69f54290b51035d82f835e7b"
+
+description = "A port of the venerable Handy Atari Lynx emulator to libretro. This core provides a solid emulation experience for this console, with support for video rotation, etc. but the hardware's unusual screen refresh rate of 75 Hz means scrolling for this core will always be a bit choppy on more common 60 Hz displays. This core is a good first choice for playing Lynx games via libretro frontends."
diff --git a/dist/info/hatari_libretro.info b/dist/info/hatari_libretro.info
index 240989c0..86baad42 100644
--- a/dist/info/hatari_libretro.info
+++ b/dist/info/hatari_libretro.info
@@ -1,17 +1,38 @@
+# Software Information
 display_name = "Atari - ST/STE/TT/Falcon (Hatari)"
 authors = "Nicolas Pomarède"
 supported_extensions = "st|msa|zip|stx|dim|ipf|m3u"
 corename = "Hatari"
-manufacturer = "Atari"
-categories = "Emulator"
-systemname = "Atari ST/STE/TT/Falcon"
-systemid = "atari_st"
 license = "GPLv2"
 permissions = ""
 display_version = "1.8"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Atari"
+systemname = "Atari ST/STE/TT/Falcon"
+systemid = "atari_st"
+
+# Libretro Information
 supports_no_game = "false"
+savestate = "false"
+savestate_features = "null"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "true"
+core_options_version = "1.0"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+
+# Firmware / BIOS
 firmware_count = 1
 firmware0_desc = "tos.img (TOS 1.02 US aka Mega TOS)"
 firmware0_path = "tos.img"
 firmware0_opt = "false"
 notes = "(!) tos.img (md5): c1c57ce48e8ee4135885cee9e63a68a2"
+
+description = "A port of the Hatari emulator to libretro. This core supports Atari's 16-/32-bit ST/STE/TT/Falcon hardware and, unlike many other ST emulators that just try to give a good environment for running GEM applications, Hatari tries to emulate the hardware as closely as possible, so it can support most of the old Atari games and demos. The core requires a TOS image to function and supports m3u playlists for use with multi-disk games. This core is a good option for most users on a modern device."
diff --git a/dist/info/hbmame_libretro.info b/dist/info/hbmame_libretro.info
index a00e28cf..8ac69ffe 100644
--- a/dist/info/hbmame_libretro.info
+++ b/dist/info/hbmame_libretro.info
@@ -1,16 +1,22 @@
+# Software Information
 display_name = "Arcade (HBMAME)"
 authors = "Robbbert,MAMEdev"
 supported_extensions = "zip|chd|7z|cmd"
 corename = "HBMAME (Git)"
-manufacturer = "Various"
-categories = "Emulator"
-systemname = "Arcade (various)"
-systemid = "hbmame"
-database = "HBMAME"
-database_match_archive_member = "true"
 license = "GPLv2+"
 permissions = ""
 display_version = "Git"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Various"
+systemname = "Arcade (various)"
+systemid = "hbmame"
+
+# Libretro Information
 supports_no_game = "false"
+database_match_archive_member = "true"
+database = "HBMAME"
 notes = "[1] HBMAME supports MAME save states.|[2] HBMAME supports extracted MAME cheats.|[3] The BIOS files must be inside the ROM directory.|[4] CHD files and their directories must be inside the ROM directory.|[5] ARTWORK, CHEATS, HASH, INI and SAMPLES directories can be placed|[^] inside the 'SYSTEMDIR\mame' directory. (INI/Source for drivers)|[6] When saving, the following directories will be created in the 'SAVEDIR\mame'|[^] directory: STATES, NVRAM, INPUT, SNAPS, CFG, MEMCARD, and DIFF.|[7] Default combo to call MAME GUI: Retropad Select + X|[^] Retropad Select + Start => CANCEL"
-description = "'HBMAME' is compatible with HBMAME latest ROM sets. HBMAME (HomeBrew MAME) is a derivative of MAME, and contains various hacks and homebrews."
+
+description = "'HBMAME' is compatible with HBMAME latest ROM sets. HBMAME (HomeBrew MAME) is a derivative of MAME, and contains various hacks and homebrews. For most users and use-cases (that is, anything that's not homebrew/hacks), the normal, up-to-date MAME or FBNeo cores are a better option."
diff --git a/dist/info/higan_sfc_balanced_libretro.info b/dist/info/higan_sfc_balanced_libretro.info
index 280da82b..5abfe998 100644
--- a/dist/info/higan_sfc_balanced_libretro.info
+++ b/dist/info/higan_sfc_balanced_libretro.info
@@ -1,16 +1,35 @@
+# Software Information
 display_name = "Nintendo - SNES / Famicom (nSide Balanced)"
-authors = "hex-usr"
+authors = "Near|hex-usr"
 supported_extensions = "sfc|smc|gb|gbc|bml|rom"
 corename = "nSide (Super Famicom Balanced)"
-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 - Game Boy|Nintendo - Game Boy Color"
 license = "GPLv3"
 permissions = ""
+categories = "Emulator"
 display_version = "v105 (Super Famicom Balanced)"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Super Nintendo Entertainment System"
+systemid = "super_nes"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Game Boy|Nintendo - Game Boy Color"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "true"
+core_options = "true"
+core_options_version = "1.0"
+load_subsystem = "true"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+
+# Firmware / BIOS
 firmware_count = 21
 firmware0_desc = "dsp1.data.rom"
 firmware0_path = "dsp1.data.rom"
diff --git a/dist/info/higan_sfc_libretro.info b/dist/info/higan_sfc_libretro.info
index 6cf0019a..574bea2d 100644
--- a/dist/info/higan_sfc_libretro.info
+++ b/dist/info/higan_sfc_libretro.info
@@ -1,16 +1,35 @@
+# Software Information
 display_name = "Nintendo - SNES / Famicom (higan Accuracy)"
-authors = "byuu"
+authors = "Near"
 supported_extensions = "sfc|smc|gb|gbc|bml|rom"
-corename = "higan (Super Famicom Accuracy)"
-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 - Game Boy|Nintendo - Game Boy Color"
+corename = "nSide (Super Famicom Accuracy)"
 license = "GPLv3"
 permissions = ""
+categories = "Emulator"
 display_version = "v105 (Super Famicom Accuracy)"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Super Nintendo Entertainment System"
+systemid = "super_nes"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Nintendo - Super Nintendo Entertainment System|Nintendo - Super Nintendo Entertainment System Hacks|Nintendo - Game Boy|Nintendo - Game Boy Color"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "true"
+core_options = "true"
+core_options_version = "1.0"
+load_subsystem = "true"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+
+# Firmware / BIOS
 firmware_count = 21
 firmware0_desc = "dsp1.data.rom"
 firmware0_path = "dsp1.data.rom"
diff --git a/dist/info/imageviewer_libretro.info b/dist/info/imageviewer_libretro.info
index 56e661c1..a208413a 100644
--- a/dist/info/imageviewer_libretro.info
+++ b/dist/info/imageviewer_libretro.info
@@ -1,7 +1,14 @@
+# Software Information
 display_name = "Imageviewer"
 authors = "Team Libretro"
 supported_extensions = "jpg|jpeg|png|bmp|psd|tga|gif|hdr|pic|ppm|pgm"
 corename = "Imageviewer"
 categories = "Images"
 permissions = ""
+
+# Hardware Information
+
+# Libretro Information
 supports_no_game = "false"
+
+description = "A basic core for viewing still images in a libretro frontend. This core can load basic, non-animated images in a variety of formats."
diff --git a/dist/info/ishiiruka_libretro.info b/dist/info/ishiiruka_libretro.info
index 4ef4a842..4b0db93d 100644
--- a/dist/info/ishiiruka_libretro.info
+++ b/dist/info/ishiiruka_libretro.info
@@ -33,3 +33,5 @@ is_experimental = "false"
 
 # BIOS/Firmware
 notes = "(!) You need to have Dolphin Sys folder in system/dolphin-emu/Sys.|(!) See: https://docs.libretro.com/library/dolphin/#setup"
+
+description = "A port of the Ishiiruka fork of the Dolphin Gamecube/Wii emulator to libretro. Ishiiruka is a performance-focused fork of the Dolphin emulator that makes some sacrifices for a faster/smoother experience, and is/was notable for including asynchronous shader compilation--to reduce stuttering--before mainline Dolphin released its 'ubershaders' solution. While the normal Dolphin core is probably a better option for most users, this core may be helpful for squeezing out a bit more performance or getting smoother scrolling in some cases."
diff --git a/dist/info/kronos_libretro.info b/dist/info/kronos_libretro.info
index e56329c9..ed99ecdc 100644
--- a/dist/info/kronos_libretro.info
+++ b/dist/info/kronos_libretro.info
@@ -1,16 +1,26 @@
+# Software Information
 display_name = "Sega - Saturn/ST-V (Kronos)"
 authors = "Guillaume Duhammel|Theo Berkau|Anders Montonen|devmiyax|FCare|barbudreadmon"
 supported_extensions = "ccd|chd|cue|iso|mds|zip|m3u"
 corename = "Kronos"
-manufacturer = "Sega"
 categories = "Emulator"
-systemname = "Saturn"
-systemid = "sega_saturn"
-database = "Sega - Saturn|Sega - ST-V"
 license = "GPLv2"
 permissions = ""
 display_version = "v2.1.2"
+
+# Hardware Information
+manufacturer = "Sega"
+systemname = "Saturn"
+systemid = "sega_saturn"
+
+# Libretro Information
 supports_no_game = "false"
+database = "Sega - Saturn|Sega - ST-V"
+hw_render = "true"
+required_hw_api = "OpenGL Core >= 4.2"
+is_experimental = "false"
+
+# Firmware / BIOS
 firmware_count = 4
 firmware0_desc = "kronos/saturn_bios.bin (Saturn BIOS)"
 firmware0_path = "kronos/saturn_bios.bin"
@@ -25,6 +35,5 @@ firmware3_desc = "mpr-19367-mx.ic1 (Ultraman: Hikari no Kyojin Densetsu ROM Cart
 firmware3_path = "mpr-19367-mx.ic1"
 firmware3_opt = "true"
 notes = "(!) saturn_bios.bin (md5): af5828fdff51384f99b3c4926be27762|(!) stvbios.zip|(!) mpr-18811-mx.ic1 (md5): 255113ba943c92a54facd25a10fd780c|(!) mpr-19367-mx.ic1 (md5): 1cd19988d1d72a3e7caa0b73234c96b4"
-hw_render = "true"
-required_hw_api = "OpenGL Core >= 4.2"
 
+description = "A port of the Kronos Saturn emulator, which is itself a port of the Yabause emulator, to libretro. This core supports many modern, fancy features, such as internal resolution increases, though these features come with relatively steep GPU requirements, making this core incompatible with very old, weak or mobile hardware. While not as accurate as Beetle-Saturn, this core's relative speed and eye-candy features make it a good first choice for many users, while those interested in accuracy first-and-foremost should stick with Beetle-Saturn and those on mobile devices should try Yaba Sanshiro (another Yabause fork focused on mobile) instead."
diff --git a/dist/info/lowresnx_libretro.info b/dist/info/lowresnx_libretro.info
index bd20d5b8..93b3bc6c 100644
--- a/dist/info/lowresnx_libretro.info
+++ b/dist/info/lowresnx_libretro.info
@@ -28,3 +28,5 @@ hw_render = "false"
 needs_fullpath = "false"
 disk_control = "false"
 is_experimental = "false"
+
+description = "A port of the LowRes NX fantasy console to libretro. This core represents an imaginary handheld game console inspired by real 8- and 16-bit systems that is intended for simple games that can be programmed in second-generation, structured BASIC. It supports a d-pad, two action buttons and a keyboard for input. The LowRes NX platform comes with a variety of development tools including a Character Designer for editing sprites tile sand fonts, a Background Designer for tile maps and screen layouts and a Sound Composer for music and sound effects."