diff --git a/app-emulation/81_libretro/81_libretro-1.0a_20200613.recipe b/app-emulation/81_libretro/81_libretro-1.0a_20210311.recipe
similarity index 91%
rename from app-emulation/81_libretro/81_libretro-1.0a_20200613.recipe
rename to app-emulation/81_libretro/81_libretro-1.0a_20210311.recipe
index 5c26f3cfd..90178c1ef 100644
--- a/app-emulation/81_libretro/81_libretro-1.0a_20200613.recipe
+++ b/app-emulation/81_libretro/81_libretro-1.0a_20210311.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://github.com/libretro/81-libretro/"
 COPYRIGHT="2008-2018 Michael D Wynne, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="7d769d09b1b6932466272aaf82b37922c1e2e61f"
+srcGitRev="028da99de5a69c1d067eb3f270c0507377c83bb7"
 SOURCE_URI="https://github.com/libretro/81-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="732aefb2058ac6c506534a3986af9001e9f495fc08db9c98d386843429e38c76"
+CHECKSUM_SHA256="76a5c2520b7d1e73e7950398cc5ed68c33aa6aa99b29d6bb039b78237a745240"
 SOURCE_FILENAME="81-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="81-libretro-$srcGitRev"
 ADDITIONAL_FILES="81_libretro.info.in"
diff --git a/app-emulation/81_libretro/additional-files/81_libretro.info.in b/app-emulation/81_libretro/additional-files/81_libretro.info.in
index ca55e101b..376fba96b 100644
--- a/app-emulation/81_libretro/additional-files/81_libretro.info.in
+++ b/app-emulation/81_libretro/additional-files/81_libretro.info.in
@@ -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/app-emulation/atari800_libretro/additional-files/atari800_libretro.info.in b/app-emulation/atari800_libretro/additional-files/atari800_libretro.info.in
index 32dfd8d9d..507add008 100644
--- a/app-emulation/atari800_libretro/additional-files/atari800_libretro.info.in
+++ b/app-emulation/atari800_libretro/additional-files/atari800_libretro.info.in
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Atari - 5200 (Atari800)"
 authors = "Petr Stehlik"
-supported_extensions = "xfd|atr|atx|cdm|cas|bin|a52|xex|zip"
+supported_extensions = "xfd|atr|cdm|cas|bin|a52|zip|atx|car|com|xex"
 corename = "Atari800"
 categories = "Emulator"
 license = "GPLv2"
@@ -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/app-emulation/atari800_libretro/atari800_libretro-3.1.0_20201109.recipe b/app-emulation/atari800_libretro/atari800_libretro-3.1.0_20210415.recipe
similarity index 92%
rename from app-emulation/atari800_libretro/atari800_libretro-3.1.0_20201109.recipe
rename to app-emulation/atari800_libretro/atari800_libretro-3.1.0_20210415.recipe
index a33101040..9abc9f303 100644
--- a/app-emulation/atari800_libretro/atari800_libretro-3.1.0_20201109.recipe
+++ b/app-emulation/atari800_libretro/atari800_libretro-3.1.0_20210415.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://atari800.github.io/"
 COPYRIGHT="2001-2018, the Atari800 Dev team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="bda9478afca6b25a1c3899a31a934f1b17cdea40"
+srcGitRev="86c87b543f2076e7edcff5d7f5031845ca4ffb96"
 SOURCE_URI="https://github.com/libretro/libretro-atari800/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="76962b2d75cecb3565dd703bb59e1a9c86efca834351b5ec9044d93bbe086ea4"
+CHECKSUM_SHA256="6a477a7eeb26bb2cdc3890d841ab5900eb1456d0e7190171237ca4ccfe526623"
 SOURCE_FILENAME="libretro-atari800-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-atari800-$srcGitRev"
 ADDITIONAL_FILES="atari800_libretro.info.in"
diff --git a/app-emulation/bluemsx_libretro/additional-files/bluemsx_libretro.info.in b/app-emulation/bluemsx_libretro/additional-files/bluemsx_libretro.info.in
index baf03dc21..58448b28e 100644
--- a/app-emulation/bluemsx_libretro/additional-files/bluemsx_libretro.info.in
+++ b/app-emulation/bluemsx_libretro/additional-files/bluemsx_libretro.info.in
@@ -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/app-emulation/bluemsx_libretro/bluemsx_libretro-2.9.0_20201018.recipe b/app-emulation/bluemsx_libretro/bluemsx_libretro-2.9.0_20210409.recipe
similarity index 91%
rename from app-emulation/bluemsx_libretro/bluemsx_libretro-2.9.0_20201018.recipe
rename to app-emulation/bluemsx_libretro/bluemsx_libretro-2.9.0_20210409.recipe
index 542711168..ee3328ceb 100644
--- a/app-emulation/bluemsx_libretro/bluemsx_libretro-2.9.0_20201018.recipe
+++ b/app-emulation/bluemsx_libretro/bluemsx_libretro-2.9.0_20210409.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://bluemsx.msxblue.com/"
 COPYRIGHT="2003-2020 Daniel Vik, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="29eca1e7874f16bf9f997c51bf1dc14298083e71"
+srcGitRev="ec24a00edb1a767a7cd41f26e78698af6b60463d"
 SOURCE_URI="https://github.com/libretro/blueMSX-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="0a0333988d7afe0cad4ae923bf9f90d50d5a67c7b096c11b1e23aa9a8df78a07"
+CHECKSUM_SHA256="a6f748fff0ebd7642d2f2351b1a5a6d8b9ec77444d517a401cca76c2f0e0ee45"
 SOURCE_FILENAME="libretro-bluemsx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="blueMSX-libretro-$srcGitRev"
 ADDITIONAL_FILES="bluemsx_libretro.info.in"
diff --git a/app-emulation/cap32_libretro/additional-files/cap32_libretro.info.in b/app-emulation/cap32_libretro/additional-files/cap32_libretro.info.in
index daa22332f..6cdda5fd2 100644
--- a/app-emulation/cap32_libretro/additional-files/cap32_libretro.info.in
+++ b/app-emulation/cap32_libretro/additional-files/cap32_libretro.info.in
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Amstrad - CPC (Caprice32)"
 authors = "Ulrich Doewich|dantoine"
-supported_extensions = "dsk|sna|zip|tap|cdt|voc|m3u"
+supported_extensions = "dsk|sna|zip|tap|cdt|voc|cpr|m3u"
 corename = "Caprice32"
 license = "GPLv2"
 permissions = ""
@@ -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/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20201007.recipe b/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20210327.recipe
similarity index 91%
rename from app-emulation/cap32_libretro/cap32_libretro-4.2.0_20201007.recipe
rename to app-emulation/cap32_libretro/cap32_libretro-4.2.0_20210327.recipe
index aa7445134..d83aa93c7 100644
--- a/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20201007.recipe
+++ b/app-emulation/cap32_libretro/cap32_libretro-4.2.0_20210327.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://sourceforge.net/projects/caprice32/"
 COPYRIGHT="1997-2020 Ulrich Doewich, dantoine, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="4c470bb36b6bca00866d07c2036732ab85747a2a"
+srcGitRev="408da091504dabe9678b25b7a6c3bbef0bc4c140"
 SOURCE_URI="https://github.com/libretro/libretro-cap32/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="40a5cb903b1c45c08cc7671a8546d7b3da9e88499e0910bf3aab483655efd57b"
+CHECKSUM_SHA256="aa9474099c350d2fbac149f3feab28512e66d68f2a566d9f2de32ae5d37e26fc"
 SOURCE_FILENAME="cap32-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-cap32-$srcGitRev"
 ADDITIONAL_FILES="cap32_libretro.info.in"
diff --git a/app-emulation/fmsx_libretro/additional-files/fmsx_libretro.info.in b/app-emulation/fmsx_libretro/additional-files/fmsx_libretro.info.in
index 7fd5ca82e..2866ebf26 100644
--- a/app-emulation/fmsx_libretro/additional-files/fmsx_libretro.info.in
+++ b/app-emulation/fmsx_libretro/additional-files/fmsx_libretro.info.in
@@ -1,16 +1,23 @@
+# 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 = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Various"
+systemname = "MSX"
+systemid = "msx"
+
+# Libretro Features
+database = "Microsoft - MSX|Microsoft - MSX2"
 supports_no_game = "false"
+
+# BIOS / Firmware
 firmware_count = 10
 firmware0_desc = "MSX.ROM (MSX BIOS)"
 firmware0_path = "MSX.ROM"
@@ -43,3 +50,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/app-emulation/fmsx_libretro/fmsx_libretro-4.9_20201018.recipe b/app-emulation/fmsx_libretro/fmsx_libretro-4.9_20210327.recipe
similarity index 90%
rename from app-emulation/fmsx_libretro/fmsx_libretro-4.9_20201018.recipe
rename to app-emulation/fmsx_libretro/fmsx_libretro-4.9_20210327.recipe
index c0a6ce547..1577917c4 100644
--- a/app-emulation/fmsx_libretro/fmsx_libretro-4.9_20201018.recipe
+++ b/app-emulation/fmsx_libretro/fmsx_libretro-4.9_20210327.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://fms.komkon.org/fMSX/"
 COPYRIGHT="1993-2020 Marat Fayzullin, the libretro team"
 LICENSE="fMSX"
 REVISION="1"
-srcGitRev="fdc6a2f5f40428f2b38d5e533f542e2a9206b080"
+srcGitRev="2c412ee4ca5675c06a47382a319f1770be735803"
 SOURCE_URI="https://github.com/libretro/fmsx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="2b3a68ca3f0c3f2a6e65dac5d661958e7fd779d24890ac1fb2270da2e948644b"
+CHECKSUM_SHA256="12f42361c3952aaecdba556aeed6c635983937de29e43d9c5d54b7529f04bfd0"
 SOURCE_FILENAME="libretro-fmsx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="fmsx-libretro-$srcGitRev"
 ADDITIONAL_FILES="fmsx_libretro.info.in"
diff --git a/app-emulation/fuse_libretro/additional-files/fuse_libretro.info.in b/app-emulation/fuse_libretro/additional-files/fuse_libretro.info.in
index fe42381ef..9082ba66b 100644
--- a/app-emulation/fuse_libretro/additional-files/fuse_libretro.info.in
+++ b/app-emulation/fuse_libretro/additional-files/fuse_libretro.info.in
@@ -1,14 +1,48 @@
+# Software Information
 display_name = "Sinclair - ZX Spectrum (Fuse)"
 authors = "Team Fuse"
-supported_extensions = "tzx|tap|z80|rzx|scl|trd"
+supported_extensions = "tzx|tap|z80|rzx|scl|trd|dsk"
 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 = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Sinclair|Amstrad"
+systemname = "ZX Spectrum (various)"
+systemid = "zx_spectrum"
+
+# Libretro Features
 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 = "256s-0.rom (Scorpion 256K)"
+firmware4_path = "256s-0.rom"
+firmware4_opt = "true"
+firmware5_desc = "256s-1.rom (Scorpion 256K)"
+firmware5_path = "256s-1.rom"
+firmware5_opt = "true"
+firmware6_desc = "256s-2.rom (Scorpion 256K)"
+firmware6_path = "256s-2.rom"
+firmware6_opt = "true"
+firmware7_desc = "256s-3.rom (Scorpion 256K)"
+firmware7_path = "256s-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/app-emulation/fuse_libretro/fuse_libretro-1.1.1_20201027.recipe b/app-emulation/fuse_libretro/fuse_libretro-1.1.1_20210419.recipe
similarity index 91%
rename from app-emulation/fuse_libretro/fuse_libretro-1.1.1_20201027.recipe
rename to app-emulation/fuse_libretro/fuse_libretro-1.1.1_20210419.recipe
index 053473a78..8f12e5009 100644
--- a/app-emulation/fuse_libretro/fuse_libretro-1.1.1_20201027.recipe
+++ b/app-emulation/fuse_libretro/fuse_libretro-1.1.1_20210419.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://fuse-emulator.sourceforge.net/"
 COPYRIGHT="1999-2020, the Fuse team, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="33710427a519c82bb38654c5a098272e14fc1823"
+srcGitRev="330655e4735ce2ace887dcc641a837fb5747d47f"
 SOURCE_URI="https://github.com/libretro/fuse-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="dde8486f541b942682bf7ffdcd0b4537c8391db44f6a78d2f6e6dfce499d1b3e"
+CHECKSUM_SHA256="cdd26e1d8f050f988f9937d35512c42417ec10cc33c16fb22bbfed70320e181c"
 SOURCE_FILENAME="fuse-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="fuse-libretro-$srcGitRev"
 ADDITIONAL_FILES="fuse_libretro.info.in"
diff --git a/app-emulation/hatari_libretro/additional-files/hatari_libretro.info.in b/app-emulation/hatari_libretro/additional-files/hatari_libretro.info.in
index 1effec097..a769f0a2f 100644
--- a/app-emulation/hatari_libretro/additional-files/hatari_libretro.info.in
+++ b/app-emulation/hatari_libretro/additional-files/hatari_libretro.info.in
@@ -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 = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Atari"
+systemname = "Atari ST/STE/TT/Falcon"
+systemid = "atari_st"
+
+# Libretro Features
 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/app-emulation/hatari_libretro/hatari_libretro-1.8_20201028.recipe b/app-emulation/hatari_libretro/hatari_libretro-1.8_20210317.recipe
similarity index 92%
rename from app-emulation/hatari_libretro/hatari_libretro-1.8_20201028.recipe
rename to app-emulation/hatari_libretro/hatari_libretro-1.8_20210317.recipe
index 23ffbc70f..95252f2f3 100644
--- a/app-emulation/hatari_libretro/hatari_libretro-1.8_20201028.recipe
+++ b/app-emulation/hatari_libretro/hatari_libretro-1.8_20210317.recipe
@@ -10,9 +10,9 @@ HOMEPAGE="https://hatari.tuxfamily.org/"
 COPYRIGHT="2001-2020 Nicolas Pomarède, the Hatari team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="f19bc118b4e39f5b5131505d5ead09109384be8f"
+srcGitRev="cea06eebf695b078fadc0e78bb0f2b2baaca799f"
 SOURCE_URI="https://github.com/libretro/hatari/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="62606ae3763b0fe152a09ebb303e4c22cdafdec333d437800d71d5842fcbd594"
+CHECKSUM_SHA256="41a044a0a5625052a4a477dca47897aafccd23d835dc20b43e41b37a38e64628"
 SOURCE_FILENAME="hatari-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="hatari-$srcGitRev"
 ADDITIONAL_FILES="hatari_libretro.info.in"
diff --git a/app-emulation/nekop2_libretro/additional-files/nekop2_libretro.info.in b/app-emulation/nekop2_libretro/additional-files/nekop2_libretro.info.in
index 9e1884da4..3336aaeaa 100644
--- a/app-emulation/nekop2_libretro/additional-files/nekop2_libretro.info.in
+++ b/app-emulation/nekop2_libretro/additional-files/nekop2_libretro.info.in
@@ -1,13 +1,32 @@
+# Software Information
 display_name = "NEC - PC-98 (Neko Project II)"
 authors = "Neko Project II Team"
 supported_extensions = "d98|zip|98d|fdi|fdd|2hd|tfd|d88|88d|hdm|xdf|dup|cmd|hdi|thd|nhd|hdd"
 corename = "Neko Project II"
+license = "MIT"
+permissions = ""
+display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC-98"
 systemid = "pc_98"
-database = "PC-98"
-license = ""
-permissions = ""
-display_version = "@DISPLAY_VERSION@"
+
+# Libretro Features
 supports_no_game = "false"
