diff --git a/bsnes_libretro.info b/bsnes_libretro.info
index 1164ed6..829af79 100644
--- a/bsnes_libretro.info
+++ b/bsnes_libretro.info
@@ -6,7 +6,7 @@ corename = "bsnes"
 supported_extensions = "sfc|smc|gb|gbc|bs"
 license = "GPLv3"
 permissions = ""
-display_version = "v113.1"
+display_version = "115"
 
 # Hardware Information
 manufacturer = "Nintendo"
diff --git a/chailove_libretro.info b/chailove_libretro.info
index 9b68e4c..68ebccb 100644
--- a/chailove_libretro.info
+++ b/chailove_libretro.info
@@ -6,7 +6,7 @@ corename = "ChaiLove"
 categories = "Game engine"
 license = "MIT"
 permissions = ""
-display_version = "0.32.0"
+display_version = "1.2.1"
 
 # Hardware Information
 manufacturer = "N/A"
diff --git a/dolphin_libretro.info b/dolphin_libretro.info
index b8f40b4..a5a5251 100644
--- a/dolphin_libretro.info
+++ b/dolphin_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - GameCube / Wii (Dolphin)"
 authors = "Team Dolphin"
-supported_extensions = "gcm|iso|wbfs|ciso|gcz|elf|dol|dff|tgc|wad|rvz|m3u"
+supported_extensions = "gcm|iso|wbfs|ciso|gcz|elf|dol|dff|tgc|wad|rvz|m3u|wia"
 corename = "Dolphin"
 categories = "Emulator"
 license = "GPLv2+"
