diff --git a/CHANGELOG.md b/CHANGELOG.md
index cae6f27f9..6e374a144 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,11 @@
* Added support for deleting installed themes from the theme downloader interface
* Added support for the Acorn Archimedes (archimedes) game system
* Added support for the Bit Corporation Gamate (gamate) game system
+* Added support for the Sega NAOMI 2 (naomi2) game system
* Added support for the Commodore Plus/4 (plus4) game system
+* Added support for the Sega Titan Video Game System (stv) game system
+* Added support for the Funtech Super A'Can (supracan) game system
+* Added support for the Namco-Sega-Nintendo Triforce (triforce) game system
* Added support for the Microsoft Windows 3.x (windows3x) game system
* Added support for the Microsoft Windows 9x (windows9x) game system
* Removed support for the MAME4ALL (mame-mame4all) system
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index 119b1b13f..e33e3e7d5 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -3486,7 +3486,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| atarilynx | Atari Lynx | Handy | Beetle Lynx,
Mednafen **(Standalone)** | | |
| atarist | Atari ST [also STE and Falcon] | Hatari | Hatari **(Standalone)** | Yes | Single archive or image file for single-diskette games, .m3u playlist for multi-diskette games |
| atarixe | Atari XE | Atari800 | Atari800 **(Standalone)** | No | |
-| atomiswave | Sammy Corporation Atomiswave | Flycast | Flycast **(Standalone)** | | |
+| atomiswave | Sammy Corporation Atomiswave | Flycast | Flycast **(Standalone)** | Depends | Single archive file |
| bbcmicro | Acorn Computers BBC Micro | MAME **(Standalone)** | | Yes | Single archive or diskette image file |
| c64 | Commodore 64 | VICE x64sc Accurate | VICE x64sc Accurate **(Standalone)**,
VICE x64 Fast,
VICE x64 SuperCPU,
VICE x128,
Frodo | No | Single archive or image file for tape, cartridge or single-diskette games, .m3u playlist for multi-diskette games |
| cavestory | Cave Story (NXEngine) | NXEngine | | | |
@@ -3555,8 +3555,9 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| msxturbor | MSX Turbo R | blueMSX | openMSX **(Standalone)**,
openMSX No Machine **(Standalone)** | Yes | |
| mugen | M.U.G.E.N Game Engine | Ikemen GO **(Standalone)** | | No | See the specific _M.U.G.E.N Game Engine_ section elsewhere in this guide |
| multivision | Othello Multivision | Gearsystem | | | |
-| naomi | Sega NAOMI | Flycast | Flycast **(Standalone)** | | |
-| naomigd | Sega NAOMI GD-ROM | Flycast | Flycast **(Standalone)** | | |
+| naomi | Sega NAOMI | Flycast | Flycast **(Standalone)** | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
+| naomi2 | Sega NAOMI 2 | Flycast | Flycast **(Standalone)** | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
+| naomigd | Sega NAOMI GD-ROM | Flycast | Flycast **(Standalone)** | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
| n3ds | Nintendo 3DS | Citra [UW],
Citra **(Standalone)** [M] | Citra 2018 [UW],
Citra **(Standalone)** [UW] | No | Single ROM file |
| n64 | Nintendo 64 | Mupen64Plus-Next | Mupen64Plus **(Standalone)**,
ParaLLEl N64,
simple64 **(Standalone)** [UW],
Rosalie's Mupen GUI **(Standalone)** [UW],
Project64 **(Standalone)** [W],
ares **(Standalone)**,
sixtyforce **(Standalone)** [M] | No | Single archive or ROM file |
| n64dd | Nintendo 64DD | ParaLLEl N64 [UW],
Mupen64Plus-Next [M] | Mupen64Plus-Next [UW],
ParaLLEl N64 [M],
Rosalie's Mupen GUI **(Standalone)** [UW],
ares **(Standalone)** | Yes | See the specific _Nintendo 64DD_ section elsewhere in this guide |
@@ -3608,9 +3609,11 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| spectravideo | Spectravideo | blueMSX | | | |
| steam | Valve Steam | Steam **(Standalone)** | | No | See the specific _Steam_ section elsewhere in this guide |
| stratagus | Stratagus Game Engine | _Placeholder_ | | | |
+| stv | Sega Titan Video Game System | Kronos [UW],
MAME **(Standalone)** [M] | MAME **(Standalone)** [UW],
Mednafen **(Standalone)** | Yes | Single archive file |
| sufami | Bandai SuFami Turbo | Snes9x - Current | Snes9x 2010,
Snes9x **(Standalone)**,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
bsnes **(Standalone)** [UW],
ares **(Standalone)** | | |
| supergrafx | NEC SuperGrafx | Beetle SuperGrafx | Beetle PCE,
ares **(Standalone)** | | |
| supervision | Watara Supervision | Potator | | No | Single archive or ROM file |
+| supracan | Funtech Super A'Can | MAME **(Standalone)** | | Yes/No | Single archive or ROM file. To make MAME start these games create an empty file named internal_68k.bin and zip it into supracan.zip |
| switch | Nintendo Switch | Yuzu **(Standalone)** [UW],
Ryujinx **(Standalone)** [M] | Ryujinx **(Standalone)** [UW] | Yes | |
| symbian | Symbian | _Placeholder_ | | | |
| tanodragon | Tano Dragon | XRoar **(Standalone)** | | Yes | See the specific _Dragon 32 and Tano Dragon_ section elsewhere in this guide |
@@ -3619,6 +3622,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| ti99 | Texas Instruments TI-99 | MAME **(Standalone)** | | Yes | See the specific _Texas Instruments TI-99_ section elsewhere in this guide |
| tic80 | TIC-80 Game Engine | TIC-80 | | No | Single .tic file |
| to8 | Thomson TO8 | Theodore | | | |
+| triforce | Namco-Sega-Nintendo Triforce | Triforce **(Standalone)** [UW] | | No | |
| trs-80 | Tandy TRS-80 | sdl2trs DOS Diskette **(Standalone)** [UW] | sdl2trs Bootable Diskette **(Standalone)** [UW],
sdl2trs CMD File **(Standalone)** [UW] | Yes | See the specific _Tandy TRS-80_ section elsewhere in this guide |
| uzebox | Uzebox Open Source Console | Uzem | | | |
| vectrex | Smith Engineering Vectrex | vecx | | No | |