+database = "PC-98"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "false"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+is_experimental = "false"
+
+description = "An emulator for NEC's PC-9801 (aka PC-98) personal computer platform, ported to libretro. This core has been completely superseded by the Neko Project II Kai core."
diff --git a/app-emulation/nekop2_libretro/nekop2_libretro-0.86_20200507.recipe b/app-emulation/nekop2_libretro/nekop2_libretro-0.86_20210317.recipe
similarity index 90%
rename from app-emulation/nekop2_libretro/nekop2_libretro-0.86_20200507.recipe
rename to app-emulation/nekop2_libretro/nekop2_libretro-0.86_20210317.recipe
index c3a01fc87..befb42825 100644
--- a/app-emulation/nekop2_libretro/nekop2_libretro-0.86_20200507.recipe
+++ b/app-emulation/nekop2_libretro/nekop2_libretro-0.86_20210317.recipe
@@ -4,10 +4,10 @@ the non IBM compatible NEC PC-98xx family. This is the libretro port of NekoP2."
 HOMEPAGE="https://www.yui.ne.jp/np2/"
 COPYRIGHT="2005-2020 the NekoP2 team, the libretro team"
 LICENSE="MIT"
-REVISION="2"
-srcGitRev="b005f6b7f608e22ab33bccafe581c62a025050bb"
+REVISION="1"
+srcGitRev="cd389b3490d5048873c40edd949a1b0631e0606d"
 SOURCE_URI="https://github.com/libretro/libretro-meowPC98/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="97f01caac41bd909bdcf0f3dbc31aabfff77da06b6f6e329e2be5221c514921f"
+CHECKSUM_SHA256="6689487085533e6db9f95151ad202a7a04f0b6ddfcc9db87b32cbb34ed4ef4c0"
 SOURCE_FILENAME="nekop2-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-meowPC98-$srcGitRev"
 ADDITIONAL_FILES="nekop2_libretro.info.in"
diff --git a/games-arcade/mrboom_libretro/additional-files/mrboom_libretro.info.in b/games-arcade/mrboom_libretro/additional-files/mrboom_libretro.info.in
index 72af01116..7d939310e 100644
--- a/games-arcade/mrboom_libretro/additional-files/mrboom_libretro.info.in
+++ b/games-arcade/mrboom_libretro/additional-files/mrboom_libretro.info.in
@@ -1,13 +1,32 @@
+# Software Information
 display_name = "Mr.Boom (Bomberman)"
 authors = "Remdy"
 supported_extensions = ""
 corename = "Mr.Boom"
 categories = "Game"
-systemname = "Mr.Boom"
-systemid = "bomberman"
-database = "MrBoom"
-license = ""
+license = "MIT"
 supported_extensions = "desktop"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
+systemname = "Mr.Boom"
+systemid = "bomberman"
+
+# Libretro Features
 supports_no_game = "true"
+database = "MrBoom"
+savestate = "true"
+savestate_features = "deterministic"
+cheats = "false"
+input_descriptors = "false"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+is_experimental = "false"
+
+description = "A fun, multiplayer and feature-filled clone of the classic Bomberman series, converted from DOS using asm2c. It includes an advanced CPU AI for single-player sessions."
diff --git a/games-arcade/mrboom_libretro/mrboom_libretro-4.9_20201124.recipe b/games-arcade/mrboom_libretro/mrboom_libretro-5.2_20210325.recipe
similarity index 85%
rename from games-arcade/mrboom_libretro/mrboom_libretro-4.9_20201124.recipe
rename to games-arcade/mrboom_libretro/mrboom_libretro-5.2_20210325.recipe
index eed7378af..98f49bd8d 100644
--- a/games-arcade/mrboom_libretro/mrboom_libretro-4.9_20201124.recipe
+++ b/games-arcade/mrboom_libretro/mrboom_libretro-5.2_20210325.recipe
@@ -7,14 +7,14 @@ HOMEPAGE="http://mrboom.mumblecore.org/"
 COPYRIGHT="2001-2020 Remdy Software, the libretro team"
 LICENSE="MIT"
 REVISION="1"
-srcGitRev="8c9dc9b6c18f304f8c7b3514e3e5f5f5524ff645"
+srcGitRev="553075dcbdfede35f508480c0f9abba1709d13fb"
 SOURCE_URI="https://github.com/libretro/mrboom-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="c2a361c81d7bbd1c1b6da1e30b3621ac7ead8807132617d13779d8ad7a1f79e7"
+CHECKSUM_SHA256="48db2beafe70d4b84391a24ff4eb9b7b66357e2c09d318110f50f07b38aeed9d"
 SOURCE_FILENAME="libretro-mrboom-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="mrboom-libretro-$srcGitRev"
-srcGitRev_2="a810c57f8c4e51659ae776beb25d7bd4a7b86251"
+srcGitRev_2="4a615c44655acc4d358bfa44da5f476745b4f425"
 SOURCE_URI_2="https://github.com/libretro/libretro-common/archive/$srcGitRev_2.tar.gz"
-CHECKSUM_SHA256_2="d146d67593d73179d6ddd9f5208e902458f6851be5a6dead3bc8bdfd4cd094e8"
+CHECKSUM_SHA256_2="5e138380fcb713c4aacfc6e413deb5c1c261f61f246181a03fcd89bb0a9d87e8"
 SOURCE_FILENAME_2="libretro-common-$srcGitRev_2.tar.gz"
 ADDITIONAL_FILES="mrboom_libretro.info.in"
 
@@ -43,7 +43,7 @@ BUILD()
 	sed -e "s/@DISPLAY_VERSION@/v${portVersion/_/-}/" \
 		$portDir/additional-files/mrboom_libretro.info.in \
 		> mrboom_libretro.info
-	rmdir ./libretro-common
+	rm -rf ./libretro-common
 	cp -r $sourceDir2/libretro-common-$srcGitRev_2 ./libretro-common
 	make $jobArgs clean && make $jobArgs
 }
diff --git a/games-emulation/dosbox_libretro/additional-files/dosbox_libretro.info.in b/games-emulation/dosbox_libretro/additional-files/dosbox_libretro.info.in
index 182495bc0..d484df36d 100644
--- a/games-emulation/dosbox_libretro/additional-files/dosbox_libretro.info.in
+++ b/games-emulation/dosbox_libretro/additional-files/dosbox_libretro.info.in
@@ -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/games-emulation/dosbox_libretro/dosbox_libretro-0.74_20200930.recipe b/games-emulation/dosbox_libretro/dosbox_libretro-0.74_20201229.recipe
similarity index 91%
rename from games-emulation/dosbox_libretro/dosbox_libretro-0.74_20200930.recipe
rename to games-emulation/dosbox_libretro/dosbox_libretro-0.74_20201229.recipe
index b2a770270..0444f4afe 100644
--- a/games-emulation/dosbox_libretro/dosbox_libretro-0.74_20200930.recipe
+++ b/games-emulation/dosbox_libretro/dosbox_libretro-0.74_20201229.recipe
@@ -7,9 +7,9 @@ HOMEPAGE="https://www.dosbox.com/"
 COPYRIGHT="2000-2020 Dosbox team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="665d16d4edaeb8b1d6170c4bcf3747d20b03d032"
+srcGitRev="aa71b67d54eaaf9e41cdd3cb5153d9cff0ad116e"
 SOURCE_URI="https://github.com/libretro/dosbox-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="3206f8f9f2ffb3aba6580ad21b2415684ed18680ec046aac97ad869d47f3decc"
+CHECKSUM_SHA256="5ed77ba6cc864ede7d2bdd51f36dc4b8f0adf77f7058fc3c7f8413f689222854"
 SOURCE_FILENAME="dosbox-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="dosbox-libretro-$srcGitRev"
 ADDITIONAL_FILES="dosbox_libretro.info.in"
diff --git a/games-emulation/fbneo_libretro/additional-files/fbneo_libretro.info.in b/games-emulation/fbneo_libretro/additional-files/fbneo_libretro.info.in
index e0517b23f..e601b3b59 100644
--- a/games-emulation/fbneo_libretro/additional-files/fbneo_libretro.info.in
+++ b/games-emulation/fbneo_libretro/additional-files/fbneo_libretro.info.in
@@ -1,18 +1,37 @@
+# Software Information
 display_name = "Arcade (FinalBurn Neo)"
 authors = "Team FBNeo"
-supported_extensions = "zip|7z|cue"
+supported_extensions = "zip|7z|cue|ccd"
 corename = "FinalBurn Neo"
-manufacturer = "Various"
-categories = "Emulator"
-systemname = "Arcade (various)"
-systemid = "fb_alpha"
-database = "FBNeo - Arcade Games"
-database_match_archive_member = "false"
 license = "Non-commercial"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Various"
+systemname = "Arcade (various)"
+systemid = "fb_alpha"
+
+# Libretro Features
+savestate = "true"
+savestate_features = "deterministic"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+core_options_version = "1.0"
+load_subsystem = "true"
 supports_no_game = "false"
-firmware_count = 10
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+database_match_archive_member = "false"
+database = "FBNeo - Arcade Games"
+
+# BIOS / Firmware
+firmware_count = 21
 firmware0_desc = "fbneo/neogeo.zip (Neo Geo BIOS)"
 firmware0_path = "fbneo/neogeo.zip"
 firmware0_opt = "true"
@@ -43,5 +62,42 @@ firmware8_opt = "true"
 firmware9_desc = "fbneo/cchip.zip (C-Chip Internal ROM)"
 firmware9_path = "fbneo/cchip.zip"
 firmware9_opt = "true"
+firmware10_desc = "fbneo/bubsys.zip (Bubble System BIOS)"
+firmware10_path = "fbneo/bubsys.zip"
+firmware10_opt = "true"
+firmware11_desc = "fbneo/namcoc69.zip (Namco C69 BIOS)"
+firmware11_path = "fbneo/namcoc69.zip"
+firmware11_opt = "true"
+firmware12_desc = "fbneo/namcoc70.zip (Namco C70 BIOS)"
+firmware12_path = "fbneo/namcoc70.zip"
+firmware12_opt = "true"
+firmware13_desc = "fbneo/namcoc75.zip (Namco C75 BIOS)"
+firmware13_path = "fbneo/namcoc75.zip"
+firmware13_opt = "true"
+firmware14_desc = "fbneo/coleco.zip (ColecoVision System BIOS)"
+firmware14_path = "fbneo/coleco.zip"
+firmware14_opt = "true"
+firmware15_desc = "fbneo/fdsbios.zip (FDS System BIOS)"
+firmware15_path = "fbneo/fdsbios.zip"
+firmware15_opt = "true"
+firmware16_desc = "fbneo/msx.zip (MSX1 System BIOS)"
+firmware16_path = "fbneo/msx.zip"
+firmware16_opt = "true"
+firmware17_desc = "fbneo/ngp.zip (NeoGeo Pocket BIOS)"
+firmware17_path = "fbneo/ngp.zip"
+firmware17_opt = "true"
+firmware18_desc = "fbneo/spectrum.zip (ZX Spectrum BIOS)"
+firmware18_path = "fbneo/spectrum.zip"
+firmware18_opt = "true"
+firmware19_desc = "fbneo/spec128.zip (ZX Spectrum 128 BIOS)"
+firmware19_path = "fbneo/spec128.zip"
+firmware19_opt = "true"
+firmware20_desc = "fbneo/channelf.zip (Fairchild Channel F BIOS)"
+firmware20_path = "fbneo/channelf.zip"
+firmware20_opt = "true"
+firmware21_desc = "fbneo/hiscore.dat (High Score support database)"
+firmware21_path = "fbneo/hiscore.dat"
+firmware21_opt = "true"
 notes = "(!) The BIOS files can also be inside the ROM directory or the root of SYSTEM directory.|(!) Homepage : https://neo-source.com/"
+
 description = "Based on the latest up-to-date source, 'FinalBurn Neo' is compatible with FinalBurn Neo latest ROM sets. This core should be the first choice for most users who want to run arcade games via libretro. MAME runs more games, so if FBN is incompatible with a game, those are the next ones to try. The FBA2012 cores should only be used if a device cannot run FBN at full speed. Formerly known as 'FB Alpha'."
diff --git a/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20200925.recipe b/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20210506.recipe
similarity index 91%
rename from games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20200925.recipe
rename to games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20210506.recipe
index 806b4719e..a60f30bbf 100644
--- a/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20200925.recipe
+++ b/games-emulation/fbneo_libretro/fbneo_libretro-1.0.0.0_20210506.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://github.com/libretro/FBNeo"
 COPYRIGHT="2000-2019 the Final Burn team, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="0f55647e043ace3ffb21003ee66f4fc65ad6ed4f"
+srcGitRev="ddc048388ebb075fd59176b6837bbb2055f23fa4"
 SOURCE_URI="https://github.com/libretro/FBNeo/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="bc700d5b3e0657505959a8f03dcd7f92bc3b7279256bb00e35c47938063b8df9"
+CHECKSUM_SHA256="c0dc03b49807f98d4adb7f459b2a86f82dfb16f1548c62d20edf8b783d80628e"
 SOURCE_FILENAME="fbneo-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="FBNeo-$srcGitRev"
 ADDITIONAL_FILES="fbneo_libretro.info.in"
diff --git a/games-emulation/fceumm_libretro/additional-files/fceumm_libretro.info.in b/games-emulation/fceumm_libretro/additional-files/fceumm_libretro.info.in
index 006b43d70..341b73602 100644
--- a/games-emulation/fceumm_libretro/additional-files/fceumm_libretro.info.in
+++ b/games-emulation/fceumm_libretro/additional-files/fceumm_libretro.info.in
@@ -1,16 +1,35 @@
+# Software Information
 display_name = "Nintendo - NES / Famicom (FCEUmm)"
 authors = "FCEU Team|CaH4e3"
 supported_extensions = "fds|nes|unif|unf"
 corename = "FCEUmm"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Nintendo Entertainment System"
-systemid = "nes"
-database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Nintendo Entertainment System"
+systemid = "nes"
+
+# Libretro Features
 supports_no_game = "false"
+savestate = "true"
+savestate_features = "deterministic"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+core_options_version = "1.0"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
+
+# BIOS / Firmware
 firmware_count = 2
 firmware0_desc = "disksys.rom (Family Computer Disk System BIOS)"
 firmware0_path = "disksys.rom"
diff --git a/games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20201117.recipe b/games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20210420.recipe
similarity index 91%
rename from games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20201117.recipe
rename to games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20210420.recipe
index dcf50286d..a472d4237 100644
--- a/games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20201117.recipe
+++ b/games-emulation/fceumm_libretro/fceumm_libretro-0.0.1_20210420.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="http://cah4e3.shedevr.org.ru/fceultra.php"
 COPYRIGHT="2011-2018 the FCEU team, cah4e3, the libretro team"
 LICENSE="GNU LGPL v2"
 REVISION="1"
-srcGitRev="f090d5a4473d6208506d62c1df8f48720f7db64b"
+srcGitRev="9b884e87057ab293d298aa620ff86c217d88e591"
 SOURCE_URI="https://github.com/libretro/libretro-fceumm/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="cda29175550ef655a6df17c5698b5fa96be4cccbe40b9798ff47d5bbebfb904c"
+CHECKSUM_SHA256="29ba99f84a20e38118d43127996c71706a886ddf0db3a3ff4d19add68ebde2fa"
 SOURCE_FILENAME="libretro-fceumm-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-fceumm-$srcGitRev"
 ADDITIONAL_FILES="fceumm_libretro.info.in"