diff --git a/ep128emu_core_libretro.info b/ep128emu_core_libretro.info
new file mode 100644
index 0000000..ebc0e11
--- /dev/null
+++ b/ep128emu_core_libretro.info
@@ -0,0 +1,179 @@
+## All data is optional, but helps improve user experience.
+
+# Software Information - Information about the core software itself
+# Name displayed when the user is selecting the core:
+display_name = "Enterprise - 64/128 (ep128emu)"
+
+# Categories that the core belongs to (optional):
+categories = "Emulator"
+
+# Name of the authors who wrote the core:
+authors = "Istvan Varga|Zoltan Balogh"
+
+# Name of the core:
+corename = "ep128emu-core"
+
+# List of extensions the core supports:
+supported_extensions = "img|dsk|tap|dtf|com|trn|128|bas|cas|cdt|tzx|."
+
+# License of the cores source code:
+license = "GPLv2"
+
+# Privacy-specific permissions needed for using the core:
+permissions = ""
+
+# Version of the core:
+display_version = "v1.0.1"
+
+# Hardware Information - Information about the hardware the core supports (when applicable)
+# Name of the manufacturer who produced the emulated system:
+manufacturer = "Enterprise"
+
+# Name of the system that the core targets (optional):
+systemname = "64/128"
+
+# ID of the primary platform the core uses. Use other core info files as guidance if possible.
+# If blank or not used, a standard core platform will be used (optional):
+systemid = "ep128"
+
+# The number of mandatory/optional firmware files the core needs:
+firmware_count = 22
+
+# Firmware entries should be named from 0
+# Firmware description
+# firmware0_desc = "filename (Description)" ex: firmware0_desc = "bios.gg (GameGear BIOS)"
+# Firmware path
+# firmware0_path = "filename.ext"  ex: firmware0_path = "bios.gg"
+# Is firmware optional or not, if not defined RetroArch will assume it is required
+# firmware0_opt = "true/false"
+
+firmware0_desc = "exos21.rom (Enterprise 128 Expandible OS 2.1)"
+firmware0_path = "ep128emu/roms/exos21.rom";
+firmware0_opt = "false"
+
+firmware1_desc = "basic21.rom (Enterprise 128 BASIC Interpreter v2.1)"
+firmware1_path = "ep128emu/roms/basic21.rom";
+firmware1_opt = "false"
+
+firmware2_desc = "exdos13.rom (Enterprise 128 Disk Controller v1.3)"
+firmware2_path = "ep128emu/roms/exdos13.rom";
+firmware2_opt = "false"
+
+firmware3_desc = "exos20.rom (Enterprise 64 Expandible OS 2.0)"
+firmware3_path = "ep128emu/roms/exos20.rom";
+firmware3_opt = "true"
+
+firmware4_desc = "basic20.rom (Enterprise 64 BASIC Interpreter v2.0)"
+firmware4_path = "ep128emu/roms/basic20.rom";
+firmware4_opt = "true"
+
+firmware5_desc = "epfileio.rom (Enterprise 128 Direct File I/O)"
+firmware5_path = "ep128emu/roms/epfileio.rom";
+firmware5_opt = "true"
+
+firmware6_desc = "exos24uk.rom (Enterprise 128 Expandible OS 2.4)"
+firmware6_path = "ep128emu/roms/exos24uk.rom";
+firmware6_opt = "true"
+
+firmware7_desc = "hun.rom (Enterprise 128 Hungarian language extension)"
+firmware7_path = "ep128emu/roms/hun.rom";
+firmware7_opt = "true"
+
+firmware8_desc = "epd19hft.rom (Enterprise 128 EP-DOS with Hungarian language extension)"
+firmware8_path = "ep128emu/roms/epd19hft.rom";
+firmware8_opt = "true"
+
+firmware9_desc = "zt19hfnt.rom (Enterprise 128 ZozoTools with Hungarian language extension 1.9)"
+firmware9_path = "ep128emu/roms/zt19hfnt.rom";
+firmware9_opt = "true"
+
+firmware10_desc = "brd.rom (Enterprise 128 German language extension)"
+firmware10_path = "ep128emu/roms/brd.rom";
+firmware10_opt = "true"
+
+firmware11_desc = "zt19uk.rom (Enterprise 128 ZozoTools extension)"
+firmware11_path = "ep128emu/roms/zt19uk.rom";
+firmware11_opt = "true"
+
+firmware12_desc = "tvc22_sys.rom (Videoton TVC system BIOS)"
+firmware12_path = "ep128emu/roms/tvc22_sys.rom";
+firmware12_opt = "true"
+
+firmware13_desc = "tvc22_ext.rom (Videoton TVC extension BIOS)"
+firmware13_path = "ep128emu/roms/tvc22_ext.rom";
+firmware13_opt = "true"
+
+firmware14_desc = "tvcfileio.rom (Videoton TVC Direct File I/O)"
+firmware14_path = "ep128emu/roms/tvcfileio.rom";
+firmware14_opt = "true"
+
+firmware15_desc = "tvc_dos12d.rom (Videoton TVC disk BIOS)"
+firmware15_path = "ep128emu/roms/tvc_dos12d.rom";
+firmware15_opt = "true"
+
+firmware16_desc = "cpc464.rom (Amstrad CPC 464 BIOS)"
+firmware16_path = "ep128emu/roms/cpc464.rom";
+firmware16_opt = "true"
+
+firmware17_desc = "cpc664.rom (Amstrad CPC 664 BIOS)"
+firmware17_path = "ep128emu/roms/cpc664.rom";
+firmware17_opt = "true"
+
+firmware18_desc = "cpc6128.rom (Amstrad CPC 6128 BIOS)"
+firmware18_path = "ep128emu/roms/cpc6128.rom";
+firmware18_opt = "true"
+
+firmware19_desc = "cpc_amsdos.rom (Amstrad CPC AMSDOS BIOS)"
+firmware19_path = "ep128emu/roms/cpc_amsdos.rom";
+firmware19_opt = "true"
+
+firmware20_desc = "zx128.rom (ZX Spectrum 128 BIOS)"
+firmware20_path = "ep128emu/roms/zx128.rom";
+firmware20_opt = "true"
+
+firmware21_desc = "zx48.rom (ZX Spectrum 48 BIOS)"
+firmware21_path = "ep128emu/roms/zx48.rom";
+firmware21_opt = "true"
+
+# Additional notes:
+# notes = "(!) hash|(!) game rom|(^) continue|[1] notes|[^] continue|[*] list"
+notes = "(!) exos21.rom (md5): f36f24cbb87745fbd2714e4df881db09|(!) basic21.rom (md5): e972fe42b398c9ff1d93ff014786aec6|(!) exdos13.rom (md5): ddff70c014d1958dc75378b6c9aab6f8|(!) exos20.rom (md5): 5ad3baaad3b5156d6b60b34229a676fb|(!) basic20.rom (md5): 8e18edce4a7acb2c33cc0ab18f988482|(!) epfileio.rom (md5): a68ebcbc73a4d2178d755b7755bf18fe|(!) exos24uk.rom (md5): 55af78f877a21ca45eb2df68a74fcc60|(!) hun.rom (md5): 22167938f142c222f40992839aa21a06|(!) epd19hft.rom (md5): 12cfc9c7e48c8a16c2e09edbd926d467|(!) zt19hfnt.rom (md5): 653daaf7b9b29c2c4e577f489580f247|(!) brd.rom (md5): 6af0402906944fd134004b85097c8524|(!) zt19uk.rom (md5): 228540b6be83ae2acd7569c8ff0f91d0|(!) tvc22_sys.rom (md5): 8c54285f541930cde766069942bad0f2|(!) tvc22_ext.rom (md5): 5ce95a26ceed5bec73995d83568da9cf|(!) tvcfileio.rom (md5): a2cf86ba8e7fc58b242137fe59036832|(!) tvc_dos12d.rom (md5): 88dc7876d584f90e4106f91444ab23b7|(!) cpc464.rom (md5): a993f85b88ac4350cf4d41554e87fe4f|(!) cpc664.rom (md5): 5a384a2310f472c7857888371c00ed66|(!) cpc6128.rom (md5): b96280dc6c95a48857b4b8eb931533ae|(!) cpc_amsdos.rom (md5): 25629dfe870d097469c217b95fdc1c95|(!) zx128.rom (md5): 85fede415f4294cc777517d7eada482e|(!) zx48.rom (md5): 4c42a2f075212361c3117015b107ff68"
+
+# Libretro Features - The libretro API features the core supports. Useful for sorting cores
+# Does the core support savestates
+savestate = "true"
+# If true, how complete is the savestate support? basic, serialized (rewind), deterministic (netplay/runahead)
+savestate_features = "serialized"
+# Does the core support the libretro cheat interface?
+cheats = "false"
+# Does the core support libretro input descriptors
+input_descriptors = "true"
+# Does the core support memory descriptors commonly used for achievements
+memory_descriptors = "false"
+# Does the core use the libretro save interface or does it do its own thing (like with shared memory cards)?
+libretro_saves = "true"
+# Does the core support the core options interface?
+core_options = "true"
+# What version of core options is supported? (later versions allow for localization and descriptions)
+core_options_version = "1.0"
+# Does the core support the subsystem interface? Commonly used for chained/special loading, such as Super Game Boy
+load_subsystem = "false"
+# Whether or not the core requires an external file to work:
+supports_no_game = "true"
+# Does the core have a single purpose? Does it represent one game or application, requiring predetermined support files or no external data? Used to indicate to a frontend that the core may be presented/handled independently from 'regular' cores that run a variety of content.
+single_purpose = "false"
+# Name of the database that the core supports (optional):
+# database = "Nintendo - Nintendo Entertainment System|Nintendo - Famicom Disk System"
+# Does the core support/require support for libretro-gl or other hardware-acceleration in the frontend?
+hw_render = "false"
+# Which hardware-rendering APIs does the core support? Delimited by pipe characters.
+# required_hw_api = "Vulkan >= 1.0 | Direct3D >= 10.0 | OpenGL Core >= 3.3 | OpenGL ES >= 3.0"
+# Does the core require ongoing access to the file after loading? Mostly used for softpatching and streaming of data
+needs_fullpath = "true"
+# Does the core support the libretro disk control interface for swapping disks on the fly?
+disk_control = "false"
+# Is the core currently suitable for general use? That is, will regular users find it useful or is it for development/testing only (subject to change over time)?
+is_experimental = "false"
+
+# Descriptive text, useful for tooltips, etc.
+description = "Emulate the Z80 based home computers that the original ep128emu supports - that is, Enterprise 64/128, Videoton TVC, Amstrad CPC and ZX Spectrum. Focus is on Enterprise and TVC."
diff --git a/fbalpha_libretro.info b/fbalpha_libretro.info
deleted file mode 100644
index 7b66187..0000000
--- a/fbalpha_libretro.info
+++ /dev/null
@@ -1,103 +0,0 @@
-# Software Information
-display_name = "Arcade (FinalBurn Alpha)"
-authors = "FBAlpha Team"
-supported_extensions = "zip|7z|ccd|sub|img|iso|MODE1|2352|bin|cue"
-corename = "FinalBurn Alpha"
-license = "Non-commercial"
-permissions = ""
-display_version = "v1.0.0.01"
-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"
-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"
-firmware1_desc = "fbneo/neocdz.zip (Neo Geo CDZ System BIOS)"
-firmware1_path = "fbneo/neocdz.zip"
-firmware1_opt = "true"
-firmware2_desc = "fbneo/decocass.zip (DECO Cassette System BIOS)"
-firmware2_path = "fbneo/decocass.zip"
-firmware2_opt = "true"
-firmware3_desc = "fbneo/isgsm.zip (ISG Selection Master Type 2006 System BIOS)"
-firmware3_path = "fbneo/isgsm.zip"
-firmware3_opt = "true"
-firmware4_desc = "fbneo/midssio.zip (Midway SSIO Sound Board Internal ROM)"
-firmware4_path = "fbneo/midssio.zip"
-firmware4_opt = "true"
-firmware5_desc = "fbneo/nmk004.zip (NMK004 Internal ROM)"
-firmware5_path = "fbneo/nmk004.zip"
-firmware5_opt = "true"
-firmware6_desc = "fbneo/pgm.zip (PGM System BIOS)"
-firmware6_path = "fbneo/pgm.zip"
-firmware6_opt = "true"
-firmware7_desc = "fbneo/skns.zip (Super Kaneko Nova System BIOS)"
-firmware7_path = "fbneo/skns.zip"
-firmware7_opt = "true"
-firmware8_desc = "fbneo/ym2608.zip (YM2608 Internal ROM)"
-firmware8_path = "fbneo/ym2608.zip"
-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 = "FB Alpha is an arcade emulator supporting multiple platforms. 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/fbneo_libretro.info b/fbneo_libretro.info
index 1a9ff92..b59f7fd 100644
--- a/fbneo_libretro.info
+++ b/fbneo_libretro.info
@@ -5,7 +5,7 @@ supported_extensions = "zip|7z|cue|ccd"
 corename = "FinalBurn Neo"
 license = "Non-commercial"
 permissions = ""
