diff --git a/static/build/Icons/Default/rapp/beetlepce.png b/static/build/Icons/Default/rapp/beetlepce.png
new file mode 100644
index 0000000000..ac3feb71c9
Binary files /dev/null and b/static/build/Icons/Default/rapp/beetlepce.png differ
diff --git a/static/build/Icons/Default/rapp/caprice32.png b/static/build/Icons/Default/rapp/caprice32.png
new file mode 100644
index 0000000000..434977b79f
Binary files /dev/null and b/static/build/Icons/Default/rapp/caprice32.png differ
diff --git a/static/build/Icons/Default/rapp/frodo.png b/static/build/Icons/Default/rapp/frodo.png
new file mode 100644
index 0000000000..4721ff020d
Binary files /dev/null and b/static/build/Icons/Default/rapp/frodo.png differ
diff --git a/static/build/Icons/Default/rapp/gngeo.png b/static/build/Icons/Default/rapp/gngeo.png
new file mode 100644
index 0000000000..aca43a78cf
Binary files /dev/null and b/static/build/Icons/Default/rapp/gngeo.png differ
diff --git a/static/build/Icons/Default/rapp/lowresnx.png b/static/build/Icons/Default/rapp/lowresnx.png
new file mode 100644
index 0000000000..643490e17a
Binary files /dev/null and b/static/build/Icons/Default/rapp/lowresnx.png differ
diff --git a/static/build/Icons/Default/rapp/puae-xtreme.png b/static/build/Icons/Default/rapp/puae-xtreme.png
new file mode 100644
index 0000000000..b955a47d48
Binary files /dev/null and b/static/build/Icons/Default/rapp/puae-xtreme.png differ
diff --git a/static/build/Icons/Default/rapp/puzzlescript.png b/static/build/Icons/Default/rapp/puzzlescript.png
new file mode 100644
index 0000000000..db2dccae0c
Binary files /dev/null and b/static/build/Icons/Default/rapp/puzzlescript.png differ
diff --git a/static/build/Icons/Default/rapp/swanstation.png b/static/build/Icons/Default/rapp/swanstation.png
new file mode 100644
index 0000000000..f6deba6b0b
Binary files /dev/null and b/static/build/Icons/Default/rapp/swanstation.png differ
diff --git a/static/build/RetroArch/.crocods/crocods.ini b/static/build/RetroArch/.crocods/crocods.ini
deleted file mode 100644
index e970d37ab7..0000000000
--- a/static/build/RetroArch/.crocods/crocods.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# CrocoDS ini file
-#
-
diff --git a/static/build/RetroArch/.retroarch/cores/chailove_libretro.info b/static/build/RetroArch/.retroarch/cores/chailove_libretro.info
index a344742bf7..68ebccb8ad 100644
--- a/static/build/RetroArch/.retroarch/cores/chailove_libretro.info
+++ b/static/build/RetroArch/.retroarch/cores/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"
@@ -18,10 +18,10 @@ database = "ChaiLove"
 supports_no_game = "false"
 savestate = "true"
 savestate_features = "serialized"
-cheats = "false"
+cheats = "true"
 input_descriptors = "true"
 memory_descriptors = "false"
-libretro_saves = "false"
+libretro_saves = "true"
 core_options = "true"
 core_options_version = "1.0"
 load_subsystem = "false"
