diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 994f12761..25ba3a73b 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -2,7 +2,7 @@ ES-DE (EmulationStation Desktop Edition) - Portable installation on Windows
 ---------------------------------------------------------------------------
 
 ES-DE release:
-3.0.0
+3.0.1
 
 The latest version can be downloaded from https://es-de.org
 
@@ -89,6 +89,7 @@ Emulators\mGBA\mGBA.exe
 Emulators\mupen64plus\mupen64plus-ui-console.exe
 Emulators\openMSX\openmsx.exe
 Emulators\Oricutron\oricutron.exe
+Emulators\Panda3DS\Alber.exe
 Emulators\PCSX2\pcsx2.exe
 Emulators\PCSX2-Qt\pcsx2-qt.exe
 Emulators\PICO-8\pico8.exe
diff --git a/resources/systems/android/es_find_rules.xml b/resources/systems/android/es_find_rules.xml
index d6b96b475..95489f795 100644
--- a/resources/systems/android/es_find_rules.xml
+++ b/resources/systems/android/es_find_rules.xml
@@ -243,6 +243,12 @@
             <entry>org.openbor.engine/.GameActivity</entry>
         </rule>
     </emulator>
+    <emulator name="PANDA3DS">
+        <!-- Nintendo 3DS emulator Panda3DS -->
+        <rule type="androidpackage">
+            <entry>com.panda3ds.pandroid/.app.MainActivity</entry>
+        </rule>
+    </emulator>
     <emulator name="PCE-EMU">
         <!-- NEC PC Engine/TurboGrafx-16 emulator PCE.emu -->
         <rule type="androidpackage">
diff --git a/resources/systems/android/es_systems.xml b/resources/systems/android/es_systems.xml
index 39273c081..db3bf5f0a 100644
--- a/resources/systems/android/es_systems.xml
+++ b/resources/systems/android/es_systems.xml
@@ -1042,6 +1042,7 @@
         <command label="Citra (Standalone)">%EMULATOR_CITRA% %ACTIVITY_CLEAR_TASK% %ACTIVITY_CLEAR_TOP% %DATA%=%ROMSAF%</command>
         <command label="Citra Canary (Standalone)">%EMULATOR_CITRA-CANARY% %ACTIVITY_CLEAR_TASK% %ACTIVITY_CLEAR_TOP% %DATA%=%ROMSAF%</command>
         <command label="Citra MMJ (Standalone)">%EMULATOR_CITRA-MMJ% %EXTRA_GamePath%=%ROM%</command>
+        <command label="Panda3DS (Standalone)">%EMULATOR_PANDA3DS% %DATA%=%ROMPROVIDER%</command>
         <platform>n3ds</platform>
         <theme>n3ds</theme>
     </system>
diff --git a/resources/systems/linux/es_find_rules.xml b/resources/systems/linux/es_find_rules.xml
index 5abdec6ed..15ba74de1 100644
--- a/resources/systems/linux/es_find_rules.xml
+++ b/resources/systems/linux/es_find_rules.xml
@@ -572,6 +572,18 @@
             <entry>~/bin/oricutron/Oricutron</entry>
         </rule>
     </emulator>
+    <emulator name="PANDA3DS">
+        <!-- Nintendo 3DS emulator Panda3DS -->
+        <rule type="systempath">
+            <entry>panda3ds</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/Alber-*.AppImage</entry>
+            <entry>~/.local/share/applications/Alber-*.AppImage</entry>
+            <entry>~/.local/bin/Alber-*.AppImage</entry>
+            <entry>~/bin/Alber-*.AppImage</entry>
+        </rule>
+    </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="systempath">
diff --git a/resources/systems/linux/es_systems.xml b/resources/systems/linux/es_systems.xml
index e6aff3600..e1dc2e15c 100644
--- a/resources/systems/linux/es_systems.xml
+++ b/resources/systems/linux/es_systems.xml
@@ -1187,6 +1187,7 @@
         <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command>
         <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM%</command>
         <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
+        <command label="Panda3DS (Standalone)">%EMULATOR_PANDA3DS% %ROM%</command>
         <platform>n3ds</platform>
         <theme>n3ds</theme>
     </system>
diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml
index e380cd234..93defbc37 100644
--- a/resources/systems/macos/es_find_rules.xml
+++ b/resources/systems/macos/es_find_rules.xml
@@ -209,6 +209,12 @@
             <entry>/Applications/Oricutron.app/Contents/MacOS/Oricutron</entry>
         </rule>
     </emulator>
+    <emulator name="PANDA3DS">
+        <!-- Nintendo 3DS emulator Panda3DS -->
+        <rule type="staticpath">
+            <entry>/Applications/Alber.app/Contents/MacOS/Alber</entry>
+        </rule>
+    </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="staticpath">
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 883ae122e..78f782345 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1136,6 +1136,7 @@
         <path>%ROMPATH%/n3ds</path>
         <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
         <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
+        <command label="Panda3DS (Standalone)">%EMULATOR_PANDA3DS% %ROM%</command>
         <platform>n3ds</platform>
         <theme>n3ds</theme>
     </system>
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 720af1086..acff84fc2 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -325,6 +325,12 @@
             <entry>~/bin/oricutron/Oricutron</entry>
         </rule>
     </emulator>
+    <emulator name="PANDA3DS">
+        <!-- Nintendo 3DS emulator Panda3DS -->
+        <rule type="systempath">
+            <entry>panda3ds</entry>
+        </rule>
+    </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index d9e135d17..42af3ad0f 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1171,6 +1171,7 @@
         <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM%</command>
         <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM%</command>
         <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
+        <command label="Panda3DS (Standalone)">%EMULATOR_PANDA3DS% %ROM%</command>
         <platform>n3ds</platform>
         <theme>n3ds</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 3d5f3c3cd..d441eb8f5 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -497,6 +497,16 @@
             <entry>%ESPATH%\..\Emulators\Oricutron\oricutron.exe</entry>
         </rule>
     </emulator>
+    <emulator name="PANDA3DS">
+        <!-- Nintendo 3DS emulator Panda3DS -->
+        <rule type="systempath">
+            <entry>Alber.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\Panda3DS\Alber.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Panda3DS\Alber.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 8ac0b9cfa..a16f8577c 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -330,6 +330,13 @@
             <entry>%ESPATH%\..\Emulators\Oricutron\oricutron.exe</entry>
         </rule>
     </emulator>
+    <emulator name="PANDA3DS">
+        <!-- Nintendo 3DS emulator Panda3DS -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\Panda3DS\Alber.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Panda3DS\Alber.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="PCSX2">
         <!-- Sony PlayStation 2 emulator PCSX2 -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index caa9ec28e..4ad0ca334 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1181,6 +1181,7 @@
         <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\citra_libretro.dll %ROM%</command>
         <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\citra2018_libretro.dll %ROM%</command>
         <command label="Citra (Standalone)">%EMULATOR_CITRA% %ROM%</command>
+        <command label="Panda3DS (Standalone)">%EMULATOR_PANDA3DS% %ROM%</command>
         <platform>n3ds</platform>
         <theme>n3ds</theme>
     </system>