diff --git a/games-emulation/flycast_libretro/additional-files/flycast_libretro.info.in b/games-emulation/flycast_libretro/additional-files/flycast_libretro.info.in
index 1a9863bab..289da7d81 100644
--- a/games-emulation/flycast_libretro/additional-files/flycast_libretro.info.in
+++ b/games-emulation/flycast_libretro/additional-files/flycast_libretro.info.in
@@ -1,16 +1,23 @@
+# 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 = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Sega"
+systemname = "Sega Dreamcast"
+systemid = "dreamcast"
+
+# Libretro Features
+database = "Sega - Dreamcast|Sega - NAOMI"
 supports_no_game = "false"
+
+# BIOS / Firmware
 firmware_count = 8
 firmware0_desc = "dc/dc_boot.bin (Dreamcast BIOS)"
 firmware0_path = "dc/dc_boot.bin"
@@ -37,4 +44,7 @@ firmware7_desc = "dc/awbios.zip (Atomiswave BIOS from MAME)"
 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 Core >= 3.0 | OpenGL ES >= 2.0"
+hw_render = "true"
+required_hw_api = "OpenGL >= 3.0 | OpenGL Core >= 3.1 | OpenGL ES >= 2.0 | Vulkan >= 1.1"
+
+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/games-emulation/flycast_libretro/flycast_libretro-0.1_20201122.recipe b/games-emulation/flycast_libretro/flycast_libretro-0.1_20210506.recipe
similarity index 88%
rename from games-emulation/flycast_libretro/flycast_libretro-0.1_20201122.recipe
rename to games-emulation/flycast_libretro/flycast_libretro-0.1_20210506.recipe
index 7d1e2aae6..49d41ee0a 100644
--- a/games-emulation/flycast_libretro/flycast_libretro-0.1_20201122.recipe
+++ b/games-emulation/flycast_libretro/flycast_libretro-0.1_20210506.recipe
@@ -3,12 +3,12 @@ DESCRIPTION="Flycast is a cross-platform SEGA Dreamcast, Naomi and AtomisWave \
 emulator based off NullDC. It can accurately play several games and is in \
 active development."
 HOMEPAGE="https://github.com/libretro/flycast"
-COPYRIGHT="2013-2019, drk||Raziel, PsyMan, gb_away, the libretro team"
+COPYRIGHT="2013-2021, drk||Raziel, PsyMan, gb_away, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="8f3fd1f27cf6cd959e36f462d1f2884472715bff"
+srcGitRev="6f27e7121d2b9f2c084d18219a9e439c403a1b89"
 SOURCE_URI="https://github.com/libretro/flycast/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="44069155c1dc0e0a622d18d6a19df46d08654a7d3455fe0dfe1034a67cac9ab9"
+CHECKSUM_SHA256="9612ea19bf3f6d8b780a2cb43b461c748c7bc3f379e4403f7486f6212bcd21af"
 SOURCE_FILENAME="flycast-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="flycast-$srcGitRev"
 ADDITIONAL_FILES="flycast_libretro.info.in"
diff --git a/games-emulation/freeintv_libretro/additional-files/freeintv_libretro.info.in b/games-emulation/freeintv_libretro/additional-files/freeintv_libretro.info.in
index 696b40e3b..4e148eb15 100644
--- a/games-emulation/freeintv_libretro/additional-files/freeintv_libretro.info.in
+++ b/games-emulation/freeintv_libretro/additional-files/freeintv_libretro.info.in
@@ -1,16 +1,23 @@
+# 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 = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Mattel"
+systemname = "Intellivision"
+systemid = "intellivision"
+
+# Libretro Features
+database = "Mattel - Intellivision"
 supports_no_game = "false"
+
+# BIOS / Firmware
 firmware_count = 2
 firmware0_desc = "exec.bin"
 firmware0_path = "exec.bin"
@@ -19,3 +26,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/games-emulation/freeintv_libretro/freeintv_libretro-0.0_20201018.recipe b/games-emulation/freeintv_libretro/freeintv_libretro-0.0_20210322.recipe
similarity index 91%
rename from games-emulation/freeintv_libretro/freeintv_libretro-0.0_20201018.recipe
rename to games-emulation/freeintv_libretro/freeintv_libretro-0.0_20210322.recipe
index b9cb746e2..83609bba3 100644
--- a/games-emulation/freeintv_libretro/freeintv_libretro-0.0_20201018.recipe
+++ b/games-emulation/freeintv_libretro/freeintv_libretro-0.0_20210322.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://neocomputer.org/projects/freeintv/"
 COPYRIGHT="2018-2020 David Richardson, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="13343117429870031ca8ba0207ce17d3ecb4f949"
+srcGitRev="fcf494ce9578b564f9b466b593697ceb91fea137"
 SOURCE_URI="https://github.com/libretro/FreeIntv/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="9f6b758645bc983fdbab9e689ee1fa8e64604c27f73760c14906ef1acecea2eb"
+CHECKSUM_SHA256="8f776361e2edb75fdee7fbbfacde914691275a4277466bf9b0af480880bb9747"
 SOURCE_FILENAME="libretro-freeintv-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="FreeIntv-$srcGitRev"
 ADDITIONAL_FILES="freeintv_libretro.info.in"
diff --git a/games-emulation/gambatte_libretro/additional-files/gambatte_libretro.info.in b/games-emulation/gambatte_libretro/additional-files/gambatte_libretro.info.in
index 036b532e9..ba44b7205 100644
--- a/games-emulation/gambatte_libretro/additional-files/gambatte_libretro.info.in
+++ b/games-emulation/gambatte_libretro/additional-files/gambatte_libretro.info.in
@@ -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 = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy/Game Boy Color"
+systemid = "game_boy"
+
+# Libretro Features
 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/games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20201118.recipe b/games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20210325.recipe
similarity index 91%
rename from games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20201118.recipe
rename to games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20210325.recipe
index f4f72ae5e..7955111ab 100644
--- a/games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20201118.recipe
+++ b/games-emulation/gambatte_libretro/gambatte_libretro-0.5.0_20210325.recipe
@@ -7,9 +7,9 @@ HOMEPAGE="https://github.com/sinamas/gambatte"
 COPYRIGHT="2007-2018 Sindre Aamås, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="93e27debd228d65140f5107c6e7412b6c4abb3b6"
+srcGitRev="d7adc32658b9a3204422f075361f3315edc5d274"
 SOURCE_URI="https://github.com/libretro/gambatte-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="f99160c9fdca9a0cd8a3fa92807a37957ac97b4df15be5ec25837591a463e3eb"
+CHECKSUM_SHA256="2c931bbfd80f8012b43de41cfb5821307dd5a5cf649cc090fe1dd2e90c5f36fd"
 SOURCE_FILENAME="gambatte-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="gambatte-libretro-$srcGitRev"
 ADDITIONAL_FILES="gambatte_libretro.info.in"
diff --git a/games-emulation/genesis_plus_gx_libretro/additional-files/genesis_plus_gx_libretro.info.in b/games-emulation/genesis_plus_gx_libretro/additional-files/genesis_plus_gx_libretro.info.in
index 088f855f7..2072db130 100644
--- a/games-emulation/genesis_plus_gx_libretro/additional-files/genesis_plus_gx_libretro.info.in
+++ b/games-emulation/genesis_plus_gx_libretro/additional-files/genesis_plus_gx_libretro.info.in
@@ -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|gg|sg|68k|chd"
+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 = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Sega"
+systemname = "Sega 8/16-bit (Various)"
+systemid = "mega_drive"
+
+# Libretro Features
 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/games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20201118.recipe b/games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20210325.recipe
similarity index 92%
rename from games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20201118.recipe
rename to games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20210325.recipe
index 7a69aebd0..ab7584928 100644
--- a/games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20201118.recipe
+++ b/games-emulation/genesis_plus_gx_libretro/genesis_plus_gx_libretro-1.7.4_20210325.recipe
@@ -11,9 +11,9 @@ LICENSE="GenesisPlusGX
 	Xiph
 	Zlib"
 REVISION="1"
-srcGitRev="e8be314e5b31d26569461054262fabc2d2deee04"
+srcGitRev="a110a0598ee87de9294751a6645d9164654ffe1e"
 SOURCE_URI="https://github.com/libretro/Genesis-Plus-GX/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="d89e4932ecf8d581bee603856dffba4aa06b37062fc9daffff44f5220c311543"
+CHECKSUM_SHA256="dac8421a4bdff72ba2cad2dd9025d1c21bfe40d5a88803a5bdcd85c91305c361"
 SOURCE_FILENAME="libretro-genesis-plus-gx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="Genesis-Plus-GX-$srcGitRev"
 ADDITIONAL_FILES="genesis_plus_gx_libretro.info.in"
diff --git a/games-emulation/gpsp_libretro/additional-files/gpsp_libretro.info.in b/games-emulation/gpsp_libretro/additional-files/gpsp_libretro.info.in
index 8bdae1045..ccd808571 100644
--- a/games-emulation/gpsp_libretro/additional-files/gpsp_libretro.info.in
+++ b/games-emulation/gpsp_libretro/additional-files/gpsp_libretro.info.in
@@ -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 = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy Advance"
+systemid = "game_boy_advance"
+
+# Libretro Features
+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/games-emulation/gpsp_libretro/gpsp_libretro-0.91_20201110.recipe b/games-emulation/gpsp_libretro/gpsp_libretro-0.91_20210505.recipe
similarity index 91%
rename from games-emulation/gpsp_libretro/gpsp_libretro-0.91_20201110.recipe
rename to games-emulation/gpsp_libretro/gpsp_libretro-0.91_20210505.recipe
index acac98d6d..0a8bb2664 100644
--- a/games-emulation/gpsp_libretro/gpsp_libretro-0.91_20201110.recipe
+++ b/games-emulation/gpsp_libretro/gpsp_libretro-0.91_20210505.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://gpsp-dev.blogspot.com/"
 COPYRIGHT="2007-2018 Exophase, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="303572f31b4fc3e5eb338eeef10e8e8dc83feaab"
+srcGitRev="7877a8888b4e607c3df77c5d5f47e2c880cb9a24"
 SOURCE_URI="https://github.com/libretro/gpsp/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="79852fb21504528995496ec0de4407f1fb11f7e82d2335fd4fe0d18fecddcf96"
+CHECKSUM_SHA256="17694debc7414b326437155a4e4a580d7672b71fb7933c68f5d9ff8b62e30119"
 SOURCE_FILENAME="gpsp-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="gpsp-$srcGitRev"
 ADDITIONAL_FILES="gpsp_libretro.info.in"
diff --git a/games-emulation/gw_libretro/additional-files/gw_libretro.info.in b/games-emulation/gw_libretro/additional-files/gw_libretro.info.in
index 561283c64..3bdba9806 100644
--- a/games-emulation/gw_libretro/additional-files/gw_libretro.info.in
+++ b/games-emulation/gw_libretro/additional-files/gw_libretro.info.in
@@ -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 = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Various"
+systemname = "Handheld Electronic"
+
+# Libretro Features
 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/games-emulation/gw_libretro/gw_libretro-1.6.2_20200101.recipe b/games-emulation/gw_libretro/gw_libretro-1.6.2_20210425.recipe
similarity index 91%
rename from games-emulation/gw_libretro/gw_libretro-1.6.2_20200101.recipe
rename to games-emulation/gw_libretro/gw_libretro-1.6.2_20210425.recipe
index 503449ec0..588f4ed64 100644
--- a/games-emulation/gw_libretro/gw_libretro-1.6.2_20200101.recipe
+++ b/games-emulation/gw_libretro/gw_libretro-1.6.2_20210425.recipe
@@ -8,9 +8,9 @@ COPYRIGHT="2013-2018 the libretro team"
 LICENSE="Zlib
 	Public Domain"
 REVISION="1"
-srcGitRev="819b1dde560013003eeac86c2069c5be7af25c6d"
+srcGitRev="6b99e7711d75a8194bede3229e8cca5bc99f0687"
 SOURCE_URI="https://github.com/libretro/gw-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="e5dc930b9f835a617211c78d5efd7998b3e4d12660465ad2e53fc8e09da0d86f"
+CHECKSUM_SHA256="74d2bedc19b2922919bb98d8f8e74793ab0a4ae05470c86bf7ad0433f2385e70"
 SOURCE_FILENAME="gw-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="gw-libretro-$srcGitRev"
 ADDITIONAL_FILES="gw_libretro.info.in"
diff --git a/games-emulation/handy_libretro/additional-files/handy_libretro.info.in b/games-emulation/handy_libretro/additional-files/handy_libretro.info.in
index 4f253629c..297c6451a 100644
--- a/games-emulation/handy_libretro/additional-files/handy_libretro.info.in
+++ b/games-emulation/handy_libretro/additional-files/handy_libretro.info.in
@@ -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 = "@DISPLAY_VERSION@"
+
+# Libretro Features
 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/games-emulation/handy_libretro/handy_libretro-0.95_20201019.recipe b/games-emulation/handy_libretro/handy_libretro-0.95_20210325.recipe
similarity index 90%
rename from games-emulation/handy_libretro/handy_libretro-0.95_20201019.recipe
rename to games-emulation/handy_libretro/handy_libretro-0.95_20210325.recipe
index e65cb4d7a..efcbd2ac8 100644
--- a/games-emulation/handy_libretro/handy_libretro-0.95_20201019.recipe
+++ b/games-emulation/handy_libretro/handy_libretro-0.95_20210325.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="http://handy.sourceforge.net/"
 COPYRIGHT="1997-2018 Keith Wilkins, the libretro team"
 LICENSE="Zlib"
 REVISION="1"
-srcGitRev="dba810a87ebae87392259c68dcab7a35f6000aac"
+srcGitRev="358f50b22a722427d5fe73a372e6a27c24ac5a8c"
 SOURCE_URI="https://github.com/libretro/libretro-handy/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="8209510e60dc317d0b1cd4bb0c9b248e187401a772f3d6c9d8737070bfb80246"
+CHECKSUM_SHA256="68112e68f75642f585925b2c3d2831fd2a16ce4bb3cd7edaef5e2ea6343884a4"
 SOURCE_FILENAME="handy-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-handy-$srcGitRev"
 ADDITIONAL_FILES="handy_libretro.info.in"
diff --git a/games-emulation/mednafen_gba_libretro/additional-files/mednafen_gba_libretro.info.in b/games-emulation/mednafen_gba_libretro/additional-files/mednafen_gba_libretro.info.in
index bb4405ec3..7be596d37 100644
--- a/games-emulation/mednafen_gba_libretro/additional-files/mednafen_gba_libretro.info.in
+++ b/games-emulation/mednafen_gba_libretro/additional-files/mednafen_gba_libretro.info.in
@@ -1,20 +1,28 @@
+# Software Information
 display_name = "Nintendo - Game Boy Advance (Beetle GBA)"
 authors = "Forgotten|Mednafen Team"
 supported_extensions = "gba|agb|bin"
 corename = "Beetle GBA"
-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 = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy Advance"
+systemid = "game_boy_advance"
+
+# Libretro Features
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 supports_no_game = "false"
+
+# Firmware / BIOS
 firmware_count = 1
 firmware0_desc = "gba_bios.bin (Game Boy Advance BIOS)"
 firmware0_path = "gba_bios.bin"
 firmware0_opt = "true"
 notes = "(!) gba_bios.bin (md5): a860e8c0b6d573d191e4ec7db1b1e4f6"
 is_experimental = true