-display_version = "v1.0.0.01"
+display_version = "v1.0.0.03"
 categories = "Emulator"
 
 # Hardware Information
@@ -31,7 +31,7 @@ database_match_archive_member = "false"
 database = "FBNeo - Arcade Games"
 
 # BIOS / Firmware
-firmware_count = 21
+firmware_count = 22
 firmware0_desc = "fbneo/neogeo.zip (Neo Geo BIOS)"
 firmware0_path = "fbneo/neogeo.zip"
 firmware0_opt = "true"
@@ -92,12 +92,15 @@ 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_desc = "fbneo/spec1282a.zip (ZX Spectrum 128 +2a BIOS)"
+firmware20_path = "fbneo/spec1282a.zip"
 firmware20_opt = "true"
-firmware21_desc = "fbneo/hiscore.dat (High Score support database)"
-firmware21_path = "fbneo/hiscore.dat"
+firmware21_desc = "fbneo/channelf.zip (Fairchild Channel F BIOS)"
+firmware21_path = "fbneo/channelf.zip"
 firmware21_opt = "true"
+firmware22_desc = "fbneo/hiscore.dat (High Score support database)"
+firmware22_path = "fbneo/hiscore.dat"
+firmware22_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/fixgb_libretro.info b/fixgb_libretro.info
index 7c8dfac..3335f3f 100644
--- a/fixgb_libretro.info
+++ b/fixgb_libretro.info
@@ -6,7 +6,7 @@ corename = "fixGB"
 categories = "Emulator"
 license = "MIT"
 permissions = ""
