diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index b6056153d..a8a0f20e1 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -54,6 +54,7 @@ namespace PlatformIds
         "dragon32",             // Dragon Data Dragon 32
         "dreamcast",            // Sega Dreamcast
         "easyrpg",              // EasyRPG eame engine
+        "electron",             // Acorn Electron
         "famicom",              // Nintendo Family Computer
         "fds",                  // Nintendo Famicom Disk System
         "flash",                // Adobe Flash
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index 679049dbd..4b438b08a 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -53,6 +53,7 @@ namespace PlatformIds
         DRAGON32,
         SEGA_DREAMCAST,
         GAMEENGINE_EASYRPG,
+        ACORN_ELECTRON,
         NINTENDO_FAMICOM,
         NINTENDO_FAMICOM_DISK_SYSTEM,
         ADOBE_FLASH,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index 772b05974..66a53f4aa 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -39,6 +39,7 @@ namespace
 
     const std::map<PlatformId, std::string> gamesdb_new_platformid_map {
         {THREEDO, "25"},
+        {ACORN_ELECTRON, "4954"},
         {AMSTRAD_CPC, "4914"},
         {APPLE_II, "4942"},
         {ARCADE, "23"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 14b2214b3..b4a2d1bec 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -29,6 +29,7 @@ namespace
     // https://www.screenscraper.fr/api/systemesListe.php?devid=xxx&devpassword=yyy&softname=zzz&output=XML
     const std::map<PlatformId, unsigned short> screenscraper_platformid_map {
         {THREEDO, 29},
+        {ACORN_ELECTRON, 85},
         {AMSTRAD_CPC, 65},
         {AMSTRAD_GX4000, 87},
         {APPLE_II, 86},
diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index c09774fdb..c81968316 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -185,6 +185,10 @@
         <name>easyrpg</name>
         <systemsortname>Engine - 2007</systemsortname>
     </system>
+    <system>
+        <name>electron</name>
+        <systemsortname>Computer - 1983</systemsortname>
+    </system>
     <system>
         <name>emulators</name>
         <systemsortname>Folder - 0000</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index f89ebfe71..783f32905 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -185,6 +185,10 @@
         <name>easyrpg</name>
         <systemsortname>EasyRPG Team - Engine - 2007</systemsortname>
     </system>
+    <system>
+        <name>electron</name>
+        <systemsortname>Acorn Computers - Computer - 1983</systemsortname>
+    </system>
     <system>
         <name>emulators</name>
         <systemsortname>Various - Folder - 0000</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index 39f2f1060..e2639516d 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -185,6 +185,10 @@
         <name>easyrpg</name>
         <systemsortname>EasyRPG Team - 2007</systemsortname>
     </system>
+    <system>
+        <name>electron</name>
+        <systemsortname>Acorn Computers - 1983</systemsortname>
+    </system>
     <system>
         <name>emulators</name>
         <systemsortname>Various - 0000</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index 0b63cda12..1a2f36232 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -185,6 +185,10 @@
         <name>easyrpg</name>
         <systemsortname>2007</systemsortname>
     </system>
+    <system>
+        <name>electron</name>
+        <systemsortname>1983</systemsortname>
+    </system>
     <system>
         <name>emulators</name>
         <systemsortname>0000</systemsortname>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 2270aa48e..159312624 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -503,6 +503,17 @@
         <platform>easyrpg</platform>
         <theme>easyrpg</theme>
     </system>
+    <system>
+        <name>electron</name>
+        <fullname>Acorn Electron</fullname>
+        <path>%ROMPATH%/electron</path>
+        <extension>.1dd .1DD .adf .ADF .adl .ADL .adm .ADM .ads .ADS .bbc .BBC .bin .BIN .cqi .CQI .cqm .CQM .csw .CSW .d77 .D77 .d88 .D88 .dfi .DFI .dsd .DSD .dsk .DSK .hfe .HFE .imd .IMD .img .IMG .mfi .MFI .mfm .MFM .rom .ROM .ssd .SSD .td0 .TD0 .uef .UEF .wav .WAV .7z .7Z .zip .ZIP</extension>
+        <command label="MAME [Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/electron electron64 -autoboot_delay "2" -autoboot_command "*T.\nCH.\"\"\n" -cass1 %ROM%</command>
+        <command label="MAME [Diskette DFS] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/electron electron64 -exp plus1 -cart1 seds -autoboot_delay "2" -autoboot_command "*CAT\n\n\n\n\n\n*EXEC !BOOT\n" -flop1 %ROM%</command>
+        <command label="MAME [Diskette ADFS] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/electron electron64 -exp plus3 -exp:plus3:fdc:1 35dd -autoboot_delay "2" -autoboot_command "*CAT\n\n\n\n\n\n*RUN !BOOT\n" -flop1 %ROM%</command>
+        <platform>electron</platform>
+        <theme>electron</theme>
+    </system>
     <system>
         <name>emulators</name>
         <fullname>Emulators</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index ed4389f0d..b81a937e3 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -520,6 +520,17 @@
         <platform>easyrpg</platform>
         <theme>easyrpg</theme>
     </system>
+    <system>
+        <name>electron</name>
+        <fullname>Acorn Electron</fullname>
+        <path>%ROMPATH%/electron</path>
+        <extension>.1dd .1DD .adf .ADF .adl .ADL .adm .ADM .ads .ADS .bbc .BBC .bin .BIN .cqi .CQI .cqm .CQM .csw .CSW .d77 .D77 .d88 .D88 .dfi .DFI .dsd .DSD .dsk .DSK .hfe .HFE .imd .IMD .img .IMG .mfi .MFI .mfm .MFM .rom .ROM .ssd .SSD .td0 .TD0 .uef .UEF .wav .WAV .7z .7Z .zip .ZIP</extension>
+        <command label="MAME [Tape] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/electron electron64 -autoboot_delay "2" -autoboot_command "*T.\nCH.\"\"\n" -cass1 %ROM%</command>
+        <command label="MAME [Diskette DFS] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/electron electron64 -exp plus1 -cart1 seds -autoboot_delay "2" -autoboot_command "*CAT\n\n\n\n\n\n*EXEC !BOOT\n" -flop1 %ROM%</command>
+        <command label="MAME [Diskette ADFS] (Standalone)">%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/electron electron64 -exp plus3 -exp:plus3:fdc:1 35dd -autoboot_delay "2" -autoboot_command "*CAT\n\n\n\n\n\n*RUN !BOOT\n" -flop1 %ROM%</command>
+        <platform>electron</platform>
+        <theme>electron</theme>
+    </system>
     <system>
         <name>emulators</name>
         <fullname>Emulators</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index adfbf6c84..30cdb45ec 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -518,6 +518,17 @@
         <platform>easyrpg</platform>
         <theme>easyrpg</theme>
     </system>
+    <system>
+        <name>electron</name>
+        <fullname>Acorn Electron</fullname>
+        <path>%ROMPATH%\electron</path>
+        <extension>.1dd .1DD .adf .ADF .adl .ADL .adm .ADM .ads .ADS .bbc .BBC .bin .BIN .cqi .CQI .cqm .CQM .csw .CSW .d77 .D77 .d88 .D88 .dfi .DFI .dsd .DSD .dsk .DSK .hfe .HFE .imd .IMD .img .IMG .mfi .MFI .mfm .MFM .rom .ROM .ssd .SSD .td0 .TD0 .uef .UEF .wav .WAV .7z .7Z .zip .ZIP</extension>
+        <command label="MAME [Tape] (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\electron electron64 -autoboot_delay "2" -autoboot_command "*T.\nCH.\"\"\n" -cass1 %ROM%</command>
+        <command label="MAME [Diskette DFS] (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\electron electron64 -exp plus1 -cart1 seds -autoboot_delay "2" -autoboot_command "*CAT\n\n\n\n\n\n*EXEC !BOOT\n" -flop1 %ROM%</command>
+        <command label="MAME [Diskette ADFS] (Standalone)">%HIDEWINDOW% %RUNINBACKGROUND% %STARTDIR%=%EMUDIR% %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%\electron electron64 -exp plus3 -exp:plus3:fdc:1 35dd -autoboot_delay "2" -autoboot_command "*CAT\n\n\n\n\n\n*RUN !BOOT\n" -flop1 %ROM%</command>
+        <platform>electron</platform>
+        <theme>electron</theme>
+    </system>
     <system>
         <name>emulators</name>
         <fullname>Emulators</fullname>