-description = "An older fork of Mednafen's Game Boy Advance core, which is itself a fork of the Visual Boy Advance emulator, this core is not really one that anyone should use over the alternatives unless they have a specific reason to. It is only included for completionist's sake."
+
+description = "An older fork of Mednafen's Game Boy Advance core, which is itself a fork of the Visual Boy Advance emulator. This core is not really one that anyone should use over the alternatives unless they have a specific reason to. It is only included for completionist's sake."
diff --git a/games-emulation/mednafen_gba_libretro/mednafen_gba_libretro-0.9.36_20201014.recipe b/games-emulation/mednafen_gba_libretro/mednafen_gba_libretro-0.9.36_20210324.recipe
similarity index 91%
rename from games-emulation/mednafen_gba_libretro/mednafen_gba_libretro-0.9.36_20201014.recipe
rename to games-emulation/mednafen_gba_libretro/mednafen_gba_libretro-0.9.36_20210324.recipe
index df292c03a..2d5d4f262 100644
--- a/games-emulation/mednafen_gba_libretro/mednafen_gba_libretro-0.9.36_20201014.recipe
+++ b/games-emulation/mednafen_gba_libretro/mednafen_gba_libretro-0.9.36_20210324.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/gba.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="5dc23a3e302bd11efe997ae92e282e7d603c5813"
+srcGitRev="e07b5cb69bcd28177822960cb2c12fce4c94aa8f"
 SOURCE_URI="https://github.com/libretro/beetle-gba-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="bc711802fdac5a66d1208447a1265aec737832bbb360ec2ea21a8af2216c2e67"
+CHECKSUM_SHA256="d1614883c76e6d796161c00875c4c3412f1049703ba62016cda229586dc008a1"
 SOURCE_FILENAME="libretro-mednafen-gba-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-gba-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_gba_libretro.info.in"
diff --git a/games-emulation/mednafen_lynx_libretro/additional-files/mednafen_lynx_libretro.info.in b/games-emulation/mednafen_lynx_libretro/additional-files/mednafen_lynx_libretro.info.in
index d15660f86..827e88c8d 100644
--- a/games-emulation/mednafen_lynx_libretro/additional-files/mednafen_lynx_libretro.info.in
+++ b/games-emulation/mednafen_lynx_libretro/additional-files/mednafen_lynx_libretro.info.in
@@ -1,18 +1,27 @@
-display_name = "Atari - Lynx (Beetle Handy)"
+# Software Information
+display_name = "Atari - Lynx (Beetle Lynx)"
 authors = "K. Wilkins|Mednafen Team"
 supported_extensions = "lnx|o"
 corename = "Beetle Lynx"
-manufacturer = "Atari"
-categories = "Emulator"
-systemname = "Lynx"
-systemid = "atari_lynx"
-database = "Atari - Lynx"
 license = "Zlib|GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Atari"
+systemname = "Lynx"
+systemid = "atari_lynx"
+
+# Libretro Features
 supports_no_game = "false"
+database = "Atari - Lynx"
+
+# Firmware / BIOS
 firmware_count = 1
 firmware0_desc = "lynxboot.img (Lynx Boot Image)"
 firmware0_path = "lynxboot.img"
 firmware0_opt = "false"
 notes = "(!) lynxboot.img (md5): fcd403db69f54290b51035d82f835e7b"
+
+description = "An older fork of Mednafen's Atari Lynx core, which is itself a fork of the Handy emulator. While this core works fine, many users will be better served by using the regular Handy core."
diff --git a/games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20201118.recipe b/games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20210324.recipe
similarity index 91%
rename from games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20201118.recipe
rename to games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20210324.recipe
index 5663e9743..bd3505b16 100644
--- a/games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20201118.recipe
+++ b/games-emulation/mednafen_lynx_libretro/mednafen_lynx_libretro-0.9.32_20210324.recipe
@@ -6,9 +6,9 @@ COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2
 	Zlib"
 REVISION="1"
-srcGitRev="bffe3550f0aee1b67575b4eaa51ef3edbd89606c"
+srcGitRev="26cb625d1f1c27137ce8069d155231f5a5c68bda"
 SOURCE_URI="https://github.com/libretro/beetle-lynx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="bc99f94016d295e404897fc4fa92abe121feef7d1e039140c39336b5a0dad6a4"
+CHECKSUM_SHA256="df2b10bb29473de5820843227a93f180aa5fbf553e8dc7ffcaeb501283a16c7d"
 SOURCE_FILENAME="libretro-mednafen-lynx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-lynx-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_lynx_libretro.info.in"
diff --git a/games-emulation/mednafen_ngp_libretro/additional-files/mednafen_ngp_libretro.info.in b/games-emulation/mednafen_ngp_libretro/additional-files/mednafen_ngp_libretro.info.in
index aa11c6e80..c2ead51dd 100644
--- a/games-emulation/mednafen_ngp_libretro/additional-files/mednafen_ngp_libretro.info.in
+++ b/games-emulation/mednafen_ngp_libretro/additional-files/mednafen_ngp_libretro.info.in
@@ -1,13 +1,20 @@
+# Software Information
 display_name = "SNK - Neo Geo Pocket / Color (Beetle NeoPop)"
 authors = "neopop_uk|Mednafen Team"
 supported_extensions = "ngp|ngc|ngpc|npc"
 corename = "Beetle NeoPop"
-manufacturer = "SNK"
-categories = "Emulator"
-systemname = "Neo Geo Pocket (Color)"
-systemid = "neo_geo_pocket"
-database = "SNK - Neo Geo Pocket|SNK - Neo Geo Pocket Color"
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "SNK"
+systemname = "Neo Geo Pocket (Color)"
+systemid = "neo_geo_pocket"
+
+# Libretro Features
 supports_no_game = "false"
+database = "SNK - Neo Geo Pocket|SNK - Neo Geo Pocket Color"
+
+description = "An older fork of Mednafen's Neo Geo Pocket / Color core, which is itself a fork of the NeoPop emulator. While this core is quite fast, users who run into performance issues can try the performance-focused RACE core."
diff --git a/games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20201015.recipe b/games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20210324.recipe
similarity index 91%
rename from games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20201015.recipe
rename to games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20210324.recipe
index 2945d3c54..81bd3c007 100644
--- a/games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20201015.recipe
+++ b/games-emulation/mednafen_ngp_libretro/mednafen_ngp_libretro-0.9.36.1_20210324.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/ngp.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="38f0e6a80724fe92a7e7914d378abff4561c942e"
+srcGitRev="6599a2bc20318278b8574888d9455a2b1b22d0cc"
 SOURCE_URI="https://github.com/libretro/beetle-ngp-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="3d8b2750093a6921bd512f207bc235c3755558ccdafbb5249a69a2639f05809a"
+CHECKSUM_SHA256="878255cb03c9fffd1a4cc3ab05b2f2da037397fcda6f9df7e51b384b7d529ca6"
 SOURCE_FILENAME="libretro-mednafen-ngp-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-ngp-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_ngp_libretro.info.in"
diff --git a/games-emulation/mednafen_pce_fast_libretro/additional-files/mednafen_pce_fast_libretro.info.in b/games-emulation/mednafen_pce_fast_libretro/additional-files/mednafen_pce_fast_libretro.info.in
index a44b49dde..19587fbc8 100644
--- a/games-emulation/mednafen_pce_fast_libretro/additional-files/mednafen_pce_fast_libretro.info.in
+++ b/games-emulation/mednafen_pce_fast_libretro/additional-files/mednafen_pce_fast_libretro.info.in
@@ -1,16 +1,23 @@
+# Software Information
 display_name = "NEC - PC Engine / CD (Beetle PCE FAST)"
 authors = "Mednafen Team"
 supported_extensions = "pce|cue|ccd|iso|img|bin|chd"
 corename = "Beetle PCE Fast"
-manufacturer = "NEC"
-categories = "Emulator"
-systemname = "PC Engine/PCE-CD"
-systemid = "pc_engine"
-database = "NEC - PC Engine - TurboGrafx 16|NEC - PC Engine CD - TurboGrafx-CD"
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "NEC"
+systemname = "PC Engine/PCE-CD"
+systemid = "pc_engine"
+
+# Libretro Features
 supports_no_game = "false"
+database = "NEC - PC Engine - TurboGrafx 16|NEC - PC Engine CD - TurboGrafx-CD"
+
+# Firmware / BIOS
 firmware_count = 4
 firmware0_desc = "syscard3.pce (PCE-CD BIOS)"
 firmware0_path = "syscard3.pce"
@@ -25,4 +32,5 @@ firmware3_desc = "gexpress.pce (PCE-CD BIOS)"
 firmware3_path = "gexpress.pce"
 firmware3_opt = "true"
 notes = "(!) syscard3.pce (md5): 38179df8f4ac870017db21ebcbf53114|[i] For cue files track type use:|[i] OGG for ogg files|[i] WAVE for wav files|[i] BINARY for iso files"
+
 description = "This is the fastest PC Engine emulator forked from the Mednafen codebase, and it includes an optimized renderer for the PSP's hardware. This speed comes at a cost, though, and a few games don't work with this core. For this reason, if a device can run the non-Fast core at full speed, that one is propably a better choice. Additionally, this core differs from the Beetle-SuperGrafx core only insofar as it does not support SuperGrafx games, so again, unless you need to use this core for a specific reason, you may as well get the added compatibility of the other PCE-compatible cores."
diff --git a/games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20201112.recipe b/games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20210412.recipe
similarity index 91%
rename from games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20201112.recipe
rename to games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20210412.recipe
index 261215cdf..96170ba45 100644
--- a/games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20201112.recipe
+++ b/games-emulation/mednafen_pce_fast_libretro/mednafen_pce_fast_libretro-0.9.38.7_20210412.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/pce_fast.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="b1399db12af6478749fbaf16e0940c4370d589c6"
+srcGitRev="b29972b83e54599239781efd6c0c2d77ad65f3b7"
 SOURCE_URI="https://github.com/libretro/beetle-pce-fast-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="d80f88e915d178e3e427d05974d4d4c8bd9a8e573398e37e572cfb5cd2684499"
+CHECKSUM_SHA256="e3059558722497b855c46a142ddcdf5808f108822ef22b1ccc1c87031ca006c9"
 SOURCE_FILENAME="libretro-mednafen-pce-fast-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-pce-fast-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_pce_fast_libretro.info.in"
diff --git a/games-emulation/mednafen_pce_libretro/additional-files/mednafen_pce_libretro.info.in b/games-emulation/mednafen_pce_libretro/additional-files/mednafen_pce_libretro.info.in
index 7e541837a..bf4438b4d 100644
--- a/games-emulation/mednafen_pce_libretro/additional-files/mednafen_pce_libretro.info.in
+++ b/games-emulation/mednafen_pce_libretro/additional-files/mednafen_pce_libretro.info.in
@@ -1,16 +1,23 @@
+# Software Information
 display_name = "NEC - PC Engine / SuperGrafx / CD (Beetle PCE)"
 authors = "Mednafen Team"
 supported_extensions = "pce|cue|ccd|iso|img|bin|chd"
 corename = "Beetle PCE"
-manufacturer = "NEC"
-categories = "Emulator"
-systemname = "PC Engine/SuperGrafx/CD"
-systemid = "pc_engine"
-database = "NEC - PC Engine SuperGrafx|NEC - PC Engine - TurboGrafx 16|NEC - PC Engine CD - TurboGrafx-CD"
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "NEC"
+systemname = "PC Engine/SuperGrafx/CD"
+systemid = "pc_engine"
+
+# Libretro Features
+database = "NEC - PC Engine SuperGrafx|NEC - PC Engine - TurboGrafx 16|NEC - PC Engine CD - TurboGrafx-CD"
 supports_no_game = "false"
+
+# Firmware / BIOS
 firmware_count = 4
 firmware0_desc = "syscard3.pce (Super CD-ROM2 System V3.xx)"
 firmware0_path = "syscard3.pce"
@@ -25,4 +32,5 @@ firmware3_desc = "gexpress.pce (Game Express CD Card)"
 firmware3_path = "gexpress.pce"
 firmware3_opt = "true"
 notes = "(!) syscard3.pce (md5): 38179df8f4ac870017db21ebcbf53114|[i] For cue files track type use:|[i] OGG for ogg files|[i] WAVE for wav files|[i] BINARY for iso files"
+
 description = "A PC Engine (PCE) core forked from Mednafen's PCE-Accurate emulator, this core is a bit slower than the Fast core, but it is also more accurate, with support for a few extra games that are broken on the Fast core. In addition to PCE, PCE-CD, TurboGrafx 16 and TurboGrafx 16 CD, this core also differs from the Fast version in its support for the SuperGrafx console."
diff --git a/games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20201110.recipe b/games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20210412.recipe
similarity index 91%
rename from games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20201110.recipe
rename to games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20210412.recipe
index bef12cc62..7c272d6ff 100644
--- a/games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20201110.recipe
+++ b/games-emulation/mednafen_pce_libretro/mednafen_pce_libretro-0.9.38.7_20210412.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/pce.html"
 COPYRIGHT="2005-2020 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="7e834dc9831eb10a80e2a928d5c5de6a7e5fd5ef"
+srcGitRev="4ef73108d0b9781005b3ad56a8f4099d80e69579"
 SOURCE_URI="https://github.com/libretro/beetle-pce-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="955c567fc763e18a6a28d357e9e742e513726c0a3deba16e0f95f6c3fe929e58"
+CHECKSUM_SHA256="e05c55b9e8eb0e1ab131d3d878317a81e59cd8951d980c6a195357d21b90455c"
 SOURCE_FILENAME="libretro-mednafen-pce-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-pce-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_pce_libretro.info.in"
diff --git a/games-emulation/mednafen_pcfx_libretro/additional-files/mednafen_pcfx_libretro.info.in b/games-emulation/mednafen_pcfx_libretro/additional-files/mednafen_pcfx_libretro.info.in
index 4427e5932..e8d25bfa5 100644
--- a/games-emulation/mednafen_pcfx_libretro/additional-files/mednafen_pcfx_libretro.info.in
+++ b/games-emulation/mednafen_pcfx_libretro/additional-files/mednafen_pcfx_libretro.info.in
@@ -1,18 +1,27 @@
+# Software Information
 display_name = "NEC - PC-FX (Beetle PC-FX)"
 authors = "Mednafen Team"
 supported_extensions = "cue|ccd|toc|chd"
 corename = "Beetle PC-FX"
-manufacturer = "NEC"
-categories = "Emulator"
-systemname = "PC-FX"
-systemid = "pc_fx"
-database = "NEC - PC-FX"
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "NEC"
+systemname = "PC-FX"
+systemid = "pc_fx"
+
+# Libretro Features
+database = "NEC - PC-FX"
 supports_no_game = "false"
+
+# Firmware / BIOS
 firmware_count = 1
 firmware0_desc = "pcfx.rom (PC-FX BIOS v1.00 - 2 Sep 1994)"
 firmware0_path = "pcfx.rom"
 firmware0_opt = "false"
 notes = "(!) pcfx.rom (md5): 08e36edbea28a017f79f8d4f7ff9b6d7"
+
+description = "A fork of Mednafen's PC-FX emulation core, ported to libretro."
diff --git a/games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20201110.recipe b/games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20210412.recipe
similarity index 91%
rename from games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20201110.recipe
rename to games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20210412.recipe
index 43876a27b..bc3d1affc 100644
--- a/games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20201110.recipe
+++ b/games-emulation/mednafen_pcfx_libretro/mednafen_pcfx_libretro-0.9.33.3_20210412.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/pcfx.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="008a5ae04beb9bf939663e7e927bd7beca126024"
+srcGitRev="ceff11eab32febfcf8507f0bfe618bcdf80e75ef"
 SOURCE_URI="https://github.com/libretro/beetle-pcfx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="80975d63cebce3c69e30fa72896c0208550fd4322214f7833fe83fd4a3dc28ee"