-display_version = "Alpha v0.8.1"
+display_version = "Alpha v0.8.2"
 
 # Hardware Information
 manufacturer = "Nintendo"
diff --git a/fixnes_libretro.info b/fixnes_libretro.info
index 4cf4aaa..1b1e191 100644
--- a/fixnes_libretro.info
+++ b/fixnes_libretro.info
@@ -6,7 +6,7 @@ corename = "fixNES"
 categories = "Emulator"
 license = "MIT"
 permissions = ""
-display_version = "Alpha v1.1"
+display_version = "Alpha v1.3.1"
 
 # Hardware Information
 manufacturer = "Nintendo"
diff --git a/gearboy_libretro.info b/gearboy_libretro.info
index 03b1f25..f468102 100644
--- a/gearboy_libretro.info
+++ b/gearboy_libretro.info
@@ -5,7 +5,7 @@ supported_extensions = "gb|dmg|gbc|cgb|sgb"
 corename = "Gearboy"
 license = "GPLv3"
 permissions = ""
-display_version = "3.2.0"
+display_version = "3.4.1"
 categories = "Emulator"
 
 # Hardware Information
diff --git a/hatari_libretro.info b/hatari_libretro.info
index daf6e79..785561d 100644
--- a/hatari_libretro.info
+++ b/hatari_libretro.info
@@ -15,8 +15,8 @@ systemid = "atari_st"
 
 # Libretro Features
 supports_no_game = "false"
-savestate = "false"
-savestate_features = "null"
+savestate = "true"
+savestate_features = "serialized"
 cheats = "false"
 input_descriptors = "true"
 memory_descriptors = "false"
diff --git a/mednafen_saturn_libretro.info b/mednafen_saturn_libretro.info
index 19b5952..2c5f034 100644
--- a/mednafen_saturn_libretro.info
+++ b/mednafen_saturn_libretro.info
@@ -20,7 +20,7 @@ hw_render = "false"
 needs_fullpath = "true"
 disk_control = "true"
 savestate = "true"
-savestate_features = "serialized"
+savestate_features = "deterministic"
 cheats = "true"
 input_descriptors = "true"
 memory_descriptors = "true"
diff --git a/mednafen_snes_libretro.info b/mednafen_snes_libretro.info
index 8f22a53..388cb94 100644
--- a/mednafen_snes_libretro.info
+++ b/mednafen_snes_libretro.info
@@ -29,4 +29,4 @@ core_options = "false"
 load_subsystem = "false"
 is_experimental = true
 
-description = "An older fork of Mednafen's original SNES emulator, which is itself based on an old fork of bsnes circa v059, this core does not have any compelling uses as compared with the other SNES cores that are available. It is not as fast as Snes9x nor as accurate as later bsnes forks or Mesen-S, and most users would be better off trying one of those cores instead. This core only exists for completionist's sake."
+description = "An older fork of Mednafen's original SNES emulator, which is itself based on an old fork of bsnes circa v059, this core does not have any compelling uses as compared with the other SNES cores that are available. It is not as fast as Snes9x or Supafaust nor as accurate as later bsnes forks or Mesen-S, and most users would be better off trying one of those cores instead. This core only exists for completionist's sake."
diff --git a/mednafen_supafaust_libretro.info b/mednafen_supafaust_libretro.info
index 96f7b7a..7eec826 100644
--- a/mednafen_supafaust_libretro.info
+++ b/mednafen_supafaust_libretro.info
@@ -6,7 +6,7 @@ corename = "Beetle Supafaust"
 supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc"
 license = "GPLv2+"
 permissions = ""
-display_version = "Apr 26 2020"
+display_version = "1.29.0"
 
 # Hardware Information
 manufacturer = "Nintendo"
diff --git a/mednafen_supergrafx_libretro.info b/mednafen_supergrafx_libretro.info
index fd62a45..decbd85 100644
--- a/mednafen_supergrafx_libretro.info
+++ b/mednafen_supergrafx_libretro.info
@@ -20,7 +20,7 @@ hw_render = "false"
 needs_fullpath = "true"
 disk_control = "true"
 savestate = "true"
-savestate_features = "serialized"
+savestate_features = "deterministic"
 cheats = "true"
 input_descriptors = "true"
 memory_descriptors = "true"
diff --git a/mesen-s_libretro.info b/mesen-s_libretro.info
index d14bfd4..e9d19eb 100644
--- a/mesen-s_libretro.info
+++ b/mesen-s_libretro.info
@@ -5,7 +5,7 @@ supported_extensions = "sfc|smc|fig|swc|bs|gb|gbc"
 corename = "Mesen-S"
 license = "GPLv3"
 permissions = ""
-display_version = "git"
+display_version = "0.4.0"
 categories = "Emulator"
 
 # Hardware Information
diff --git a/mesen_libretro.info b/mesen_libretro.info
index 53b8ae0..a5f376c 100644
--- a/mesen_libretro.info
+++ b/mesen_libretro.info
@@ -5,7 +5,7 @@ supported_extensions = "nes|fds|unf|unif"
 corename = "Mesen"
 license = "GPLv3"
 permissions = ""
