diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 4c86424c7..925c38486 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -115,6 +115,7 @@ Emulators\solarus\solarus-run.exe
 Emulators\SSF\SSF.exe
 Emulators\Stella\64-bit\Stella.exe
 Emulators\Supermodel\Supermodel.exe
+Emulators\tic80\tic80.exe
 Emulators\Triforce\DolphinWX.exe
 Emulators\tsugaru\Tsugaru_CUI.exe
 Emulators\VBA-M\visualboyadvance-m.exe
diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 9f0239193..fec5a521e 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -141,10 +141,10 @@ namespace PlatformIds
         "supracan",             // Funtech Super A'Can
         "switch",               // Nintendo Switch
         "ti99",                 // Texas Instruments TI-99
-        "tic80",                // TIC-80 Game Engine
+        "tic80",                // TIC-80 Fantasy Computer
         "trs-80",               // Tandy TRS-80
         "uzebox",               // Uzebox Open Source Console
-        "vectrex",              // Smith Engineering Vectrex
+        "vectrex",              // GCE Vectrex
         "vic20",                // Commodore VIC-20
         "virtualboy",           // Nintendo Virtual Boy
         "vpinball",             // Visual Pinball
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index 5265ea9be..8d967f405 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -337,6 +337,12 @@
             <entry>/usr/local/bin/Stella</entry>
         </rule>
     </emulator>
+    <emulator name="TIC-80">
+        <!-- TIC-80 Fantasy Computer (game engine) -->
+        <rule type="staticpath">
+            <entry>/Applications/tic80.app/Contents/MacOS/tic80</entry>
+        </rule>
+    </emulator>
     <emulator name="VBA-M">
         <!-- Nintendo Game Boy Advance emulator VBA-M -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index b14534dbd..b13321645 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1874,10 +1874,11 @@
     </system>
     <system>
         <name>tic80</name>
-        <fullname>TIC-80 Game Engine</fullname>
+        <fullname>TIC-80 Fantasy Computer</fullname>
         <path>%ROMPATH%/tic80</path>
         <extension>.tic .TIC</extension>
         <command label="TIC-80">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.dylib %ROM%</command>
+        <command label="TIC-80 (Standalone)">%EMULATOR_TIC-80% %ROM% --fullscreen</command>
         <platform>tic80</platform>
         <theme>tic80</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 0cc6c5046..426f268e7 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -904,6 +904,17 @@
             <entry>~/bin/Supermodel/supermodel</entry>
         </rule>
     </emulator>
+    <emulator name="TIC-80">
+        <!-- TIC-80 Fantasy Computer (game engine) -->
+        <rule type="systempath">
+            <entry>tic80</entry>
+            <entry>com.tic80.TIC_80</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>/var/lib/flatpak/exports/bin/com.tic80.TIC_80</entry>
+            <entry>~/.local/share/flatpak/exports/bin/com.tic80.TIC_80</entry>
+        </rule>
+    </emulator>
     <emulator name="TRIFORCE">
         <!-- Triforce, fork of Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index d07178546..f7bc5786f 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1975,10 +1975,11 @@
     </system>
     <system>
         <name>tic80</name>
-        <fullname>TIC-80 Game Engine</fullname>
+        <fullname>TIC-80 Fantasy Computer</fullname>
         <path>%ROMPATH%/tic80</path>
         <extension>.tic .TIC</extension>
         <command label="TIC-80">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM%</command>
+        <command label="TIC-80 (Standalone)">%EMULATOR_TIC-80% %ROM% --fullscreen</command>
         <platform>tic80</platform>
         <theme>tic80</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index b48c3f9ef..17f33c7c9 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -794,6 +794,16 @@
             <entry>%ESPATH%\..\Emulators\Supermodel\Supermodel.exe</entry>
         </rule>
     </emulator>
+    <emulator name="TIC-80">
+        <!-- TIC-80 Fantasy Computer (game engine) -->
+        <rule type="systempath">
+            <entry>tic80.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\tic80\tic80.exe</entry>
+            <entry>%ESPATH%\..\Emulators\tic80\tic80.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="TRIFORCE">
         <!-- Triforce, fork of Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 478f7be58..626c67070 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -525,6 +525,13 @@
             <entry>%ESPATH%\..\Emulators\Supermodel\Supermodel.exe</entry>
         </rule>
     </emulator>
+    <emulator name="TIC-80">
+        <!-- TIC-80 Fantasy Computer (game engine) -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\tic80\tic80.exe</entry>
+            <entry>%ESPATH%\..\Emulators\tic80\tic80.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="TRIFORCE">
         <!-- Triforce, fork of Nintendo GameCube and Wii emulator Dolphin -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index bd57eb885..bf4a94dc2 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1951,10 +1951,11 @@
     </system>
     <system>
         <name>tic80</name>
-        <fullname>TIC-80 Game Engine</fullname>
+        <fullname>TIC-80 Fantasy Computer</fullname>
         <path>%ROMPATH%\tic80</path>
         <extension>.tic .TIC</extension>
         <command label="TIC-80">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\tic80_libretro.dll %ROM%</command>
+        <command label="TIC-80 (Standalone)">%EMULATOR_TIC-80% %ROM% --fullscreen</command>
         <platform>tic80</platform>
         <theme>tic80</theme>
     </system>