+CHECKSUM_SHA256="fbe1ff0d6505b61c230f406b628ec4404d0fdda2e50d9b1fdcb58a83e4e8b933"
 SOURCE_FILENAME="libretro-mednafen-pcfx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-pcfx-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_pcfx_libretro.info.in"
diff --git a/games-emulation/mednafen_saturn_libretro/additional-files/mednafen_saturn_libretro.info.in b/games-emulation/mednafen_saturn_libretro/additional-files/mednafen_saturn_libretro.info.in
index 2bd68b3ab..0ed3a6e97 100644
--- a/games-emulation/mednafen_saturn_libretro/additional-files/mednafen_saturn_libretro.info.in
+++ b/games-emulation/mednafen_saturn_libretro/additional-files/mednafen_saturn_libretro.info.in
@@ -1,7 +1,10 @@
+# Software Information
 display_name = "Sega - Saturn (Beetle Saturn)"
 authors = "Mednafen Team"
 supported_extensions = "ccd|chd|cue|toc|m3u"
 corename = "Beetle Saturn"
+
+# Hardware Information
 manufacturer = "Sega"
 categories = "Emulator"
 systemname = "Saturn"
@@ -10,7 +13,23 @@ database = "Sega - Saturn"
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+
+# Libretro Features
 supports_no_game = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+
+# Firmware / BIOS
 firmware_count = 4
 firmware0_desc = "sega_101.bin (Saturn JP BIOS)"
 firmware0_path = "sega_101.bin"
@@ -25,4 +44,5 @@ firmware3_desc = "mpr-19367-mx.ic1 (Ultraman: Hikari no Kyojin Densetsu ROM Cart
 firmware3_path = "mpr-19367-mx.ic1"
 firmware3_opt = "true"
 notes = "(!) sega_101.bin (md5): 85ec9ca47d8f6807718151cbcca8b964|(!) mpr-17933.bin (md5): 3240872c70984b6cbfda1586cab68dbe|(!) mpr-18811-mx.ic1 (md5): 255113ba943c92a54facd25a10fd780c|(!) mpr-19367-mx.ic1 (md5): 1cd19988d1d72a3e7caa0b73234c96b4"
-description = "An older fork of Mednafen's Saturn emulator (with some fixes backported from later versions), this core represents a major step forward for accurate Saturn emulation, and it runs most games with few or no noticeable glitches/anomalies. However, this accuracy comes at the price of high CPU requirements. Additionally, this core is software-rendered and does not support any increases in internal resolution or other fun-but-accuracy-compromising features, unlike the other, less-accurate Saturn cores."
+
+description = "An older fork of Mednafen's Saturn emulator (circa mid-2019 with some fixes backported from later versions), this core represents a major step forward for accurate Saturn emulation, and it runs most games with few or no noticeable glitches/anomalies. However, this accuracy comes at the price of high CPU requirements. Additionally, this core is software-rendered and does not support any increased internal resolution or other fun-but-accuracy-compromising features, unlike the other, less-accurate Saturn cores."
diff --git a/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20201110.recipe b/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20210412.recipe
similarity index 91%
rename from games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20201110.recipe
rename to games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20210412.recipe
index 8ab30555a..0f862e592 100644
--- a/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20201110.recipe
+++ b/games-emulation/mednafen_saturn_libretro/mednafen_saturn_libretro-0.9.45.1_20210412.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/ss.html"
 COPYRIGHT="2005-2020 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="359506e9a73c15ede4c742a8c7798d3c87428144"
+srcGitRev="f7515829166660a61c6692160bb2b2d2633df9fc"
 SOURCE_URI="https://github.com/libretro/beetle-saturn-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="2ce33a836fbf37b5d81debc097453da85e9f62f67001d605d6be96f3596276a3"
+CHECKSUM_SHA256="7d74f18b0fa69a8c2a98901696807495f7c8a4481e3aab3f5be2969a17ff7d31"
 SOURCE_FILENAME="libretro-mednafen-saturn-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-saturn-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_saturn_libretro.info.in"
diff --git a/games-emulation/mednafen_supergrafx_libretro/additional-files/mednafen_supergrafx_libretro.info.in b/games-emulation/mednafen_supergrafx_libretro/additional-files/mednafen_supergrafx_libretro.info.in
index ef8e5b585..fedf81831 100644
--- a/games-emulation/mednafen_supergrafx_libretro/additional-files/mednafen_supergrafx_libretro.info.in
+++ b/games-emulation/mednafen_supergrafx_libretro/additional-files/mednafen_supergrafx_libretro.info.in
@@ -1,7 +1,10 @@
+# Software Information
 display_name = "NEC - PC Engine SuperGrafx (Beetle SuperGrafx)"
 authors = "Mednafen Team"
 supported_extensions = "pce|sgx|cue|ccd|chd"
 corename = "Beetle SuperGrafx"
+
+# Hardware Information
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC Engine SuperGrafx"
@@ -10,7 +13,23 @@ database = "NEC - PC Engine SuperGrafx|NEC - PC Engine - TurboGrafx 16|NEC - PC
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+
+# Libretro Features
 supports_no_game = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+
+# Firmware / BIOS
 firmware_count = 4
 firmware0_desc = "syscard3.pce (Super CD-ROM2 System V3.xx)"
 firmware0_path = "syscard3.pce"
@@ -25,4 +44,5 @@ firmware3_desc = "gexpress.pce (Game Express CD Card)"
 firmware3_path = "gexpress.pce"
 firmware3_opt = "true"
 notes = "(!) syscard3.pce (md5): 38179df8f4ac870017db21ebcbf53114"
+
 description = "A PC Engine (PCE) core forked from Mednafen's PCE-Fast emulator, this core is a bit faster than the non-Fast flavor at the cost of some accuracy/compatibility. In addition to PCE, PCE-CD, TurboGrafx 16 and TurboGrafx 16 CD, this core also differs from the Beetle-PCE-Fast version in its support for the SuperGrafx console. In general, most users are better off with the non-Fast Beetle-PCE core, but if they cannot maintain full speed with it, this is a good second choice. If this core is too slow, as well, then Beetle-PCE-Fast is the last, best choice."
diff --git a/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20201110.recipe b/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20210412.recipe
similarity index 91%
rename from games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20201110.recipe
rename to games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20210412.recipe
index 0767fce30..943ee4143 100644
--- a/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20201110.recipe
+++ b/games-emulation/mednafen_supergrafx_libretro/mednafen_supergrafx_libretro-0.9.38.7_20210412.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/pce_fast.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="26d2ec7902238c5d265122308305c69b5a91a487"
+srcGitRev="7a84c5e3b9e0dc44266d3442130296888f3c573a"
 SOURCE_URI="https://github.com/libretro/beetle-supergrafx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="2e27690930cad6a79ebeed5002d5d0ed192a5490cbcb4232c97aac36b2a64f45"
+CHECKSUM_SHA256="888fa492bbc9615daa299c4e5ca8e603aaeb856b9c3b78a7dfb175b47d8c0bfe"
 SOURCE_FILENAME="libretro-mednafen-supergrafx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-supergrafx-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_supergrafx_libretro.info.in"
diff --git a/games-emulation/mednafen_vb_libretro/additional-files/mednafen_vb_libretro.info.in b/games-emulation/mednafen_vb_libretro/additional-files/mednafen_vb_libretro.info.in
index 8d2da85ee..705462c5f 100644
--- a/games-emulation/mednafen_vb_libretro/additional-files/mednafen_vb_libretro.info.in
+++ b/games-emulation/mednafen_vb_libretro/additional-files/mednafen_vb_libretro.info.in
@@ -1,13 +1,20 @@
+# Software Information
 display_name = "Nintendo - Virtual Boy (Beetle VB)"
 authors = "Mednafen Team"
 supported_extensions = "vb|vboy|bin"
 corename = "Beetle VB"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Virtual Boy"
-systemid = "virtual_boy"
-database = "Nintendo - Virtual Boy"
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Virtual Boy"
+systemid = "virtual_boy"
+
+# Libretro Features
 supports_no_game = "false"
+database = "Nintendo - Virtual Boy"
+
+description = "A port of Mednafen's Virtual Boy emulation core to libretro. This core supports a variety of different 3D display methods for use with anaglyph glasses, head-mounted displays and 3D monitors."
diff --git a/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20201014.recipe b/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20210405.recipe
similarity index 91%
rename from games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20201014.recipe
rename to games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20210405.recipe
index 7ae72762f..6291bdeb8 100644
--- a/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20201014.recipe
+++ b/games-emulation/mednafen_vb_libretro/mednafen_vb_libretro-0.9.36.1_20210405.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/vb.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="a410d5cf3fa529c2a3970df34fee17b068f53168"
+srcGitRev="06f9017dbaf0083ad87696728c4f404e689584c0"
 SOURCE_URI="https://github.com/libretro/beetle-vb-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="d15a1bc7875dd6de244f9e357a6097c75c195faca2ebf5eaddd6741c2af33c42"
+CHECKSUM_SHA256="45515f45389e539ee4e2a27a1da496b6c00a49ee6093b90d16d4bc885ff04d67"
 SOURCE_FILENAME="libretro-mednafen-vb-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-vb-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_vb_libretro.info.in"
diff --git a/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in b/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in
index dfcf9f61f..b278d88a0 100644
--- a/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in
+++ b/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in
@@ -1,13 +1,20 @@
+# Software Information
 display_name = "Bandai - WonderSwan/Color (Beetle Cygne)"
 authors = "Dox|Mednafen Team"
 supported_extensions = "ws|wsc|pc2"
 corename = "Beetle WonderSwan"
-manufacturer = "Bandai"
-categories = "Emulator"
-systemname = "WonderSwan/Color"
-systemid = "wonderswan"
-database = "Bandai - WonderSwan|Bandai - WonderSwan Color"
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Bandai"
+systemname = "WonderSwan/Color"
+systemid = "wonderswan"
+
+# Libretro Features
 supports_no_game = "false"
+database = "Bandai - WonderSwan|Bandai - WonderSwan Color"
+
+description = "A port of Mednafen's WonderSwan Color emulation core to libretro."
diff --git a/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20201026.recipe b/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20210405.recipe
similarity index 91%
rename from games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20201026.recipe
rename to games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20210405.recipe
index eac545ba8..ac06de372 100644
--- a/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20201026.recipe
+++ b/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20210405.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mednafen.github.io/documentation/wswan.html"
 COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="5f9cc2e732fcca23e5cfe11fcf156f91007186a4"
+srcGitRev="40077aee14e030987d4b5ab38bc5403ad14d32ca"
 SOURCE_URI="https://github.com/libretro/beetle-wswan-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="5d2501a298f505381ea210518e0df73b4be38e75420a93dbe94f453025cde6ce"
+CHECKSUM_SHA256="62f3c22237ed33a8dfd991303f41d6ace48c7a585552bfc7283cba31eb485351"
 SOURCE_FILENAME="libretro-mednafen-wswan-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="beetle-wswan-libretro-$srcGitRev"
 ADDITIONAL_FILES="mednafen_wswan_libretro.info.in"
diff --git a/games-emulation/meteor_libretro/additional-files/meteor_libretro.info.in b/games-emulation/meteor_libretro/additional-files/meteor_libretro.info.in
index 222cc0fd9..0663ccbd5 100644
--- a/games-emulation/meteor_libretro/additional-files/meteor_libretro.info.in
+++ b/games-emulation/meteor_libretro/additional-files/meteor_libretro.info.in
@@ -1,13 +1,21 @@
+# Software Information
 display_name = "Nintendo - Game Boy Advance (Meteor)"
 authors = "Philippe Daouadi"
 supported_extensions = "gba"
 corename = "Meteor"
-manufacturer = "Nintendo"
 categories = "Emulator"
-systemname = "Game Boy Advance"
-systemid = "game_boy_advance"
-database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "GPLv3"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy Advance"
+systemid = "game_boy_advance"
+
+# Libretro Features
 supports_no_game = "false"
+is_experimental = "true"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+
+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/games-emulation/meteor_libretro/meteor_libretro-1.4_20201012.recipe b/games-emulation/meteor_libretro/meteor_libretro-1.4_20201228.recipe
similarity index 91%
rename from games-emulation/meteor_libretro/meteor_libretro-1.4_20201012.recipe
rename to games-emulation/meteor_libretro/meteor_libretro-1.4_20201228.recipe
index 1a49baacd..ea2ff20ce 100644
--- a/games-emulation/meteor_libretro/meteor_libretro-1.4_20201012.recipe
+++ b/games-emulation/meteor_libretro/meteor_libretro-1.4_20201228.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://github.com/blastrock/meteor"
 COPYRIGHT="2010-2020 Philippe Daouadi, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="bc6bbc06f00afd69803fe30a923be9bb95c73cb6"
+srcGitRev="e533d300d0561564451bde55a2b73119c768453c"
 SOURCE_URI="https://github.com/libretro/meteor-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="f718aa75a079539a01fad6d349afe38f06b762272d498640e29467d2f3c8b4cd"
+CHECKSUM_SHA256="09df1661aa8d5c830e9ef3b62f01d7e2ae108bce2572e199b181e0c13d87e084"
 SOURCE_FILENAME="libretro-meteor-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="meteor-libretro-$srcGitRev"
 ADDITIONAL_FILES="meteor_libretro.info.in"
diff --git a/games-emulation/mgba_libretro/additional-files/mgba_libretro.info.in b/games-emulation/mgba_libretro/additional-files/mgba_libretro.info.in
index 766b5cf77..87f29f95d 100644
--- a/games-emulation/mgba_libretro/additional-files/mgba_libretro.info.in
+++ b/games-emulation/mgba_libretro/additional-files/mgba_libretro.info.in
@@ -1,16 +1,34 @@
+# Software Information
 display_name = "Nintendo - Game Boy Advance (mGBA)"
 authors = "endrift"
 supported_extensions = "gb|gbc|gba"
 corename = "mGBA"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Game Boy/Game Boy Color/Game Boy Advance"
-systemid = "game_boy_advance"
-database = "Nintendo - Game Boy|Nintendo - Game Boy Color|Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
 license = "MPLv2.0"
 permissions = ""
-display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy/Game Boy Color/Game Boy Advance"
+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)"
+savestate = "true"
+savestate_features = "deterministic"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+is_experimental = "false"
+
+# Firmware / BIOS
 firmware_count = 4
 firmware0_desc = "gba_bios.bin (Game Boy Advance BIOS)"
 firmware0_path = "gba_bios.bin"
@@ -25,3 +43,5 @@ firmware3_desc = "sgb_bios.bin (Super Game Boy BIOS)"
 firmware3_path = "sgb_bios.bin"
 firmware3_opt = "true"
 notes = "(!) gba_bios.bin (md5): a860e8c0b6d573d191e4ec7db1b1e4f6|(!) gb_bios.bin (md5): 32fbbd84168d3482956eb3c5051637f5|(!) gbc_bios.bin (md5): dbfce9db9deaa2567f6a84fde55f9680"