-display_version = "0.9.4"
+display_version = "0.9.9"
 categories = "Emulator"
 
 # Hardware Information
diff --git a/mgba_libretro.info b/mgba_libretro.info
index a908bc3..90e1425 100644
--- a/mgba_libretro.info
+++ b/mgba_libretro.info
@@ -6,6 +6,7 @@ corename = "mGBA"
 license = "MPLv2.0"
 permissions = ""
 categories = "Emulator"
+display_version = "0.10-dev"
 
 # Hardware Information
 manufacturer = "Nintendo"
diff --git a/nestopia_libretro.info b/nestopia_libretro.info
index 84accee..4aa5e61 100644
--- a/nestopia_libretro.info
+++ b/nestopia_libretro.info
@@ -6,7 +6,7 @@ corename = "Nestopia"
 license = "GPLv2"
 permissions = ""
 categories = "Emulator"
-display_version = "v1.47-WIP"
+display_version = "1.51.1"
 
 # Hardware Information
 manufacturer = "Nintendo"
@@ -18,13 +18,10 @@ 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"
+firmware_count = 1
+firmware0_desc = "disksys.rom (Family Computer Disk System BIOS)"
+firmware0_path = "disksys.rom"
 firmware0_opt = "true"
-firmware1_desc = "disksys.rom (Family Computer Disk System BIOS)"
-firmware1_path = "disksys.rom"
-firmware1_opt = "true"
-notes = "Get NstDatabase.xml from https://github.com/0ldsk00l/nestopia|(!) disksys.rom (md5): ca30b50f880eb660a320674ed365ef7a|Press Retropad L1 to switch disk side."
+notes = "(!) disksys.rom (md5): ca30b50f880eb660a320674ed365ef7a|Press Retropad L1 to switch disk side."
 
-description = "Nestopia is based on the most up-to-date code from the Nestopia-Undead emulator. This core strikes a good balance between performance and accuracy, with support for a wide variety of games and mappers. However, it needs the NstDatabase.xml to determine which games support the Zapper light gun and various other peripherals, as well as to pick certain mappers, so make sure you have that file in place to avoid unnecessary problems. In general, this core is a good choice for most users on desktop and mobile platforms."
+description = "Nestopia is based on the most up-to-date code from the Nestopia-Undead emulator. This core strikes a good balance between performance and accuracy, with support for a wide variety of games and mappers. In general, this core is a good choice for most users on desktop and mobile platforms."
diff --git a/pcsx_rearmed_libretro.info b/pcsx_rearmed_libretro.info
index 85ead16..8c69a45 100644
--- a/pcsx_rearmed_libretro.info
+++ b/pcsx_rearmed_libretro.info
@@ -16,7 +16,7 @@ systemid = "playstation"
 database = "Sony - PlayStation"
 supports_no_game = "false"
 savestate = "true"
-savestate_features = "serialized"
+savestate_features = "deterministic"
 cheats = "true"
 input_descriptors = "true"
 memory_descriptors = "true"
diff --git a/prosystem_libretro.info b/prosystem_libretro.info
index ab271c1..040018e 100644
--- a/prosystem_libretro.info
+++ b/prosystem_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Atari - 7800 (ProSystem)"
 authors = "Greg Stanton|Brian Berlin|Leonis|Greg DeMent"
-supported_extensions = "a78|bin"
+supported_extensions = "a78|bin|cdf"
 corename = "ProSystem"
 license = "GPLv2"
 permissions = ""
diff --git a/puae2021_libretro.info b/puae2021_libretro.info
index b6d3594..17da0e7 100644
--- a/puae2021_libretro.info
+++ b/puae2021_libretro.info
@@ -30,25 +30,43 @@ disk_control = "true"
 is_experimental = "false"
 
 # Firmware
-firmware_count = 6
-firmware0_desc = "kick34005.A500 (Amiga 500 BIOS, Kickstart v1.3 Rev. 34.005)"
-firmware0_path = "kick34005.A500"
-firmware0_opt = "false"
-firmware1_desc = "kick37175.A500 (Amiga 500+ BIOS, Kickstart v2.04 Rev. 37.175)"
-firmware1_path = "kick37175.A500"
+firmware_count = 12
+firmware0_desc = "kick33180.A500 | amiga-os-120.rom (A500-A2000 KS v1.2 rev 33.180)"
+firmware0_path = "kick33180.A500"
+firmware0_opt = "true"
+firmware1_desc = "kick34005.A500 | amiga-os-130.rom (A500-A2000-CDTV KS v1.3 rev 34.005)"
+firmware1_path = "kick34005.A500"
 firmware1_opt = "false"
-firmware2_desc = "kick40063.A600 (Amiga 600 BIOS, Kickstart v3.1 Rev. 40.063)"
-firmware2_path = "kick40063.A600"
-firmware2_opt = "false"
-firmware3_desc = "kick40068.A1200 (Amiga 1200 BIOS, Kickstart v3.1 Rev. 40.068)"
-firmware3_path = "kick40068.A1200"
-firmware3_opt = "false"
-firmware4_desc = "kick40060.CD32 (Amiga CD32 BIOS, Kickstart v3.1 Rev. 40.060)"
-firmware4_path = "kick40060.CD32"
+firmware2_desc = "kick37175.A500 | amiga-os-204.rom (A500+ KS v2.04 rev 37.175)"
+firmware2_path = "kick37175.A500"
+firmware2_opt = "true"
+firmware3_desc = "kick37350.A600 | amiga-os-205-a600.rom (A600 KS v2.05 rev 37.350)"
+firmware3_path = "kick37350.A600"
+firmware3_opt = "true"
+firmware4_desc = "kick40063.A600 | amiga-os-310-a600.rom (A600-A2000 KS v3.1 rev 40.063)"
+firmware4_path = "kick40063.A600"
 firmware4_opt = "true"