diff --git a/static/build/RetroArch/.retroarch/cores/chailove_libretro.so b/static/build/RetroArch/.retroarch/cores/chailove_libretro.so
index 7ce7465df5..6f8fdbe377 100644
Binary files a/static/build/RetroArch/.retroarch/cores/chailove_libretro.so and b/static/build/RetroArch/.retroarch/cores/chailove_libretro.so differ
diff --git a/static/build/RetroArch/.retroarch/cores/crocods_libretro.so b/static/build/RetroArch/.retroarch/cores/crocods_libretro.so
index 1607941f35..c2efd6821c 100644
Binary files a/static/build/RetroArch/.retroarch/cores/crocods_libretro.so and b/static/build/RetroArch/.retroarch/cores/crocods_libretro.so differ
diff --git a/static/build/RetroArch/.retroarch/cores/km_duckswanstation_xtreme_amped_libretro.info b/static/build/RetroArch/.retroarch/cores/km_duckswanstation_xtreme_amped_libretro.info
new file mode 100644
index 0000000000..4451763186
--- /dev/null
+++ b/static/build/RetroArch/.retroarch/cores/km_duckswanstation_xtreme_amped_libretro.info
@@ -0,0 +1,46 @@
+# Software Information
+display_name = "Sony - PSX (km_DuckSwanStation Xtreme Amped)"
+authors = "stenzek"
+supported_extensions = "exe|psexe|cue|bin|img|iso|chd|pbp|ecm|mds|psf|m3u"
+corename = "DuckSwanStation Xtreme Amped"
+categories = "Emulator"
+license = "GPLv3"
+permissions = ""
+
+# Hardware Information
+manufacturer = "Sony"
+systemname = "PlayStation"
+systemid = "playstation"
+
+# Libretro Features
+database = "Sony - PlayStation"
+display_version = "v0.1"
+supports_no_game = "false"
+hw_render = "true"
+required_hw_api = "OpenGL >= 3.0 | OpenGL Core >= 3.1 | Vulkan >= 1.0 | Direct3D >= 11.0"
+is_experimental = "false"
+savestate = "true"
+savestate_features = "serialized"
+input_descriptors = "true"
+disk_control = "true"
+
+# BIOS / Firmware
+firmware_count = 5
+firmware0_desc = "psxonpsp660.bin (PSP PS1 BIOS)"
+firmware0_path = "psxonpsp660.bin"
+firmware0_opt = "true"
+firmware1_desc = "scph5500.bin (PS1 JP BIOS)"
+firmware1_path = "scph5500.bin"
+firmware1_opt = "true"
+firmware2_desc = "scph5501.bin (PS1 US BIOS)"
+firmware2_path = "scph5501.bin"
+firmware2_opt = "true"
+firmware3_desc = "scph5502.bin (PS1 EU BIOS)"
+firmware3_path = "scph5502.bin"
+firmware3_opt = "true"
+firmware4_desc = "ps1_rom.bin (PS3 PS1 BIOS)"
+firmware4_path = "ps1_rom.bin"
+firmware4_opt = "true"
+notes = "(!) psxonpsp660.bin (md5): c53ca5908936d412331790f4426c6c33|(!) scph5500.bin (md5): 8dd7d5296a650fac7319bce665a6a53c|(!) scph5501.bin (md5): 490f666e1afb15b7362b406ed1cea246|(!) scph5502.bin (md5): 32736f17079d0b2b7024407c39bd3050||(!) ps1_rom.bin (md5): 81bbe60ba7a3d1cea1d48c14cbcc647b| This core also supports No-Intro BIOS images."
+
+description = "SwanStation is a fork of the Duckstation PlayStation 1 (aka PSX) emulator focusing on playability, speed, and long-term maintainability ported to libretro. A 'BIOS' ROM image is required to start the emulator and to play games. SwanStation includes hardware rendering (OpenGL, Vulkan and D3D11), upscaling, 24-bit color, and a dynamic recompiler (x86-64, ARMv7, AArch64)."
diff --git a/static/build/RetroArch/.retroarch/cores/km_duckswanstation_xtreme_amped_libretro.so b/static/build/RetroArch/.retroarch/cores/km_duckswanstation_xtreme_amped_libretro.so
new file mode 100644
index 0000000000..c72732708e
Binary files /dev/null and b/static/build/RetroArch/.retroarch/cores/km_duckswanstation_xtreme_amped_libretro.so differ
diff --git a/static/build/RetroArch/.retroarch/cores/km_puae_xtreme_amped_libretro.info b/static/build/RetroArch/.retroarch/cores/km_puae_xtreme_amped_libretro.info
new file mode 100644
index 0000000000..a381215dda
--- /dev/null
+++ b/static/build/RetroArch/.retroarch/cores/km_puae_xtreme_amped_libretro.info
@@ -0,0 +1,47 @@
+display_name = "Amiga - (km_P-UAE Xtreme Amped)"
+authors = "GnoStiC"
+supported_extensions = "adf|adz|dms|fdi|ipf|hdf|hdz|lha|cue|ccd|nrg|mds|iso|uae|m3u|zip"
+corename = "P-UAE Xtreme Amped"
+manufacturer = "Commodore"
+categories = "Emulator"
+systemname = "Commodore Amiga"
+systemid = "amiga"
+license = "GPLv2"
+permissions = ""
+display_version = "v2.6.1"
+supports_no_game = "false"
+firmware_count = 11
+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"
+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"
+firmware4_opt = "true"
+firmware5_desc = "kick40060.CD32.ext (Amiga CD32 Extended BIOS, CD32 Extended ROM Rev. 40.060)"
+firmware5_path = "kick40060.CD32.ext"
+firmware5_opt = "true"
+firmware6_desc = "drive_click_LOUD.wav (floppy drive sound)"
+firmware6_path = "uae_data/drive_click_LOUD.wav"
+firmware6_opt = "true"
+firmware7_desc = "drive_snatch_LOUD.wav (floppy drive sound)"
+firmware7_path = "uae_data/drive_snatch_LOUD.wav"
+firmware7_opt = "true"
+firmware8_desc = "drive_spin_LOUD.wav (floppy drive sound)"
+firmware8_path = "uae_data/drive_spin_LOUD.wav"
+firmware8_opt = "true"
+firmware9_desc = "drive_spinnd_LOUD.wav (floppy drive sound)"
+firmware9_path = "uae_data/drive_spinnd_LOUD.wav"
+firmware9_opt = "true"
+firmware10_desc = "drive_startup_LOUD.wav (floppy drive sound)"
+firmware10_path = "uae_data/drive_startup_LOUD.wav"
+firmware10_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"
diff --git a/static/build/RetroArch/.retroarch/cores/km_puae_xtreme_amped_libretro.so b/static/build/RetroArch/.retroarch/cores/km_puae_xtreme_amped_libretro.so
new file mode 100644
index 0000000000..773667cd51
Binary files /dev/null and b/static/build/RetroArch/.retroarch/cores/km_puae_xtreme_amped_libretro.so differ
diff --git a/static/build/RetroArch/.retroarch/cores/km_superbroswar_libretro.info b/static/build/RetroArch/.retroarch/cores/km_superbroswar_libretro.info
new file mode 100644
index 0000000000..a66959a70c
--- /dev/null
+++ b/static/build/RetroArch/.retroarch/cores/km_superbroswar_libretro.info
@@ -0,0 +1,24 @@
+display_name = "Super Bros War (km_Super Bros War)"
+categories = "Game engine"
+authors = "Philippe Simons"
+corename = "superbroswar"
+supported_extensions = "game"
+license = "GPLv2"
+display_version = "v0.1"
+systemid = "superbroswar"
+
+savestate = "false"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "false"
+core_options_version = "1.0"
+load_subsystem = "false"
+supports_no_game = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "false"
+is_experimental = "false"
+
+description = "A fan-made multiplayer style deathmatch game."
\ No newline at end of file
diff --git a/static/build/RetroArch/.retroarch/cores/km_superbroswar_libretro.so b/static/build/RetroArch/.retroarch/cores/km_superbroswar_libretro.so
new file mode 100644
index 0000000000..b01da60043
Binary files /dev/null and b/static/build/RetroArch/.retroarch/cores/km_superbroswar_libretro.so differ
diff --git a/static/build/RetroArch/.retroarch/cores/lutro_libretro.so b/static/build/RetroArch/.retroarch/cores/lutro_libretro.so
index b21b5b17b0..59cbe475cf 100644
Binary files a/static/build/RetroArch/.retroarch/cores/lutro_libretro.so and b/static/build/RetroArch/.retroarch/cores/lutro_libretro.so differ
diff --git a/static/build/RetroArch/.retroarch/cores/puzzlescript_libretro.info b/static/build/RetroArch/.retroarch/cores/puzzlescript_libretro.info
new file mode 100644
index 0000000000..7276154a1f
--- /dev/null
+++ b/static/build/RetroArch/.retroarch/cores/puzzlescript_libretro.info
@@ -0,0 +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"
diff --git a/static/build/RetroArch/.retroarch/cores/puzzlescript_libretro.so b/static/build/RetroArch/.retroarch/cores/puzzlescript_libretro.so
new file mode 100644
index 0000000000..a95d36f790
Binary files /dev/null and b/static/build/RetroArch/.retroarch/cores/puzzlescript_libretro.so differ
diff --git a/static/configs/Saves/CurrentProfile/config/Beetle PCE/Beetle PCE.cfg b/static/configs/Saves/CurrentProfile/config/Beetle PCE/Beetle PCE.cfg
new file mode 100644
index 0000000000..e701464227
--- /dev/null
+++ b/static/configs/Saves/CurrentProfile/config/Beetle PCE/Beetle PCE.cfg	
@@ -0,0 +1 @@
+video_dingux_ipu_keep_aspect = "true"
diff --git a/static/configs/Saves/CurrentProfile/config/Beetle PCE/Beetle PCE.opt b/static/configs/Saves/CurrentProfile/config/Beetle PCE/Beetle PCE.opt
new file mode 100644
index 0000000000..df1b4ae477
--- /dev/null
+++ b/static/configs/Saves/CurrentProfile/config/Beetle PCE/Beetle PCE.opt	
@@ -0,0 +1,25 @@
+pce_adpcmvolume = "100"
+pce_cddavolume = "100"
+pce_cdpsgvolume = "100"
+pce_cdspeed = "1"
+pce_disable_softreset = "disabled"
+pce_fast_cdbios = "System Card 3"
+pce_fast_cdimagecache = "disabled"
+pce_fast_frameskip = "disabled"
+pce_fast_frameskip_threshold = "33"
+pce_fast_palette = "RGB"
+pce_hoverscan = "352"
+pce_initial_scanline = "3"
+pce_last_scanline = "242"
+pce_mouse_sensitivity = "1.25"
+pce_nospritelimit = "disabled"
+pce_ocmultiplier = "1"
+pce_sound_channel_0_volume = "100"
+pce_sound_channel_1_volume = "100"
+pce_sound_channel_2_volume = "100"
+pce_sound_channel_3_volume = "100"
+pce_sound_channel_4_volume = "100"
+pce_sound_channel_5_volume = "100"
+pce_turbo_delay = "3"
+pce_turbo_toggle_hotkey = "disabled"
+pce_turbo_toggling = "disabled"
diff --git a/static/configs/Saves/CurrentProfile/config/P-UAE Xtreme Amped/P-UAE Xtreme Amped.opt b/static/configs/Saves/CurrentProfile/config/P-UAE Xtreme Amped/P-UAE Xtreme Amped.opt
new file mode 100644
index 0000000000..5581850c20
--- /dev/null
+++ b/static/configs/Saves/CurrentProfile/config/P-UAE Xtreme Amped/P-UAE Xtreme Amped.opt	
@@ -0,0 +1,111 @@
+puae_analogmouse = "both"
+puae_analogmouse_deadzone = "20"
+puae_analogmouse_speed = "1.0"
+puae_audio_options_display = "enabled"
+puae_autoloadfastforward = "disabled"
+puae_bogomem_size = "auto"
+puae_cart_file = "none"
+puae_cd32pad_options = "disabled"
+puae_cd_speed = "0"
+puae_cd_startup_delayed_insert = "disabled"
+puae_chipmem_size = "auto"
+puae_collision_level = "playfields"
+puae_cpu_compatibility = "normal"
+puae_cpu_model = "auto"
+puae_cpu_multiplier = "0"
+puae_cpu_throttle = "0.0"
+puae_crop = "auto"
+puae_crop_mode = "both"
+puae_dpadmouse_speed = "6"
+puae_fastmem_size = "auto"
+puae_floppy_multidrive = "enabled"
+puae_floppy_sound = "80"
+puae_floppy_sound_empty_mute = "disabled"
+puae_floppy_sound_type = "internal"
+puae_floppy_speed = "0"
+puae_floppy_write_protection = "disabled"
+puae_fpu_model = "auto"
+puae_gfx_colors = "16bit"
+puae_gfx_flickerfixer = "disabled"
+puae_gfx_framerate = "disabled"
+puae_gfx_gamma = "0"
+puae_horizontal_pos = "auto"
+puae_immediate_blits = "waiting"
+puae_joyport = "joystick"
+puae_joyport_order = "1234"
+puae_keyrah_keypad_mappings = "disabled"
+puae_kickstart = "auto"
+puae_mapper_a = "---"
+puae_mapper_aspect_ratio_toggle = "---"
+puae_mapper_b = "---"
+puae_mapper_crop_toggle = "RETROK_F9"
+puae_mapper_down = "---"
+puae_mapper_l = "TOGGLE_STATUSBAR"
+puae_mapper_l2 = "MOUSE_LEFT_BUTTON"
+puae_mapper_l3 = "---"
+puae_mapper_ld = "---"
+puae_mapper_left = "---"
+puae_mapper_ll = "---"
+puae_mapper_lr = "---"
+puae_mapper_lu = "---"
+puae_mapper_mouse_toggle = "RETROK_F12"
+puae_mapper_r = "SWITCH_JOYMOUSE"
+puae_mapper_r2 = "MOUSE_RIGHT_BUTTON"
+puae_mapper_r3 = "---"
+puae_mapper_rd = "---"
+puae_mapper_reset = "---"
+puae_mapper_right = "---"
+puae_mapper_rl = "---"
+puae_mapper_rr = "---"
+puae_mapper_ru = "---"
+puae_mapper_save_disk_toggle = "---"
+puae_mapper_select = "TOGGLE_VKBD"
+puae_mapper_start = "RETROK_F9"
+puae_mapper_statusbar = "RETROK_F11"
+puae_mapper_turbo_fire_toggle = "---"
+puae_mapper_up = "---"
+puae_mapper_vkbd = "RETROK_F10"
+puae_mapper_x = "---"
+puae_mapper_y = "---"
+puae_mapper_zoom_mode_toggle = "---"
+puae_mapping_options_display = "enabled"
+puae_model = "auto"
+puae_model_cd = "CD32"
+puae_model_fd = "A500"
+puae_model_hd = "A600"
+puae_model_options_display = "disabled"
+puae_mouse_speed = "100"
+puae_multimouse = "disabled"
+puae_physical_keyboard_pass_through = "disabled"
+puae_physicalmouse = "enabled"
+puae_retropad_options = "disabled"
+puae_shared_nvram = "disabled"
+puae_sound_filter = "emulated"
+puae_sound_filter_type = "auto"
+puae_sound_interpol = "anti"
+puae_sound_stereo_separation = "100%"
+puae_sound_volume_cd = "100%"
+puae_statusbar = "bottom"
+puae_statusbar_messages = "disabled"
+puae_turbo_fire = "disabled"
+puae_turbo_fire_button = "B"
+puae_turbo_pulse = "6"
+puae_use_boot_hd = "disabled"
+puae_use_whdload = "files"
+puae_use_whdload_prefs = "disabled"
+puae_use_whdload_theme = "default"
+puae_vertical_pos = "auto"
+puae_video_allow_hz_change = "enabled"
+puae_video_aspect = "auto"
+puae_video_options_display = "enabled"
+puae_video_resolution = "auto"
+puae_video_standard = "PAL auto"
+puae_video_vresolution = "auto"
+puae_vkbd_alpha = "20%"
+puae_vkbd_dimming = "25%"
+puae_vkbd_theme = "auto"
+puae_vkbd_transparency = "25%"
+puae_xtreme_cpu_throttle = "-300.0"
+puae_z3mem_size = "auto"
+puae_zoom_mode = "auto"
+puae_zoom_mode_crop = "both"
diff --git a/static/configs/Saves/CurrentProfile/config/VICE Xtreme x64/VICE Xtreme x64.opt b/static/configs/Saves/CurrentProfile/config/VICE x64/VICE x64.opt
similarity index 100%
rename from static/configs/Saves/CurrentProfile/config/VICE Xtreme x64/VICE Xtreme x64.opt
rename to static/configs/Saves/CurrentProfile/config/VICE x64/VICE x64.opt
diff --git a/static/configs/Saves/CurrentProfile/config/lutro/cpuclock.txt b/static/configs/Saves/CurrentProfile/config/lutro/cpuclock.txt
new file mode 100644
index 0000000000..f5624aeaec
--- /dev/null
+++ b/static/configs/Saves/CurrentProfile/config/lutro/cpuclock.txt
@@ -0,0 +1 @@
+1600
\ No newline at end of file
diff --git a/static/configs/Saves/CurrentProfile/config/remaps/cap32/cap32.rmp b/static/configs/Saves/CurrentProfile/config/remaps/cap32/cap32.rmp
new file mode 100644
index 0000000000..d54ac36bea
--- /dev/null
+++ b/static/configs/Saves/CurrentProfile/config/remaps/cap32/cap32.rmp
@@ -0,0 +1,3 @@
+input_libretro_device_p1 = "513"
+input_player1_analog_dpad_mode = "0"
+input_remap_port_p1 = "0"
diff --git a/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/2048.png b/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/2048.png
index 07a694e968..aebbd2ec35 100644
Binary files a/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/2048.png and b/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/2048.png differ
diff --git a/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/Bomberman (mr.boom).png b/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/Bomberman (mr.boom).png
index 7f78cce58a..094441c595 100644
Binary files a/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/Bomberman (mr.boom).png and b/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/Bomberman (mr.boom).png differ
diff --git a/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/Pong (Gong).png b/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/Pong (Gong).png
new file mode 100644
index 0000000000..d4498c0e30
Binary files /dev/null and b/static/packages/Emu/Ports Collection/Roms/PORTS/Imgs/Pong (Gong).png differ
diff --git a/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/2048.pdf b/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/2048.pdf
index cb6362bbb9..05fd99e8f1 100644
Binary files a/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/2048.pdf and b/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/2048.pdf differ
diff --git a/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/Bomberman (mr.boom).pdf b/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/Bomberman (mr.boom).pdf
index 89545c6b1d..69c403e41b 100644
Binary files a/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/Bomberman (mr.boom).pdf and b/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/Bomberman (mr.boom).pdf differ
diff --git a/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/Pong (Gong).pdf b/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/Pong (Gong).pdf
new file mode 100644
index 0000000000..c41b3cfb6e
Binary files /dev/null and b/static/packages/Emu/Ports Collection/Roms/PORTS/Manuals/Pong (Gong).pdf differ
diff --git a/static/packages/Emu/Ports Collection/Roms/PORTS/Shortcuts/Action/Pong (Gong).notfound b/static/packages/Emu/Ports Collection/Roms/PORTS/Shortcuts/Action/Pong (Gong).notfound
new file mode 100644
index 0000000000..3c90dd1b29
--- /dev/null
+++ b/static/packages/Emu/Ports Collection/Roms/PORTS/Shortcuts/Action/Pong (Gong).notfound	
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Retroarch Ports Script Template
+
+# main configuration :
+GameName="Pong (Port - Gong)"
+Core="gong"
+RomDir=
+RomFile=
+KillAudioserver=0
+PerformanceMode=0
+
+# additional configuration
+KillAudioserver=0
+PerformanceMode=0
+
+# specific to this port :
+Arguments=""
+
+# running command line :
+/mnt/SDCARD/Emu/PORTS/launch_retroarch.sh "$GameName" "$Core" "$RomDir" "$RomFile" "$Arguments" "$KillAudioserver" "$PerformanceMode"
+
+
diff --git a/static/packages/RApp/Amstrad - CPC (Caprice32)/RApp/CPC/config.json b/static/packages/RApp/Amstrad - CPC (Caprice32)/RApp/CPC/config.json
new file mode 100644
index 0000000000..af66178e6b
--- /dev/null
+++ b/static/packages/RApp/Amstrad - CPC (Caprice32)/RApp/CPC/config.json	
@@ -0,0 +1,13 @@
+{
+"label":"Caprice32",
+"icon":"../../Icons/Default/rapp/caprice32.png",
+"iconsel":"../../Icons/Default/rapp/caprice32.png",
+"launch":"launch.sh",
+"rompath":"../../Roms/CPC",
+"imgpath":"../../Roms/CPC/Imgs",
+"gamelist":"../../Roms/CPC/miyoogamelist.xml",
+"useswap":1,
+"shortname":0,
+"hidebios":1,
+"extlist":"sna|dsk|kcr|bin|zip|7z"
+}
\ No newline at end of file
diff --git a/static/packages/RApp/Amstrad - CPC (Caprice32)/RApp/CPC/launch.sh b/static/packages/RApp/Amstrad - CPC (Caprice32)/RApp/CPC/launch.sh
new file mode 100644
index 0000000000..5e62c021e2
--- /dev/null
+++ b/static/packages/RApp/Amstrad - CPC (Caprice32)/RApp/CPC/launch.sh	
@@ -0,0 +1,7 @@
+#!/bin/sh
+echo $0 $*
+progdir=`dirname "$0"`
+homedir=`dirname "$1"`
+
+cd /mnt/SDCARD/RetroArch/
+HOME=/mnt/SDCARD/RetroArch/ $progdir/../../RetroArch/retroarch -v -L $progdir/../../RetroArch/.retroarch/cores/cap32_libretro.so "$1"
diff --git a/static/packages/RApp/Amstrad - CPC (Caprice32)/Roms/CPC/.gitkeep b/static/packages/RApp/Amstrad - CPC (Caprice32)/Roms/CPC/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/static/packages/RApp/Commodore - Amiga (PUAE 2021 xtreme)/RApp/puae-xtreme/config.json b/static/packages/RApp/Commodore - Amiga (PUAE 2021 xtreme)/RApp/puae-xtreme/config.json
new file mode 100644
index 0000000000..b0579e38b3
--- /dev/null
+++ b/static/packages/RApp/Commodore - Amiga (PUAE 2021 xtreme)/RApp/puae-xtreme/config.json	
@@ -0,0 +1,13 @@
+{
+"label":"PUAE-xtreme",
+"icon":"../../Icons/Default/rapp/puae-xtreme.png",
+"iconsel":"../../Icons/Default/rapp/puae-xtreme.png",
+"launch":"launch.sh",
+"rompath":"../../Roms/AMIGA",
+"imgpath":"../../Roms/AMIGA/Imgs",
+"gamelist":"../../Roms/AMIGA/miyoogamelist.xml",
+"useswap":0,
+"shortname":0,
+"hidebios":1,
+"extlist":"adf|adz|dms|fdi|ipf|hdf|hdz|lha|slave|info|cue|ccd|nrg|mds|iso|chd|uae|m3u|zip|7z|rp9"
+}
\ No newline at end of file
diff --git a/static/packages/RApp/Commodore - Amiga (PUAE 2021 xtreme)/RApp/puae-xtreme/launch.sh b/static/packages/RApp/Commodore - Amiga (PUAE 2021 xtreme)/RApp/puae-xtreme/launch.sh
new file mode 100644
index 0000000000..b5faf4763c
--- /dev/null
+++ b/static/packages/RApp/Commodore - Amiga (PUAE 2021 xtreme)/RApp/puae-xtreme/launch.sh	
@@ -0,0 +1,7 @@
+#!/bin/sh
+echo $0 $*
+progdir=`dirname "$0"`
+homedir=`dirname "$1"`
+
+cd /mnt/SDCARD/RetroArch/
+HOME=/mnt/SDCARD/RetroArch/ $progdir/../../RetroArch/retroarch -v -L $progdir/../../RetroArch/.retroarch/cores/km_puae_xtreme_amped_libretro.so "$1"
diff --git a/static/packages/RApp/Commodore - Amiga (PUAE 2021 xtreme)/Roms/AMIGA/.gitkeep b/static/packages/RApp/Commodore - Amiga (PUAE 2021 xtreme)/Roms/AMIGA/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/static/packages/RApp/Commodore - C64 (Frodo)/RApp/frodo/config.json b/static/packages/RApp/Commodore - C64 (Frodo)/RApp/frodo/config.json
new file mode 100644
index 0000000000..4e7d63b685
--- /dev/null
+++ b/static/packages/RApp/Commodore - C64 (Frodo)/RApp/frodo/config.json	
@@ -0,0 +1,12 @@
+{
+"label":"Frodo",
+"icon":"../../Icons/Default/rapp/frodo.png",
+"iconsel":"../../Icons/Default/rapp/frodo.png",
+"launch":"launch.sh",
+"rompath":"../../Roms/COMMODORE",
+"imgpath":"../../Roms/COMMODORE/Imgs",
+"useswap":0,
+"shortname":0,
+"hidebios":0,
+"extlist":"d64|t64|x64|p00|lnx|zip"
+}
diff --git a/static/packages/RApp/Commodore - C64 (Frodo)/RApp/frodo/launch.sh b/static/packages/RApp/Commodore - C64 (Frodo)/RApp/frodo/launch.sh
new file mode 100644
index 0000000000..3aa462cb45
--- /dev/null
+++ b/static/packages/RApp/Commodore - C64 (Frodo)/RApp/frodo/launch.sh	
@@ -0,0 +1,7 @@
+#!/bin/sh
+echo $0 $*
+progdir=`dirname "$0"`
+homedir=`dirname "$1"`
+
+cd /mnt/SDCARD/RetroArch/
+HOME=/mnt/SDCARD/RetroArch/ $progdir/../../RetroArch/retroarch -v -L $progdir/../../RetroArch/.retroarch/cores/frodo_libretro.so "$1"
diff --git a/static/packages/RApp/Commodore - C64 (Frodo)/Roms/COMMODORE/.gitkeep b/static/packages/RApp/Commodore - C64 (Frodo)/Roms/COMMODORE/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/static/packages/RApp/Game engine - LowRes NX (LowRes NX)/RApp/lowresnx/config.json b/static/packages/RApp/Game engine - LowRes NX (LowRes NX)/RApp/lowresnx/config.json
new file mode 100644
index 0000000000..23901d529a
--- /dev/null
+++ b/static/packages/RApp/Game engine - LowRes NX (LowRes NX)/RApp/lowresnx/config.json	
@@ -0,0 +1,12 @@
+{
+"label":"LowRes NX",
+"icon":"../../Icons/Default/rapp/lowresnx.png",
+"iconsel":"../../Icons/Default/rapp/lowresnx.png",
+"launch":"launch.sh",
+"rompath":"../../Roms/LOWRESNX",
+"imgpath":"../../Roms/LOWRESNX/Imgs",
+"useswap":0,
+"shortname":1,
+"hidebios":0,
+"extlist":"nx|zip|7z"
+}
\ No newline at end of file
diff --git a/static/packages/RApp/Game engine - LowRes NX (LowRes NX)/RApp/lowresnx/launch.sh b/static/packages/RApp/Game engine - LowRes NX (LowRes NX)/RApp/lowresnx/launch.sh
new file mode 100644
index 0000000000..e473b2c312
--- /dev/null
+++ b/static/packages/RApp/Game engine - LowRes NX (LowRes NX)/RApp/lowresnx/launch.sh	
@@ -0,0 +1,7 @@
+#!/bin/sh
+echo $0 $*
+progdir=`dirname "$0"`
+homedir=`dirname "$1"`
+
+cd /mnt/SDCARD/RetroArch/
+HOME=/mnt/SDCARD/RetroArch/ $progdir/../../RetroArch/retroarch -v -L $progdir/../../RetroArch/.retroarch/cores/lowresnx_libretro.so "$1"
diff --git a/static/packages/RApp/Game engine - LowRes NX (LowRes NX)/Roms/LOWRESNX/.gitkeep b/static/packages/RApp/Game engine - LowRes NX (LowRes NX)/Roms/LOWRESNX/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/static/packages/RApp/Game engine - PuzzleScript (PuzzleScript)/RApp/PuzzleScript/config.json b/static/packages/RApp/Game engine - PuzzleScript (PuzzleScript)/RApp/PuzzleScript/config.json
new file mode 100644
index 0000000000..768ca94ac0
--- /dev/null
+++ b/static/packages/RApp/Game engine - PuzzleScript (PuzzleScript)/RApp/PuzzleScript/config.json	
@@ -0,0 +1,12 @@
+{
+	"label":	"PuzzleScript",
+	"icon":	"/mnt/SDCARD/Icons/Default/rapp/puzzlescript.png",
+	"launch":	"launch.sh",
+	"rompath":	"../../Roms/PUZZLE",
+	"imgpath":	"../../Roms/PUZZLE",
+	"gamelist":	"../../Roms/PUZZLE/miyoogamelist.xml",
+	"useswap":	0,
+	"shortname":	1,
+	"hidebios":	1,
+	"extlist":	"pz"
+}
\ No newline at end of file
diff --git a/static/packages/RApp/Game engine - PuzzleScript (PuzzleScript)/RApp/PuzzleScript/launch.sh b/static/packages/RApp/Game engine - PuzzleScript (PuzzleScript)/RApp/PuzzleScript/launch.sh
new file mode 100644
index 0000000000..96f61f6348
--- /dev/null
+++ b/static/packages/RApp/Game engine - PuzzleScript (PuzzleScript)/RApp/PuzzleScript/launch.sh	
@@ -0,0 +1,8 @@
+#!/bin/sh
+echo $0 $*
+progdir=`dirname "$0"`
+homedir=`dirname "$1"`
+
+
+cd /mnt/SDCARD/RetroArch/
+HOME=/mnt/SDCARD/RetroArch/ $progdir/../../RetroArch/retroarch -v -L $progdir/../../RetroArch/.retroarch/cores/puzzlescript_libretro.so "$1"
diff --git a/static/packages/RApp/Game engine - PuzzleScript (PuzzleScript)/Roms/PUZZLE/.gitkeep b/static/packages/RApp/Game engine - PuzzleScript (PuzzleScript)/Roms/PUZZLE/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/static/packages/RApp/NEC - TurboGrafx-16 (Beetle PCE)/RApp/beetlepce/config.json b/static/packages/RApp/NEC - TurboGrafx-16 (Beetle PCE)/RApp/beetlepce/config.json
new file mode 100644
index 0000000000..1800545755
--- /dev/null
+++ b/static/packages/RApp/NEC - TurboGrafx-16 (Beetle PCE)/RApp/beetlepce/config.json	
@@ -0,0 +1,13 @@
+{
+"label":"Beetle PCE",
+"icon":"../../Icons/Default/rapp/beetlepce.png",
+"iconsel":"../../Icons/Default/rapp/beetlepce.png",
+"launch":"launch.sh",
+"rompath":"../../Roms/PCE",
+"imgpath":"../../Roms/PCE/Imgs",
+"gamelist":"../../Roms/PCE/miyoogamelist.xml",
+"useswap":1,
+"shortname":0,
+"hidebios":0,
+"extlist":"pce|ccd|iso|img|chd|cue|zip|7z"
+}
diff --git a/static/packages/RApp/NEC - TurboGrafx-16 (Beetle PCE)/RApp/beetlepce/launch.sh b/static/packages/RApp/NEC - TurboGrafx-16 (Beetle PCE)/RApp/beetlepce/launch.sh
new file mode 100644
index 0000000000..50e363d318
--- /dev/null
+++ b/static/packages/RApp/NEC - TurboGrafx-16 (Beetle PCE)/RApp/beetlepce/launch.sh	
@@ -0,0 +1,13 @@
+#!/bin/sh
+echo $0 $*
+progdir=`dirname "$0"`
+homedir=`dirname "$1"`
+
+if [ "$(cat /tmp/deviceModel)" = "283" ]; then
+	echo -n 1600 >"/mnt/SDCARD/Saves/CurrentProfile/config/Beetle PCE/cpuclock.txt" #  Miyoo Mini
+else
+	echo -n 1900 >"/mnt/SDCARD/Saves/CurrentProfile/config/Beetle PCE/cpuclock.txt" #  Miyoo Mini Plus
+fi
+
+cd /mnt/SDCARD/RetroArch/
+HOME=/mnt/SDCARD/RetroArch/ $progdir/../../RetroArch/retroarch -v -L $progdir/../../RetroArch/.retroarch/cores/mednafen_pce_libretro.so "$1"
diff --git a/static/packages/RApp/NEC - TurboGrafx-16 (Beetle PCE)/Roms/PCE/.gitkeep b/static/packages/RApp/NEC - TurboGrafx-16 (Beetle PCE)/Roms/PCE/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/config.json b/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/config.json
new file mode 100644
index 0000000000..0534514c2c
--- /dev/null
+++ b/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/config.json	
@@ -0,0 +1,12 @@
+{
+    "label": "GnGeo",
+    "icon": "../../Icons/Default/rapp/gngeo.png",
+    "iconsel": "../../Icons/Default/rapp/gngeo.png",
+    "launch": "launch.sh",
+    "rompath": "../../Roms/GNGEO",
+    "imgpath": "../../Roms/GNGEO/Imgs",
+    "useswap": 1,
+    "shortname": 1,
+    "hidebios": 1,
+    "extlist": "gno"
+}
\ No newline at end of file
diff --git a/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/gngeo b/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/gngeo
new file mode 100644
index 0000000000..0dee06bf21
Binary files /dev/null and b/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/gngeo differ
diff --git a/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/launch.sh b/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/launch.sh
new file mode 100644
index 0000000000..263fdec599
--- /dev/null
+++ b/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/launch.sh	
@@ -0,0 +1,10 @@
+#!/bin/sh
+echo $0 $*
+progdir=`dirname "$0"`
+homedir=`dirname "$1"`
+
+cd "$progdir"
+
+export LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
+
+HOME=/mnt/SDCARD/Saves/CurrentProfile/states ./gngeo --rompath=/mnt/SDCARD/BIOS "$1"
diff --git a/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/libSDL-1.2.so.0 b/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/libSDL-1.2.so.0
new file mode 100644
index 0000000000..b15d395fff
Binary files /dev/null and b/static/packages/RApp/SNK - Neo Geo (GnGeo)/RApp/gngeo/libSDL-1.2.so.0 differ
diff --git a/static/packages/RApp/SNK - Neo Geo (GnGeo)/Roms/GNGEO/.gitkeep b/static/packages/RApp/SNK - Neo Geo (GnGeo)/Roms/GNGEO/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/static/packages/RApp/Sony - PlayStation (SwanStation)/RApp/swanstation/config.json b/static/packages/RApp/Sony - PlayStation (SwanStation)/RApp/swanstation/config.json
new file mode 100644
index 0000000000..26d097a1d3
--- /dev/null
+++ b/static/packages/RApp/Sony - PlayStation (SwanStation)/RApp/swanstation/config.json	
@@ -0,0 +1,12 @@
+{
+    "label": "SwanStation",
+    "icon": "../../Icons/Default/rapp/swanstation.png",
+    "iconsel": "../../Icons/Default/rapp/swanstation.png",
+    "launch": "launch.sh",
+    "rompath": "../../Roms/PS",
+    "imgpath": "../../Roms/PS/Imgs",
+    "useswap": 0,
+    "shortname": 0,
+    "hidebios": 1,
+    "extlist": "cue|img|mdf|pbp|toc|cbn|m3u|ccd|chd"
+}
\ No newline at end of file
diff --git a/static/packages/RApp/Sony - PlayStation (SwanStation)/RApp/swanstation/launch.sh b/static/packages/RApp/Sony - PlayStation (SwanStation)/RApp/swanstation/launch.sh
new file mode 100644
index 0000000000..037a87d18e
--- /dev/null
+++ b/static/packages/RApp/Sony - PlayStation (SwanStation)/RApp/swanstation/launch.sh	
@@ -0,0 +1,7 @@
+#!/bin/sh
+echo $0 $*
+progdir=`dirname "$0"`
+homedir=`dirname "$1"`
+
+cd /mnt/SDCARD/RetroArch/
+HOME=/mnt/SDCARD/RetroArch/ $progdir/../../RetroArch/retroarch -v -L $progdir/../../RetroArch/.retroarch/cores/km_duckswanstation_xtreme_amped_libretro.so "$1"
diff --git a/static/packages/RApp/Sony - PlayStation (SwanStation)/Roms/PS/.gitkeep b/static/packages/RApp/Sony - PlayStation (SwanStation)/Roms/PS/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2