+
+description = "An advanced, mature and actively developed Game Boy Advance emulator, ported to libretro. This emulator strives for high accuracy and high performance, and it is generally a good first choice for GBA emulation on any platform where it is available. gpSP is a good fallback on devices that cannot maintain full speed with mGBA."
diff --git a/games-emulation/mgba_libretro/mgba_libretro-0.6.1_20201118.recipe b/games-emulation/mgba_libretro/mgba_libretro-0.6.1_20210427.recipe
similarity index 91%
rename from games-emulation/mgba_libretro/mgba_libretro-0.6.1_20201118.recipe
rename to games-emulation/mgba_libretro/mgba_libretro-0.6.1_20210427.recipe
index 4cc856e9e..1c15d0de6 100644
--- a/games-emulation/mgba_libretro/mgba_libretro-0.6.1_20201118.recipe
+++ b/games-emulation/mgba_libretro/mgba_libretro-0.6.1_20210427.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://mgba.io/"
 COPYRIGHT="2014-2018 Endrift, the libretro team"
 LICENSE="MPL v2.0"
 REVISION="1"
-srcGitRev="45eeee1cb210fbb5a18af8f155b3929fdacce4b4"
+srcGitRev="4f3fcfac78f0ecd5e6309cc2a3f439650de2d529"
 SOURCE_URI="https://github.com/libretro/mgba/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="8b0f878216b8c345308f5ebd5c486038da40c4d54acd982a53a9312f0db54e0c"
+CHECKSUM_SHA256="4133868db08b548c4615865e1a3fb46db89c654cfe739335a225fec7970ba231"
 SOURCE_FILENAME="libretro-mgba-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="mgba-$srcGitRev"
 ADDITIONAL_FILES="mgba_libretro.info.in"
diff --git a/games-emulation/mupen64plus_next_libretro/additional-files/mupen64plus_next_libretro.info.in b/games-emulation/mupen64plus_next_libretro/additional-files/mupen64plus_next_libretro.info.in
index 3872a70d1..5849bff97 100644
--- a/games-emulation/mupen64plus_next_libretro/additional-files/mupen64plus_next_libretro.info.in
+++ b/games-emulation/mupen64plus_next_libretro/additional-files/mupen64plus_next_libretro.info.in
@@ -1,14 +1,33 @@
+# Software Information
 display_name = "Nintendo - Nintendo 64 (Mupen64Plus-Next)"
 authors = "m4xw|Hacktarux|gonetz|GLideN64 Contributors|Mupen64Plus Team"
 supported_extensions = "n64|v64|z64|bin|u1"
 corename = "Mupen64Plus-Next"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Nintendo 64"
-systemid = "nintendo_64"
-database = "Nintendo - Nintendo 64"
 license = "GPLv2"
 permissions = "dynarec_optional"
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Nintendo 64"
+systemid = "nintendo_64"
+
+# Libretro Features
 supports_no_game = "false"
+database = "Nintendo - Nintendo 64"
+hw_render = "true"
 required_hw_api = "OpenGL Core >= 3.3 | OpenGL ES >= 2.0"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "true"
+needs_fullpath = "false"
+disk_control = "false"
+is_experimental = "false"
+
+description = "An up-to-date port of the Mupen64Plus N64 emulator, ported to libretro. It uses up-to-date GLideN64 plugin as its default graphics plug, though the high-accuracy Angrylion and ParaLLEl-RDP plugins are also available. This core is a good first choice for most users and should generally work better than the ParaLLEl-N64 core, which is mainly useful for its support for legacy graphics plugins that can run on older/low-power devices that are too weak for the modern plugins."
diff --git a/games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20201125.recipe b/games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20210223.recipe
similarity index 92%
rename from games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20201125.recipe
rename to games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20210223.recipe
index 1a6882a1a..582eb84dc 100644
--- a/games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20201125.recipe
+++ b/games-emulation/mupen64plus_next_libretro/mupen64plus_next_libretro-1.0_20210223.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://mupen64plus.org/"
 COPYRIGHT="2001-2020 Hacktarux, richard42g, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="a6df6b9bfd1b4552bcd27152b791ec6c3df6ffbb"
+srcGitRev="b494ebf2da202f67dbd88c3c915262bb58f1c6ba"
 SOURCE_URI="https://github.com/libretro/mupen64plus-libretro-nx/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a5fdeb1a7b088a4a42a61e21cf7c3a5a4734b1c2dc9f0121c11550b81bafd0d8"
+CHECKSUM_SHA256="36f3602a696e0f691604399cc708d16c86e001d04ad500acf899baa48f1d8995"
 SOURCE_FILENAME="mupen64plus-libretro-nx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="mupen64plus-libretro-nx-$srcGitRev"
 ADDITIONAL_FILES="mupen64plus_next_libretro.info.in"
diff --git a/games-emulation/nestopia_libretro/additional-files/nestopia_libretro.info.in b/games-emulation/nestopia_libretro/additional-files/nestopia_libretro.info.in
index f701cd336..9cdce252e 100644
--- a/games-emulation/nestopia_libretro/additional-files/nestopia_libretro.info.in
+++ b/games-emulation/nestopia_libretro/additional-files/nestopia_libretro.info.in
@@ -1,16 +1,23 @@
+# Software Information
 display_name = "Nintendo - NES / Famicom (Nestopia UE)"
 authors = "Martin Freij|R. Belmont|R. Danbrook"
 supported_extensions = "nes|fds|unf|unif"
 corename = "Nestopia"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Nintendo Entertainment System"
-systemid = "nes"
-database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
 license = "GPLv2"
 permissions = ""
+categories = "Emulator"
 display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Nintendo Entertainment System"
+systemid = "nes"
+
+# Libretro Features
 supports_no_game = "false"
+database = "Nintendo - Nintendo Entertainment System|Nintendo - Family Computer Disk System"
+
+# Firmware / BIOS
 firmware_count = 2
 firmware0_desc = "NstDatabase.xml (Nestopia UE Database file)"
 firmware0_path = "NstDatabase.xml"
diff --git a/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20201008.recipe b/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20210320.recipe
similarity index 91%
rename from games-emulation/nestopia_libretro/nestopia_libretro-1.49_20201008.recipe
rename to games-emulation/nestopia_libretro/nestopia_libretro-1.49_20210320.recipe
index 016b81dd8..934019509 100644
--- a/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20201008.recipe
+++ b/games-emulation/nestopia_libretro/nestopia_libretro-1.49_20210320.recipe
@@ -7,9 +7,9 @@ HOMEPAGE="http://nestopia.sourceforge.net/"
 COPYRIGHT="2012-2020 Martin Freij, 0ldSk00l, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="02e7c03f933333bb9ce79b2c0e5ebb936a9536e2"
+srcGitRev="95be0bf886c2c26e5c1c162816bb5dbf3cdfb664"
 SOURCE_URI="https://github.com/libretro/nestopia/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="f3fd8e18899a6b46aadb4436c3b58f2aeb844d0d22ea904017dbc9c112b8fd5d"
+CHECKSUM_SHA256="94d1e622a4132707b13249615bd60e80a7ebf5dbe47ca064d3ebe8e07800d1cd"
 SOURCE_FILENAME="nestopia-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="nestopia-$srcGitRev"
 ADDITIONAL_FILES="nestopia_libretro.info.in"
diff --git a/games-emulation/o2em_libretro/additional-files/o2em_libretro.info.in b/games-emulation/o2em_libretro/additional-files/o2em_libretro.info.in
index 8991ad3b6..95297abad 100644
--- a/games-emulation/o2em_libretro/additional-files/o2em_libretro.info.in
+++ b/games-emulation/o2em_libretro/additional-files/o2em_libretro.info.in
@@ -1,16 +1,23 @@
+# Software Information
 display_name = "Magnavox - Odyssey2 / Phillips Videopac+ (O2EM)"
 authors = "Daniel Boris|Andre de la Rocha|Arlindo M. de Oliveira"
 supported_extensions = "bin"
 corename = "O2EM"
-manufacturer = "Magnavox|Philips"
-categories = "Emulator"
-systemname = "Magnavox Odyssey2 / Phillips Videopac+"
-systemid = "odyssey2"
 database = "Magnavox - Odyssey2|Phillips - Videopac+"
 license = "Artistic License"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Magnavox|Philips"
+systemname = "Magnavox Odyssey2 / Phillips Videopac+"
+systemid = "odyssey2"
+
+# Libretro Features
 supports_no_game = "false"
+
+# Firmware / BIOS
 firmware_count = 4
 firmware0_desc = "o2rom.bin (Odyssey2 BIOS - G7000 model)"
 firmware0_path = "o2rom.bin"
@@ -25,3 +32,5 @@ firmware3_desc = "jopac.bin (Videopac+ French BIOS - G7400 model)"
 firmware3_path = "jopac.bin"
 firmware3_opt = "false"
 notes = "(!) o2rom.bin (md5): 562d5ebf9e030a40d6fabfc2f33139fd|(!) c52.bin (md5): f1071cdb0b6b10dde94d3bc8a6146387|(!) g7400.bin (md5): c500ff71236068e0dc0d0603d265ae76|(!) jopac.bin (md5): 279008e4a0db2dc5f1c048853b033828"
+
+description = "A port of the O2EM Odyssey 2 / VideoPac emulator to libretro."
diff --git a/games-emulation/o2em_libretro/o2em_libretro-1.18_20201020.recipe b/games-emulation/o2em_libretro/o2em_libretro-1.18_20210325.recipe
similarity index 91%
rename from games-emulation/o2em_libretro/o2em_libretro-1.18_20201020.recipe
rename to games-emulation/o2em_libretro/o2em_libretro-1.18_20210325.recipe
index 3c5863fe6..d4b66c607 100644
--- a/games-emulation/o2em_libretro/o2em_libretro-1.18_20201020.recipe
+++ b/games-emulation/o2em_libretro/o2em_libretro-1.18_20210325.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="http://o2em.sourceforge.net/"
 COPYRIGHT="1996-2018 Daniel Boris, the O2EM team, the libretro team"
 LICENSE="Artistic"
 REVISION="1"
-srcGitRev="51e5e19d71c5c17d87ce67a5faf60a8b77d40135"
+srcGitRev="0f13c969e6b7db021a9dc7a73ba7015227101024"
 SOURCE_URI="https://github.com/libretro/libretro-o2em/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="de7b3e61ba978d7d793d3458002c3e247961d3dbbb91f406ce798b873c311cba"
+CHECKSUM_SHA256="f046dcfbbe65bf7727be1d17610b0ce1ffe24ca75b6b3a6a7166045ee6d1da4f"
 SOURCE_FILENAME="libretro-o2em-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-o2em-$srcGitRev"
 ADDITIONAL_FILES="o2em_libretro.info.in"
diff --git a/games-emulation/opera_libretro/additional-files/opera_libretro.info.in b/games-emulation/opera_libretro/additional-files/opera_libretro.info.in
index 6632f8d18..5546c9af5 100644
--- a/games-emulation/opera_libretro/additional-files/opera_libretro.info.in
+++ b/games-emulation/opera_libretro/additional-files/opera_libretro.info.in
@@ -85,3 +85,5 @@ firmware12_path = "panafz1j-kanji.bin"
 firmware12_opt = "true"
 
 notes = "(!) panafz1.bin (md5): f47264dd47fe30f73ab3c010015c155b|(!) panafz10.bin (md5): 51f2f43ae2f3508a14d9f56597e2d3ce|(!) panafz10-norsa.bin (md5): 1477bda80dc33731a65468c1f5bcbee9|(!) panafz10e-anvil.bin (md5): a48e6746bd7edec0f40cff078f0bb19f|(!) panafz10e-anvil-norsa.bin (md5): cf11bbb5a16d7af9875cca9de9a15e09|(!) goldstar.bin (md5): 8639fd5e549bd6238cfee79e3e749114|(!) sanyotry.bin (md5): 35fa1a1ebaaeea286dc5cd15487c13ea|(!) 3do_arcade_saot.bin (md5): 8970fc987ab89a7f64da9f8a8c4333ff|(!) panafz1-kanji.bin (md5): b8dc97f778a6245c58e064b0312e8281|(!) panafz10ja-anvil-kanji.bin (md5): 428577250f43edc902ea239c50d2240d|(!) panafz1j.bin (md5): a496cfdded3da562759be3561317b605|(!) panafz1j-norsa.bin (md5): f6c71de7470d16abe4f71b1444883dc8|(!) panafz1j-kanji.bin (md5): c23fb5d5e6bb1c240d02cf968972be37"
+
+description = "A port and continuation of the 4DO emulator, which itself is a fork of the FreeDO 3DO emulator, to libretro. This core is the best option for users seeking to play 3DO games, as it is the only one still under development."
diff --git a/games-emulation/opera_libretro/opera_libretro-1.0.0_20201110.recipe b/games-emulation/opera_libretro/opera_libretro-1.0.0_20210409.recipe
similarity index 91%
rename from games-emulation/opera_libretro/opera_libretro-1.0.0_20201110.recipe
rename to games-emulation/opera_libretro/opera_libretro-1.0.0_20210409.recipe
index c712d949c..a2af75d29 100644
--- a/games-emulation/opera_libretro/opera_libretro-1.0.0_20201110.recipe
+++ b/games-emulation/opera_libretro/opera_libretro-1.0.0_20210409.recipe
@@ -8,9 +8,9 @@ COPYRIGHT="2011-2020 the 4DO/FreeDO team, the libretro team"
 LICENSE="FreeDO
 	GNU LGPL v3"
 REVISION="1"
-srcGitRev="8ce580e4dd39cc794fd0cc474ad60da666a14362"
+srcGitRev="71125d59b62e4f7ba7ccf6367bf217ba2f2d3871"
 SOURCE_URI="https://github.com/libretro/opera-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="d19805c6a49bf933e3d26e0964c2b04ef1049c38bbfe4e0a1337982d4dd8e214"
+CHECKSUM_SHA256="247a360c51e0b9bb0609cf5eaac740e5e98d63895a628e9f4aba1c0c0f79b601"
 SOURCE_FILENAME="libretro-opera-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="opera-libretro-$srcGitRev"
 ADDITIONAL_FILES="opera_libretro.info.in"
diff --git a/games-emulation/parallel_n64_libretro/additional-files/parallel_n64_libretro.info.in b/games-emulation/parallel_n64_libretro/additional-files/parallel_n64_libretro.info.in
index f875123a9..4492c9722 100644
--- a/games-emulation/parallel_n64_libretro/additional-files/parallel_n64_libretro.info.in
+++ b/games-emulation/parallel_n64_libretro/additional-files/parallel_n64_libretro.info.in
@@ -1,18 +1,30 @@
+# Software Information
 display_name = "Nintendo - Nintendo 64 (ParaLLEl N64)"
 authors = "Hacktarux|Mupen64Plus Team|TinyTiger|Libretro"
 supported_extensions = "n64|v64|z64|bin|u1|ndd"
 corename = "ParaLLEl N64"
-manufacturer = "Nintendo"
-categories = "Emulator"
-systemname = "Nintendo 64"
-systemid = "nintendo_64"
-database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
 license = "GPLv2"
 permissions = "dynarec_optional"
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Nintendo 64"
+systemid = "nintendo_64"
+
+# Libretro Features
 supports_no_game = "false"
+hw_render = "true"
+required_hw_api = "OpenGL >= 3.0 | OpenGL ES >= 2.0 | Vulkan >= 1.0"
+database = "Nintendo - Nintendo 64|Nintendo - Nintendo 64DD"
+is_experimental = "false"
+
+# Firmware / BIOS
 firmware_count = 1
 firmware0_desc = "64DD_IPL.bin (64DD IPL ROM)"
 firmware0_path = "64DD_IPL.bin"
 firmware0_opt = "true"
 notes = "(!) 64DD_IPL.bin (md5): 8d3d9f294b6e174bc7b1d2fd1c727530"