-firmware5_desc = "kick40060.CD32.ext (Amiga CD32 Extended BIOS, CD32 Extended ROM Rev. 40.060)"
-firmware5_path = "kick40060.CD32.ext"
+firmware5_desc = "kick39106.A1200 | amiga-os-300-a1200.rom (A1200 KS v3.0 rev 39.106)"
+firmware5_path = "kick39106.A1200"
 firmware5_opt = "true"
-notes = "(!) kick34005.A500 (md5): 82a21c1890cae844b3df741f2762d48d|(!) kick37175.A500 (md5): dc10d7bdd1b6f450773dfb558477c230|(!) kick40063.A600 (md5): e40a5dfb3d017ba8779faba30cbd1c8e|(!) kick40068.A1200 (md5): 646773759326fbac3b2311fd8c8793ee|(!) kick40060.CD32 (md5): 5f8924d013dd57a89cf349f4cdedc6b1|(!) kick40060.CD32.ext (md5): bb72565701b1b6faece07d68ea5da639"
+firmware6_desc = "kick40068.A1200 | amiga-os-310-a1200.rom (A1200 KS v3.1 rev 40.068)"
+firmware6_path = "kick40068.A1200"
+firmware6_opt = "false"
+firmware7_desc = "kick39106.A4000 | amiga-os-300-a4000.rom (A4000 KS v3.0 rev 39.106)"
+firmware7_path = "kick39106.A4000"
+firmware7_opt = "true"
+firmware8_desc = "kick40068.A4000 | amiga-os-310-a4000.rom (A4000 KS v3.1 rev 40.068)"
+firmware8_path = "kick40068.A4000"
+firmware8_opt = "true"
+firmware9_desc = "kick34005.CDTV | amiga-os-130-cdtv-ext.rom (CDTV extended ROM v1.0)"
+firmware9_path = "kick34005.CDTV"
+firmware9_opt = "true"
+firmware10_desc = "kick40060.CD32 | amiga-os-310-cd32.rom (CD32 KS v3.1 rev 40.060)"
+firmware10_path = "kick40060.CD32"
+firmware10_opt = "false"
+firmware11_desc = "kick40060.CD32.ext | amiga-os-310-cd32-ext.rom (CD32 extended ROM rev 40.060)"
+firmware11_path = "kick40060.CD32.ext"
+firmware11_opt = "false"
+notes = "(!) kick33180.A500 (md5): 85ad74194e87c08904327de1a9443b7a|(!) kick34005.A500 (md5): 82a21c1890cae844b3df741f2762d48d|(!) kick37175.A500 (md5): dc10d7bdd1b6f450773dfb558477c230|(!) kick37350.A600 (md5): 465646c9b6729f77eea5314d1f057951|(!) kick40063.A600 (md5): e40a5dfb3d017ba8779faba30cbd1c8e|(!) kick39106.A1200 (md5): b7cc148386aa631136f510cd29e42fc3|(!) kick40068.A1200 (md5): 646773759326fbac3b2311fd8c8793ee|(!) kick39106.A4000 (md5): 9b8bdd5a3fd32c2a5a6f5b1aefc799a5|(!) kick40068.A4000 (md5): 9bdedde6a4f33555b4a270c8ca53297d|(!) kick34005.CDTV (md5): 89da1838a24460e4b93f4f0c5d92d48d|(!) kick40060.CD32 (md5): 5f8924d013dd57a89cf349f4cdedc6b1|(!) kick40060.CD32.ext (md5): bb72565701b1b6faece07d68ea5da639"
 
-description = "A port of the PUAE Amiga emulator, which is itself a continuation of the E-UAE emulator, to libretro. The core has a built-in AROS fallback Kickstart that is compatible enough for some A500 games, but a proper Kickstart ROM is preferred. This core is well-integrated with libretro and is the first option users should try when seeking to play Amiga games via libretro."
+description = "A port of the PUAE Amiga emulator, which is itself a continuation of the E-UAE emulator, to libretro. The core has a built-in AROS fallback Kickstart that is compatible enough for some A500 games, but a proper Kickstart ROM is preferred. This core is well-integrated with libretro and is the less accurate version more suitable for weaker devices."
diff --git a/puae_libretro.info b/puae_libretro.info
index 7fede71..4cdf080 100644
--- a/puae_libretro.info
+++ b/puae_libretro.info
@@ -6,7 +6,7 @@ corename = "PUAE"
 supported_extensions = "adf|adz|dms|fdi|ipf|hdf|hdz|lha|slave|info|cue|ccd|nrg|mds|iso|chd|uae|m3u|zip|7z|rp9"
 license = "GPLv2"
 permissions = ""
-display_version = "v4.5.0"
+display_version = "v4.9.1"
 
 # Hardware Information
 manufacturer = "Commodore"
@@ -30,25 +30,43 @@ disk_control = "true"
 is_experimental = "false"
 
 # Firmware
-firmware_count = 6
-firmware0_desc = "kick34005.A500 (Amiga 500 BIOS, Kickstart v1.3 Rev. 34.005)"
-firmware0_path = "kick34005.A500"
-firmware0_opt = "false"
-firmware1_desc = "kick37175.A500 (Amiga 500+ BIOS, Kickstart v2.04 Rev. 37.175)"
-firmware1_path = "kick37175.A500"
+firmware_count = 12
+firmware0_desc = "kick33180.A500 | amiga-os-120.rom (A500-A2000 KS v1.2 rev 33.180)"
+firmware0_path = "kick33180.A500"
+firmware0_opt = "true"
+firmware1_desc = "kick34005.A500 | amiga-os-130.rom (A500-A2000-CDTV KS v1.3 rev 34.005)"
+firmware1_path = "kick34005.A500"
 firmware1_opt = "false"
-firmware2_desc = "kick40063.A600 (Amiga 600 BIOS, Kickstart v3.1 Rev. 40.063)"
-firmware2_path = "kick40063.A600"
-firmware2_opt = "false"
-firmware3_desc = "kick40068.A1200 (Amiga 1200 BIOS, Kickstart v3.1 Rev. 40.068)"
-firmware3_path = "kick40068.A1200"
-firmware3_opt = "false"
-firmware4_desc = "kick40060.CD32 (Amiga CD32 BIOS, Kickstart v3.1 Rev. 40.060)"
-firmware4_path = "kick40060.CD32"
+firmware2_desc = "kick37175.A500 | amiga-os-204.rom (A500+ KS v2.04 rev 37.175)"
+firmware2_path = "kick37175.A500"
+firmware2_opt = "true"
+firmware3_desc = "kick37350.A600 | amiga-os-205-a600.rom (A600 KS v2.05 rev 37.350)"
+firmware3_path = "kick37350.A600"
+firmware3_opt = "true"
+firmware4_desc = "kick40063.A600 | amiga-os-310-a600.rom (A600-A2000 KS v3.1 rev 40.063)"
+firmware4_path = "kick40063.A600"
 firmware4_opt = "true"
-firmware5_desc = "kick40060.CD32.ext (Amiga CD32 Extended BIOS, CD32 Extended ROM Rev. 40.060)"
-firmware5_path = "kick40060.CD32.ext"
+firmware5_desc = "kick39106.A1200 | amiga-os-300-a1200.rom (A1200 KS v3.0 rev 39.106)"
+firmware5_path = "kick39106.A1200"
 firmware5_opt = "true"
-notes = "(!) kick34005.A500 (md5): 82a21c1890cae844b3df741f2762d48d|(!) kick37175.A500 (md5): dc10d7bdd1b6f450773dfb558477c230|(!) kick40063.A600 (md5): e40a5dfb3d017ba8779faba30cbd1c8e|(!) kick40068.A1200 (md5): 646773759326fbac3b2311fd8c8793ee|(!) kick40060.CD32 (md5): 5f8924d013dd57a89cf349f4cdedc6b1|(!) kick40060.CD32.ext (md5): bb72565701b1b6faece07d68ea5da639"
+firmware6_desc = "kick40068.A1200 | amiga-os-310-a1200.rom (A1200 KS v3.1 rev 40.068)"
+firmware6_path = "kick40068.A1200"
+firmware6_opt = "false"
+firmware7_desc = "kick39106.A4000 | amiga-os-300-a4000.rom (A4000 KS v3.0 rev 39.106)"
+firmware7_path = "kick39106.A4000"
+firmware7_opt = "true"
+firmware8_desc = "kick40068.A4000 | amiga-os-310-a4000.rom (A4000 KS v3.1 rev 40.068)"
+firmware8_path = "kick40068.A4000"
+firmware8_opt = "true"
+firmware9_desc = "kick34005.CDTV | amiga-os-130-cdtv-ext.rom (CDTV extended ROM v1.0)"
+firmware9_path = "kick34005.CDTV"
+firmware9_opt = "true"
+firmware10_desc = "kick40060.CD32 | amiga-os-310-cd32.rom (CD32 KS v3.1 rev 40.060)"
+firmware10_path = "kick40060.CD32"
+firmware10_opt = "false"
+firmware11_desc = "kick40060.CD32.ext | amiga-os-310-cd32-ext.rom (CD32 extended ROM rev 40.060)"
+firmware11_path = "kick40060.CD32.ext"
+firmware11_opt = "false"
+notes = "(!) kick33180.A500 (md5): 85ad74194e87c08904327de1a9443b7a|(!) kick34005.A500 (md5): 82a21c1890cae844b3df741f2762d48d|(!) kick37175.A500 (md5): dc10d7bdd1b6f450773dfb558477c230|(!) kick37350.A600 (md5): 465646c9b6729f77eea5314d1f057951|(!) kick40063.A600 (md5): e40a5dfb3d017ba8779faba30cbd1c8e|(!) kick39106.A1200 (md5): b7cc148386aa631136f510cd29e42fc3|(!) kick40068.A1200 (md5): 646773759326fbac3b2311fd8c8793ee|(!) kick39106.A4000 (md5): 9b8bdd5a3fd32c2a5a6f5b1aefc799a5|(!) kick40068.A4000 (md5): 9bdedde6a4f33555b4a270c8ca53297d|(!) kick34005.CDTV (md5): 89da1838a24460e4b93f4f0c5d92d48d|(!) kick40060.CD32 (md5): 5f8924d013dd57a89cf349f4cdedc6b1|(!) kick40060.CD32.ext (md5): bb72565701b1b6faece07d68ea5da639"
 
 description = "A port of the PUAE Amiga emulator, which is itself a continuation of the E-UAE emulator, to libretro. The core has a built-in AROS fallback Kickstart that is compatible enough for some A500 games, but a proper Kickstart ROM is preferred. This core is well-integrated with libretro and is the first option users should try when seeking to play Amiga games via libretro."