+
+description = "An N64 emulator based originally on Mupen64Plus, but with extensive changes that have caused the codebases to diverge significantly. This core was the first N64 emulator core available for libretro and has served as an experimental testbed for many features that were later included in the Mupen64plus-Next core, including the advanced Vulkan-based ParaLLEl-RDP and ParaLLEl-RSP plugins (hence the name). However, Mupen64plus-Next is a better choice for most users/usecases, and ParaLLEl-N64 mostly exists for further experimentation and for users that cannot run Mupen64plus-Next's GLideN64 plugin at full speed, as this core includes legacy Glide64, glN64 and Rice plugins, which have lower hardware/driver requirements."
diff --git a/games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20201109.recipe b/games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20210324.recipe
similarity index 92%
rename from games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20201109.recipe
rename to games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20210324.recipe
index 0a1da79ac..f9f12c98b 100644
--- a/games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20201109.recipe
+++ b/games-emulation/parallel_n64_libretro/parallel_n64_libretro-2.0rc2_20210324.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="https://github.com/libretro/parallel-n64"
 COPYRIGHT="2019-2020 the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="29e7f39e95af38c2c4056a825286261161eae640"
+srcGitRev="0a67445ce63513584d92e5c57ea87efe0da9b3bd"
 SOURCE_URI="https://github.com/libretro/parallel-n64/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="b0b0627d2a6e52b86933673d080e89fa1c1ecd3d6c39a451090ceacc05298ac6"
+CHECKSUM_SHA256="141205571de2a5c0646ee4d33d32e71d86c8f4a75e43aba73c103c62cc15affd"
 SOURCE_FILENAME="parallel-n64-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="parallel-n64-$srcGitRev"
 ADDITIONAL_FILES="parallel_n64_libretro.info.in"
diff --git a/games-emulation/pcsx_rearmed_libretro/additional-files/pcsx_rearmed_libretro.info.in b/games-emulation/pcsx_rearmed_libretro/additional-files/pcsx_rearmed_libretro.info.in
index 3e4ea2857..2b0c04a0e 100644
--- a/games-emulation/pcsx_rearmed_libretro/additional-files/pcsx_rearmed_libretro.info.in
+++ b/games-emulation/pcsx_rearmed_libretro/additional-files/pcsx_rearmed_libretro.info.in
@@ -2,15 +2,33 @@ display_name = "Sony - PlayStation (PCSX ReARMed)"
 authors = "PCSX Team|notaz|Exophase"
 supported_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|ccd|chd"
 corename = "PCSX-ReARMed"
-manufacturer = "Sony"
-categories = "Emulator"
-systemname = "PlayStation"
-systemid = "playstation"
-database = "Sony - PlayStation"
 license = "GPLv2"
 permissions = "dynarec"
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Sony"
+systemname = "PlayStation"
+systemid = "playstation"
+
+# Libretro Features
+database = "Sony - PlayStation"
 supports_no_game = "false"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "true"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+is_experimental = "false"
+
+# Firmware / BIOS
 firmware_count = 3
 firmware0_desc = "scph5500.bin (PS1 JP BIOS)"
 firmware0_path = "scph5500.bin"
@@ -22,3 +40,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"
+
+description = "A port of the PCSX-ReARMed fork to libretro. This emulator is a technical marvel and runs incredibly well on 32-bit ARM CPUs, though it is also a good choice for other low-powered hardware that cannot run Beetle-PSX/-HW or Swanstation at full speed. However, this core has no support for increased internal resolution, texture filtering, etc., so users who want those features would be better served by the other cores."
diff --git a/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20201108.recipe b/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20210428.recipe
similarity index 92%
rename from games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20201108.recipe
rename to games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20210428.recipe
index 54fc4e9ff..63dd86870 100644
--- a/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20201108.recipe
+++ b/games-emulation/pcsx_rearmed_libretro/pcsx_rearmed_libretro-r22_20210428.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="http://notaz.gp2x.de/pcsx_rearmed.php"
 COPYRIGHT="2012-2018, notaz, Exophase, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="15cfb5599fe16d2dade317342ee4733cf3b8d9cc"
+srcGitRev="625cc17f79f3eaeada1b741974bdc608ae4d2dd2"
 SOURCE_URI="https://github.com/libretro/pcsx_rearmed/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="3f42fc1c2eef1821aca9c14a1a66efe9b7b146ed599c8d47d181e860089a4a18"
+CHECKSUM_SHA256="89abcaddb3b648d9e26aa407bd6e9372072bc7f76cb415ea2299e4da4587ce3f"
 SOURCE_FILENAME="pcsx-rearmed-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="pcsx_rearmed-$srcGitRev"
 ADDITIONAL_FILES="pcsx_rearmed_libretro.info.in"
diff --git a/games-emulation/snes9x_libretro/additional-files/snes9x_libretro.info.in b/games-emulation/snes9x_libretro/additional-files/snes9x_libretro.info.in
index ba3d92aeb..fcebe3b08 100644
--- a/games-emulation/snes9x_libretro/additional-files/snes9x_libretro.info.in
+++ b/games-emulation/snes9x_libretro/additional-files/snes9x_libretro.info.in
@@ -3,7 +3,7 @@ display_name = "Nintendo - SNES / SFC (Snes9x - Current)"
 categories = "Emulator"
 authors = "Snes9x Team"
 corename = "Snes9x"
-supported_extensions = "smc|sfc|swc|fig|bs"
+supported_extensions = "smc|sfc|swc|fig|bs|st"
 license = "Non-commercial"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
@@ -13,7 +13,7 @@ manufacturer = "Nintendo"
 systemname = "Super Nintendo Entertainment System"
 systemid = "super_nes"
 
-# BIOS / Firmware
+# Firmware / BIOS
 firmware_count = 2
 firmware0_desc = "BS-X.bin (BS-X - Sore wa Namae o Nusumareta Machi no Monogatari (Japan) (Rev 1))"
 firmware0_path = "BS-X.bin"
diff --git a/games-emulation/snes9x_libretro/snes9x_libretro-1.60_20201008.recipe b/games-emulation/snes9x_libretro/snes9x_libretro-1.60_20210314.recipe
similarity index 92%
rename from games-emulation/snes9x_libretro/snes9x_libretro-1.60_20201008.recipe
rename to games-emulation/snes9x_libretro/snes9x_libretro-1.60_20210314.recipe
index f0b630b68..a1641aeba 100644
--- a/games-emulation/snes9x_libretro/snes9x_libretro-1.60_20201008.recipe
+++ b/games-emulation/snes9x_libretro/snes9x_libretro-1.60_20210314.recipe
@@ -10,9 +10,9 @@ LICENSE="Snes9x
 	GNU GPL v2
 	GNU LGPL v2.1"
 REVISION="1"
-srcGitRev="975aecb88830e6719e267e38144da47eb707fbac"
+srcGitRev="0655370850bc84d33acbc8a0ade8232853a195f3"
 SOURCE_URI="https://github.com/libretro/snes9x/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="caa4fa80eac5a873452b980865103dd96a90779392e84d0cdcdfadd35fc89cb6"
+CHECKSUM_SHA256="df29e5c20910beb28ee38b0cc13b3bc54cee881b407c7b72b280626009ae1100"
 SOURCE_FILENAME="snes9x-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="snes9x-$srcGitRev"
 ADDITIONAL_FILES="snes9x_libretro.info.in"
diff --git a/games-emulation/vba_next_libretro/additional-files/vba_next_libretro.info.in b/games-emulation/vba_next_libretro/additional-files/vba_next_libretro.info.in
index a6e673b31..8d8106893 100644
--- a/games-emulation/vba_next_libretro/additional-files/vba_next_libretro.info.in
+++ b/games-emulation/vba_next_libretro/additional-files/vba_next_libretro.info.in
@@ -1,18 +1,39 @@
+# Software Information
 display_name = "Nintendo - Game Boy Advance (VBA Next)"
 authors = "Forgotten|VBA-M Team|Squarepusher"
 supported_extensions = "gba"
 corename = "VBA Next"
-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 = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Nintendo"
+systemname = "Game Boy Advance"
+systemid = "game_boy_advance"
+
+# Libretro Features
 supports_no_game = "false"
+database = "Nintendo - Game Boy Advance|Nintendo - Game Boy Advance (e-Cards)"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+is_experimental = "false"
+
+# Firmware / BIOS
 firmware_count = 1
 firmware0_desc = "gba_bios.bin (Game Boy Advance BIOS)"
 firmware0_path = "gba_bios.bin"
 firmware0_opt = "true"
 notes = "(!) gba_bios.bin (md5): a860e8c0b6d573d191e4ec7db1b1e4f6"
+
+description = "A fork of the venerable Game Boy Advance emulator, VisualBoy Advance-Merged, branched off circa 2011, but with some backported patches for improved performance and compatibility. This core runs a bit faster than the up-to-date VBA-M core, but it is based on an older snapshot of the codebase and lacks many years of development and improvements, resulting in compatibility issues with some games (mostly related to a lack of support for the tilt and solar sensors). Most users should start with the up-to-date VBA-M core and only fall back to this one if they need the additional performance boost."
diff --git a/games-emulation/vba_next_libretro/vba_next_libretro-1.0.2_20201007.recipe b/games-emulation/vba_next_libretro/vba_next_libretro-1.0.2_20210312.recipe
similarity index 91%
rename from games-emulation/vba_next_libretro/vba_next_libretro-1.0.2_20201007.recipe
rename to games-emulation/vba_next_libretro/vba_next_libretro-1.0.2_20210312.recipe
index f179995e5..c4c56bf3e 100644
--- a/games-emulation/vba_next_libretro/vba_next_libretro-1.0.2_20201007.recipe
+++ b/games-emulation/vba_next_libretro/vba_next_libretro-1.0.2_20210312.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://github.com/libretro/vba-next"
 COPYRIGHT="2001-2018 Forgotten, the VBA-M team , the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="15037175093511aab9a52e27f28989c6c6fdb674"
+srcGitRev="90d7d9b4133bc1c7ed430de9f538ffae55b7a32f"
 SOURCE_URI="https://github.com/libretro/vba-next/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="e72c17f1bfd1dabe955a0b59d9d15ef5469a4f54c0527f4320a5572aed220248"
+CHECKSUM_SHA256="7bf9e173297b328cdf0b4243c9da1ba2d7daf76cd0632b2111439b839b5b517b"
 SOURCE_FILENAME="libretro-vba-next-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="vba-next-$srcGitRev"
 ADDITIONAL_FILES="vba_next_libretro.info.in"
diff --git a/games-emulation/vecx_libretro/additional-files/vecx_libretro.info.in b/games-emulation/vecx_libretro/additional-files/vecx_libretro.info.in
index c49992e7b..46234d2b2 100644
--- a/games-emulation/vecx_libretro/additional-files/vecx_libretro.info.in
+++ b/games-emulation/vecx_libretro/additional-files/vecx_libretro.info.in
@@ -1,13 +1,33 @@
+# Software Information
 display_name = "GCE - Vectrex (vecx)"
 authors = "Valavan Manohararajah|John Hawthorn|Nikita Zimin|Demeth"
 supported_extensions = "bin|vec"
 corename = "vecx"
-manufacturer = "Smith Engineering|General Consumer Electronics"
-categories = "Emulator"
-systemname = "Vectrex"
-systemid = "vectrex"
-database = "GCE - Vectrex"
 license = "GPLv3"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Smith Engineering|General Consumer Electronics"
+systemname = "Vectrex"
+systemid = "vectrex"
+
+# Libretro Features
 supports_no_game = "false"
+database = "GCE - Vectrex"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "true"
+required_hw_api = "OpenGL Core >= 3.3"
+needs_fullpath = "false"
+disk_control = "false"
+is_experimental = "false"
+
+description = "A port of the vecx vectrex emulator to libretro. This core is hardware-rendered by default using OpenGL but also includes a software renderer. The software renderer defaults to a low resolution, but there is a core option to make the core render to a higher resolution multiplier, which will give a smoother, more vector-like image."
diff --git a/games-emulation/vecx_libretro/vecx_libretro-1.2_20201018.recipe b/games-emulation/vecx_libretro/vecx_libretro-1.2_20210312.recipe
similarity index 92%
rename from games-emulation/vecx_libretro/vecx_libretro-1.2_20201018.recipe
rename to games-emulation/vecx_libretro/vecx_libretro-1.2_20210312.recipe
index 35fe48651..045a9af23 100644
--- a/games-emulation/vecx_libretro/vecx_libretro-1.2_20201018.recipe
+++ b/games-emulation/vecx_libretro/vecx_libretro-1.2_20210312.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://www.valavan.net/vectrex.html"
 COPYRIGHT="2002-2018 Valavan Manohararajah, John Hawthorn, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="7f8d42e0f5e891997afa72a639dbcc0f3be710c6"
+srcGitRev="0f3f04b0e5bbb484a84e3416d07f0ae8cdac386e"
 SOURCE_URI="https://github.com/libretro/libretro-vecx/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="ca151780c41b687056c7a1a4616516846e8a174dd6a561653296cb2a5b854fb1"
+CHECKSUM_SHA256="068b809165b5ccfc8742d7ee548caf52a878729ba4731a559b1132e51eb65aa0"
 SOURCE_FILENAME="libretro-vecx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-vecx-$srcGitRev"
 ADDITIONAL_FILES="vecx_libretro.info.in"
diff --git a/games-emulation/virtualjaguar_libretro/additional-files/virtualjaguar_libretro.info.in b/games-emulation/virtualjaguar_libretro/additional-files/virtualjaguar_libretro.info.in
index 036daa33c..5cb735322 100644
--- a/games-emulation/virtualjaguar_libretro/additional-files/virtualjaguar_libretro.info.in
+++ b/games-emulation/virtualjaguar_libretro/additional-files/virtualjaguar_libretro.info.in
@@ -1,13 +1,31 @@
+# Software Information
 display_name = "Atari - Jaguar (Virtual Jaguar)"
 authors = "David Raingeard|Shamus"
 supported_extensions = "j64|jag|rom|abs|cof|bin|prg"
 corename = "Virtual Jaguar"
-manufacturer = "Atari"
-categories = "Emulator"
-systemname = "Jaguar"
-systemid = "atari_jaguar"
-database = "Atari - Jaguar"
 license = "GPLv3"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Atari"
+systemname = "Jaguar"
+systemid = "atari_jaguar"
+
+# Libretro Features
 supports_no_game = "false"
+database = "Atari - Jaguar"
+savestate = "false"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "true"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+is_experimental = "false"
+
+description = "A port of the Virtual Jaguar emulator, which itself is based on Potato Emulation, to libretro. This core has known issues with a number of popular games, but it still represents the state of the art for open source Atari Jaguar emulation at the time of this writing. It is quite demanding but also includes a core option--Fast Blitter--that forces the use of an older, less compatible but faster blitter, though some games will not work properly with this option enabled."
diff --git a/games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20201007.recipe b/games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20210314.recipe
similarity index 92%
rename from games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20201007.recipe
rename to games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20210314.recipe
index 5d9f59086..2d6e3dd39 100644
--- a/games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20201007.recipe
+++ b/games-emulation/virtualjaguar_libretro/virtualjaguar_libretro-2.1.2_20210314.recipe
@@ -8,9 +8,9 @@ HOMEPAGE="https://icculus.org/virtualjaguar/"
 COPYRIGHT="2003-2018 Cal2, the Virtual Jaguar SDL team, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="575371decc78b186273146126140268c3efb7ce4"