diff --git a/puzzlescript_libretro.info b/puzzlescript_libretro.info
index c6361dc..39cce1d 100644
--- a/puzzlescript_libretro.info
+++ b/puzzlescript_libretro.info
@@ -1,30 +1,30 @@
-# Software Information
-display_name = "PuzzleScript (pzretro)"
-categories = "Game engine"
-authors = "Nathan Whitehead"
-corename = "puzzlescript"
-supported_extensions = "pz"
-license = "MIT"
-permissions = ""
-
-# Hardware Information
-systemname = "PuzzleScript"
-systemid = "puzzlescript"
-
-# Libretro Features
-savestate = "false"
-savestate_features = "deterministic"
-cheats = "false"
-input_descriptors = "true"
-memory_descriptors = "false"
-libretro_saves = "false"
-core_options = "true"
-core_options_version = "1.3"
-load_subsystem = "false"
-supports_no_game = "false"
-database = "PuzzleScript"
-hw_render = "false"
-needs_fullpath = "false"
-disk_control = "false"
-
-description = "Plays PuzzleScript games"
\ No newline at end of file
+# Software Information
+display_name = "PuzzleScript (pzretro)"
+categories = "Game engine"
+authors = "Nathan Whitehead"
+corename = "puzzlescript"
+supported_extensions = "pz|pzp"
+license = "MIT"
+permissions = ""
+
+# Hardware Information
+systemname = "PuzzleScript"
+systemid = "puzzlescript"
+
+# Libretro Features
+savestate = "false"
+savestate_features = "deterministic"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "true"
+core_options_version = "1.3"
+load_subsystem = "false"
+supports_no_game = "false"
+database = "PuzzleScript"
+hw_render = "false"
+needs_fullpath = "false"
+disk_control = "false"
+
+description = "Plays PuzzleScript games"
diff --git a/quicknes_libretro.info b/quicknes_libretro.info
index 58d8ddf..8fcfcf3 100644
--- a/quicknes_libretro.info
+++ b/quicknes_libretro.info
@@ -5,7 +5,7 @@ supported_extensions = "nes"
 corename = "QuickNES"
 license = "LGPLv2.1+"
 permissions = ""
-display_version = "Git"
+display_version = "1.0-WIP"
 categories = "Emulator"
 
 # Hardware Information
diff --git a/sameboy_libretro.info b/sameboy_libretro.info
index 540ce86..900d258 100644
--- a/sameboy_libretro.info
+++ b/sameboy_libretro.info
@@ -3,7 +3,7 @@ display_name = "Nintendo - Game Boy / Color (SameBoy)"
 authors = "LIJI32"
 supported_extensions = "gb|gbc"
 corename = "SameBoy"
-display_version = "v0.9.0"
+display_version = "0.14.7"
 categories = "Emulator"
 license = "MIT"
 permissions = ""
diff --git a/snes9x_libretro.info b/snes9x_libretro.info
index 1197ef8..7b68778 100644
--- a/snes9x_libretro.info
+++ b/snes9x_libretro.info
@@ -6,7 +6,7 @@ corename = "Snes9x"
 supported_extensions = "smc|sfc|swc|fig|bs|st"
 license = "Non-commercial"
 permissions = ""
-display_version = "1.60"
+display_version = "1.61"
 
 # Hardware Information
 manufacturer = "Nintendo"
diff --git a/stella_libretro.info b/stella_libretro.info
index 74160a7..5cdf413 100644
--- a/stella_libretro.info
+++ b/stella_libretro.info
@@ -4,7 +4,7 @@ supported_extensions = "a26|bin"
 corename = "Stella"
 license = "GPLv2"
 permissions = ""
-display_version = "6.0"
+display_version = "6.6"
 categories = "Emulator"
 
 # Hardware Information
diff --git a/tgbdual_libretro.info b/tgbdual_libretro.info
index d8dda19..db1f5af 100644
--- a/tgbdual_libretro.info
+++ b/tgbdual_libretro.info
@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Nintendo - Game Boy / Color (TGB Dual)"
 authors = "GIGO|Hii"
-supported_extensions = "gb|gbc|sgb"
+supported_extensions = "cgb|dmg|gb|gbc|sgb"
 corename = "TGB Dual"
 license = "GPLv2"
 permissions = ""
diff --git a/vbam_libretro.info b/vbam_libretro.info
index ba5c267..a6a4751 100644
--- a/vbam_libretro.info
+++ b/vbam_libretro.info
@@ -5,7 +5,7 @@ supported_extensions = "dmg|gb|gbc|cgb|sgb|gba"
 corename = "VBA-M"
 license = "GPLv2"
 permissions = ""
-display_version = "2.1.0"
+display_version = "2.1.4"
 
 # Hardware Information
 manufacturer = "Nintendo"