+srcGitRev="2069160f316d09a2713286bd9bf4d5c2805bd143"
 SOURCE_URI="https://github.com/libretro/virtualjaguar-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="110933269a6f6e607101399c8c70a9a990d3f0d9c2d53b9daab5ec398360f80e"
+CHECKSUM_SHA256="cd34a47254b62034c7932578648deb0555e8cf156787e5bce2628abde7701901"
 SOURCE_FILENAME="libretro-virtualjaguar-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="virtualjaguar-libretro-$srcGitRev"
 ADDITIONAL_FILES="virtualjaguar_libretro.info.in"
diff --git a/games-emulation/yabause_libretro/additional-files/yabause_libretro.info.in b/games-emulation/yabause_libretro/additional-files/yabause_libretro.info.in
index e12e564ab..aecbc9ab6 100644
--- a/games-emulation/yabause_libretro/additional-files/yabause_libretro.info.in
+++ b/games-emulation/yabause_libretro/additional-files/yabause_libretro.info.in
@@ -1,6 +1,6 @@
 display_name = "Sega - Saturn (Yabause)"
 authors = "Guillaume Duhammel|Theo Berkau|Anders Montonen"
-supported_extensions = "bin|ccd|chd|cue|iso|mds|zip"
+supported_extensions = "bin|ccd|chd|cue|iso|mds|zip|m3u"
 corename = "Yabause"
 manufacturer = "Sega"
 categories = "Emulator"
diff --git a/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20200605.recipe b/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20210411.recipe
similarity index 91%
rename from games-emulation/yabause_libretro/yabause_libretro-0.9.15_20200605.recipe
rename to games-emulation/yabause_libretro/yabause_libretro-0.9.15_20210411.recipe
index f8be658d7..cb0cee6d6 100644
--- a/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20200605.recipe
+++ b/games-emulation/yabause_libretro/yabause_libretro-0.9.15_20210411.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://yabause.org/"
 COPYRIGHT="2003-2019 Guillaume Duhamel, Theo Berkau, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="f515e5a49336195c61b751e539aadae72fbe0aa7"
+srcGitRev="4d85b6e793030c77ae6b64fd7c99041c935b54ac"
 SOURCE_URI="https://github.com/libretro/yabause/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="c76134a37e6cb1e20579b257ce8b119f6edde64a080db7320f81d076db5fcd74"
+CHECKSUM_SHA256="7686d8fa0a082b2a35a632fadd842d614663c544085601e7c8d4e8da37b12bc7"
 SOURCE_FILENAME="libretro-yabause-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="yabause-$srcGitRev"
 ADDITIONAL_FILES="yabause_libretro.info.in"
diff --git a/games-engines/3dengine_libretro/3dengine_libretro-1.0_20191116.recipe b/games-engines/3dengine_libretro/3dengine_libretro-1.0_20210107.recipe
similarity index 89%
rename from games-engines/3dengine_libretro/3dengine_libretro-1.0_20191116.recipe
rename to games-engines/3dengine_libretro/3dengine_libretro-1.0_20210107.recipe
index 2b9050111..adfb8ab8f 100644
--- a/games-engines/3dengine_libretro/3dengine_libretro-1.0_20191116.recipe
+++ b/games-engines/3dengine_libretro/3dengine_libretro-1.0_20210107.recipe
@@ -4,10 +4,10 @@ DESCRIPTION="This 3D Engine for libretro GL with additional features \
 HOMEPAGE="https://github.com/libretro/libretro-3dengine"
 COPYRIGHT="2014-2020 the libretro team"
 LICENSE="GNU GPL v3"
-REVISION="2"
-srcGitRev="5b2684383d1d5c7e109c660e4c5cc4b27825d98b"
+REVISION="1"
+srcGitRev="4fbe7cb2f90d3c8db994af60085fb2ac93677545"
 SOURCE_URI="https://github.com/libretro/libretro-3dengine/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="bbd65435eb078d087be964d533a88ef9ab6c00b52f5dd21fe30421b45ff22e59"
+CHECKSUM_SHA256="a131509512d0ff7be250c218b91d700a2803d60041a9ea56be7be9bd4b805abc"
 SOURCE_FILENAME="libretro-3dengine-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-3dengine-$srcGitRev"
 ADDITIONAL_FILES="3dengine_libretro.info.in"
diff --git a/games-engines/3dengine_libretro/additional-files/3dengine_libretro.info.in b/games-engines/3dengine_libretro/additional-files/3dengine_libretro.info.in
index 85af72f8d..be092c169 100644
--- a/games-engines/3dengine_libretro/additional-files/3dengine_libretro.info.in
+++ b/games-engines/3dengine_libretro/additional-files/3dengine_libretro.info.in
@@ -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/games-engines/reminiscence_libretro/additional-files/reminiscence_libretro.info.in b/games-engines/reminiscence_libretro/additional-files/reminiscence_libretro.info.in
index 681e7cf17..a1873d53c 100644
--- a/games-engines/reminiscence_libretro/additional-files/reminiscence_libretro.info.in
+++ b/games-engines/reminiscence_libretro/additional-files/reminiscence_libretro.info.in
@@ -1,12 +1,30 @@
+# Software Information
 display_name = "Flashback (REminiscence)"
 authors = "Gregory Montoir|Stuart Carnie"
 supported_extensions = "map|aba|seq|lev"
 corename = "REminiscence"
-categories = "Game"
-database = "Flashback"
-systemname = "Flashback Game Engine"
 license = "GPLv3"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
+categories = "Game"
+systemname = "Flashback Game Engine"
+
+# Libretro Features
 supports_no_game = "false"
-notes = ""
+database = "Flashback"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "false"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "false"
+is_experimental = "false"
+
+description = "A port of the REminiscence engine, a reimplementation of the engine used by Delphine Software's Flashback, to libretro. The core requires data files from the game and is compatible with the Steam/GOG, DOS, PC-CD, Amiga and Macintosh releases. The core does not support regular saves, only savestates."
diff --git a/games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20201007.recipe b/games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20210317.recipe
similarity index 91%
rename from games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20201007.recipe
rename to games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20210317.recipe
index dfb7f869b..49c715533 100644
--- a/games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20201007.recipe
+++ b/games-engines/reminiscence_libretro/reminiscence_libretro-0.3.6_20210317.recipe
@@ -5,9 +5,9 @@ HOMEPAGE="http://cyxdown.free.fr/reminiscence/"
 COPYRIGHT="2005-2020 Gregory Montoir, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="eb72f37e4059292983a475aa38a4d4a61b9b8b89"
+srcGitRev="07b0e37ec0eab1f29f43284d4368ebdb896557e4"
 SOURCE_URI="https://github.com/libretro/REminiscence/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="976586ad56f18c67d6289ae5ffe535c77f8c300477d29201a4abb1d41be64dcd"
+CHECKSUM_SHA256="160aa80b49a0af2626c6ae70aa7a6225a791fdfe1e37625b7011630ff718aa3f"
 SOURCE_FILENAME="libretro-reminiscence-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="REminiscence-$srcGitRev"
 ADDITIONAL_FILES="reminiscence_libretro.info.in"
diff --git a/games-engines/scummvm_libretro/additional-files/scummvm_libretro.info.in b/games-engines/scummvm_libretro/additional-files/scummvm_libretro.info.in
index fa85a5602..109ecf4bc 100644
--- a/games-engines/scummvm_libretro/additional-files/scummvm_libretro.info.in
+++ b/games-engines/scummvm_libretro/additional-files/scummvm_libretro.info.in
@@ -6,15 +6,15 @@ corename = "ScummVM"
 categories = "Game"
 license = "GPLv2"
 permissions = ""
+display_version = "@DISPLAY_VERSION@"
 
 # Hareware Information
 manufacturer = "LucasArts"
 systemname = "Game engine"
 systemid = "scummvm"
-database = "ScummVM"
-display_version = "@DISPLAY_VERSION@"
 
 # Libretro Features
+database = "ScummVM"
 supports_no_game = "true"
 savestate = "false"
 savestate_features = "null"
@@ -29,9 +29,8 @@ hw_render = "false"
 needs_fullpath = "true"
 disk_control = "false"
 is_experimental = "false"
-needs_kbd_mouse_focus = "true"
 
-# BIOS/Firmware
+# Firmware / BIOS
 firmware_count = 24
 firmware0_desc = "access.dat"
 firmware0_path = "scummvm/extra/access.dat"
@@ -103,3 +102,5 @@ firmware23_desc = "scummremastered.zip (ScummVM Remastered Theme)"
 firmware23_path = "scummvm/theme/scummremastered.zip"
 firmware23_opt = "true"
 notes = "Auxiliary files available from https://docs.libretro.com/library/scummvm/#usage"
+
+description = "A fork of the ScummVM adventure game engine ported to libretro. Since this core was forked off a long time ago, it does not support the latest 3D engines that used to be covered by ResidualVM, such as Blade Runner. Otherwise, most games and features/settings should work just fine."
diff --git a/games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20201007.recipe b/games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20210325.recipe
similarity index 92%
rename from games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20201007.recipe
rename to games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20210325.recipe
index 956971ebe..71711abed 100644
--- a/games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20201007.recipe
+++ b/games-engines/scummvm_libretro/scummvm_libretro-2.0.0_20210325.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://www.scummvm.org/"
 COPYRIGHT="2001-2020 the ScummVM team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="7b1e9299057a01a1defad6dbae4bdbeed36aa767"
+srcGitRev="6df2bdf73cc9596dbc0ef395d78e48a93e0854be"
 SOURCE_URI="https://github.com/libretro/scummvm/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a2dd4c2913c88fd2f0f1ef8eb5d84734d86c3a73313e734380a95ae6b8e2de9b"
+CHECKSUM_SHA256="40b31a0eacd7214b18998c8ed56a95958e16cb7b99e272a68faf7183c58e93a3"
 SOURCE_FILENAME="libretro-scummvm-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="scummvm-$srcGitRev"
 ADDITIONAL_FILES="scummvm_libretro.info.in"
diff --git a/games-misc/craft_libretro/additional-files/craft_libretro.info.in b/games-misc/craft_libretro/additional-files/craft_libretro.info.in
index 206ac4272..16ab5e172 100644
--- a/games-misc/craft_libretro/additional-files/craft_libretro.info.in
+++ b/games-misc/craft_libretro/additional-files/craft_libretro.info.in
@@ -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/games-misc/craft_libretro/craft_libretro-1.0_20201008.recipe b/games-misc/craft_libretro/craft_libretro-1.0_20210317.recipe
similarity index 92%
rename from games-misc/craft_libretro/craft_libretro-1.0_20201008.recipe
rename to games-misc/craft_libretro/craft_libretro-1.0_20210317.recipe
index ea9c14393..fd467350d 100644
--- a/games-misc/craft_libretro/craft_libretro-1.0_20201008.recipe
+++ b/games-misc/craft_libretro/craft_libretro-1.0_20210317.recipe
@@ -7,9 +7,9 @@ HOMEPAGE="https://www.michaelfogleman.com/projects/craft/"
 COPYRIGHT="2014-2020 Michael Fogleman, the libretro team"
 LICENSE="MIT"
 REVISION="1"
-srcGitRev="347d2efb82dfb4fe0f2590d967125907dcc3c64a"
+srcGitRev="d0de2c6d3ff9d971d5c23c796bcb208498f635a9"
 SOURCE_URI="https://github.com/libretro/Craft/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="7080de54604846e70709894ebb7262dd42ab0a4707e1431c451d626451809726"
+CHECKSUM_SHA256="8ecbcc926e8d01a88f3ece652c0a318753513dd357b669e50b590045e8081206"
 SOURCE_FILENAME="libretro-craft-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="Craft-$srcGitRev"
 ADDITIONAL_FILES="craft_libretro.info.in"
diff --git a/games-puzzle/2048_libretro/2048_libretro-1.0_20201017.recipe b/games-puzzle/2048_libretro/2048_libretro-1.0_20210308.recipe
similarity index 91%
rename from games-puzzle/2048_libretro/2048_libretro-1.0_20201017.recipe
rename to games-puzzle/2048_libretro/2048_libretro-1.0_20210308.recipe
index 54c391ca1..0db255320 100644
--- a/games-puzzle/2048_libretro/2048_libretro-1.0_20201017.recipe
+++ b/games-puzzle/2048_libretro/2048_libretro-1.0_20210308.recipe
@@ -6,9 +6,9 @@ HOMEPAGE="https://gabrielecirulli.github.io/2048/"
 COPYRIGHT="2014-2018 Gabriele Cirulli, the libretro team"
 LICENSE="Public Domain"
 REVISION="1"
-srcGitRev="6e91356b9a901410017184a0d7772e40a92332a6"
+srcGitRev="d551e38517a67d0d3c083ad50429b58bdb0cdb94"
 SOURCE_URI="https://github.com/libretro/libretro-2048/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="814fc0a89f6bd6771002096d4a426e7c005b0f62d9e175a32339614f8382180d"
+CHECKSUM_SHA256="6e0d6c3d94ecd1436a31112d664f1e2cf42121f9efb2c476b7f91aa656a9046f"
 SOURCE_FILENAME="libretro-2048-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-2048-$srcGitRev"
 ADDITIONAL_FILES="2048_libretro.info.in"
diff --git a/games-puzzle/2048_libretro/additional-files/2048_libretro.info.in b/games-puzzle/2048_libretro/additional-files/2048_libretro.info.in
index 2b8a340d5..2bb04124c 100644
--- a/games-puzzle/2048_libretro/additional-files/2048_libretro.info.in
+++ b/games-puzzle/2048_libretro/additional-files/2048_libretro.info.in
@@ -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/media-sound/gme_libretro/additional-files/gme_libretro.info.in b/media-sound/gme_libretro/additional-files/gme_libretro.info.in
index be1707d74..ed12506c8 100644
--- a/media-sound/gme_libretro/additional-files/gme_libretro.info.in
+++ b/media-sound/gme_libretro/additional-files/gme_libretro.info.in
@@ -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 = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Various"
+systemname = "Music"
+systemid = "game_music"
+
+# Libretro Features
 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/media-sound/gme_libretro/gme_libretro-0.5.2_20201018.recipe b/media-sound/gme_libretro/gme_libretro-0.5.2_20210309.recipe
similarity index 92%
rename from media-sound/gme_libretro/gme_libretro-0.5.2_20201018.recipe
rename to media-sound/gme_libretro/gme_libretro-0.5.2_20210309.recipe
index 261e056a2..bf6dca511 100644
--- a/media-sound/gme_libretro/gme_libretro-0.5.2_20201018.recipe
+++ b/media-sound/gme_libretro/gme_libretro-0.5.2_20210309.recipe
@@ -11,9 +11,9 @@ COPYRIGHT="2004-2020 Blargg, the libretro team"
 LICENSE="GNU GPL v2
 	GNU LGPL v2"
 REVISION="1"
-srcGitRev="c774ef83fa9b32122d801f2db523f7c052b0f014"
+srcGitRev="f8debd1469dc8b61bc0160297886dbc3132205ea"
 SOURCE_URI="https://github.com/libretro/libretro-gme/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="021b68873ac865edc07eb7f8acbc6199b963fcd7515fafbb2054581608648329"
+CHECKSUM_SHA256="0379e78efee153ad5fb9694ac7578bfab180612a4ef45892e42f1f6b68274dd9"
 SOURCE_FILENAME="libretro-gme-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-gme-$srcGitRev"
 ADDITIONAL_FILES="gme_libretro.info.in"