diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/wifidev-s2/blackmagic/blackmagic.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/blackmagic/blackmagic.bin
similarity index 100%
rename from applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/wifidev-s2/blackmagic/blackmagic.bin
rename to applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/blackmagic/blackmagic.bin
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/wifidev-s2/blackmagic/bootloader.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/blackmagic/bootloader.bin
similarity index 100%
rename from applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/wifidev-s2/blackmagic/bootloader.bin
rename to applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/blackmagic/bootloader.bin
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/wifidev-s2/blackmagic/partition-table.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/blackmagic/partition-table.bin
similarity index 100%
rename from applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/wifidev-s2/blackmagic/partition-table.bin
rename to applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/blackmagic/partition-table.bin
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/evilportal/EvilPortal.ino.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/evilportal/EvilPortal.ino.bin
deleted file mode 100644
index 9d463929d..000000000
Binary files a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/evilportal/EvilPortal.ino.bin and /dev/null differ
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/evilportal/EvilPortal.ino.bootloader.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/evilportal/EvilPortal.ino.bootloader.bin
deleted file mode 100644
index 25c62a975..000000000
Binary files a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/evilportal/EvilPortal.ino.bootloader.bin and /dev/null differ
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/evilportal/EvilPortal.ino.partitions.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/evilportal/EvilPortal.ino.partitions.bin
deleted file mode 100644
index 2108af950..000000000
Binary files a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/evilportal/EvilPortal.ino.partitions.bin and /dev/null differ
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/marauder/bootloader.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/marauder/bootloader.bin
deleted file mode 100644
index 05f670d0c..000000000
Binary files a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/marauder/bootloader.bin and /dev/null differ
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/marauder/marauder_dev_board_pro.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/marauder/marauder_dev_board_pro.bin
deleted file mode 100644
index 6b9a53e88..000000000
Binary files a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/marauder/marauder_dev_board_pro.bin and /dev/null differ
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/boot_app0.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/boot_app0.bin
similarity index 100%
rename from applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/boot_app0.bin
rename to applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/boot_app0.bin
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder.ino.bootloader.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder.ino.bootloader.bin
new file mode 100644
index 000000000..5c3dc05d9
Binary files /dev/null and b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder.ino.bootloader.bin differ
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/marauder/partitions.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder.ino.partitions.bin
similarity index 100%
rename from applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/devpro-wroom/marauder/partitions.bin
rename to applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder.ino.partitions.bin
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder_dev_board_pro.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder_dev_board_pro.bin
new file mode 100644
index 000000000..aee719bb8
Binary files /dev/null and b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder_dev_board_pro.bin differ
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder_flipper.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder_flipper.bin
new file mode 100644
index 000000000..eaf307604
Binary files /dev/null and b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder_flipper.bin differ
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder_flipper_sd_serial.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder_flipper_sd_serial.bin
new file mode 100644
index 000000000..d3a2b75a3
Binary files /dev/null and b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/marauder/esp32_marauder_flipper_sd_serial.bin differ
diff --git a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/wifidev-s2/dualboot.bin b/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/wifidev-s2/dualboot.bin
deleted file mode 100644
index 868e3fbfd..000000000
Binary files a/applications/external/esp_flasher/resources/apps_data/esp_flasher/assets/wifidev-s2/dualboot.bin and /dev/null differ
diff --git a/applications/external/esp_flasher/scenes/esp_flasher_scene_quick.c b/applications/external/esp_flasher/scenes/esp_flasher_scene_quick.c
index 7dd47c42b..e3092003f 100644
--- a/applications/external/esp_flasher/scenes/esp_flasher_scene_quick.c
+++ b/applications/external/esp_flasher/scenes/esp_flasher_scene_quick.c
@@ -4,9 +4,8 @@ enum QuickState {
     QuickStart,
     QuickWifidevS2,
     QuickWifidevS2Blackmagic,
-    QuickWifidevS2Dualboot,
+    QuickWifidevS2Marauder,
     QuickDevproWroom,
-    QuickDevproWroomEvilportal,
     QuickDevproWroomMarauder,
 };
 
@@ -42,7 +41,7 @@ void esp_flasher_scene_quick_on_enter(void* context) {
             app);
         break;
     case QuickWifidevS2Blackmagic:
-    case QuickWifidevS2Dualboot:
+    case QuickWifidevS2Marauder:
         submenu_set_header(submenu, "Choose Firmware:");
         submenu_add_item(
             submenu,
@@ -52,23 +51,16 @@ void esp_flasher_scene_quick_on_enter(void* context) {
             app);
         submenu_add_item(
             submenu,
-            "Evil Portal + Marauder",
-            QuickWifidevS2Dualboot,
+            "Marauder (has Evil Portal)",
+            QuickWifidevS2Marauder,
             esp_flasher_scene_quick_submenu_callback,
             app);
         break;
-    case QuickDevproWroomEvilportal:
     case QuickDevproWroomMarauder:
         submenu_set_header(submenu, "Choose Firmware:");
         submenu_add_item(
             submenu,
-            "Evil Portal",
-            QuickDevproWroomEvilportal,
-            esp_flasher_scene_quick_submenu_callback,
-            app);
-        submenu_add_item(
-            submenu,
-            "Marauder",
+            "Marauder (has Evil Portal)",
             QuickDevproWroomMarauder,
             esp_flasher_scene_quick_submenu_callback,
             app);
@@ -106,26 +98,23 @@ bool esp_flasher_scene_quick_on_event(void* context, SceneManagerEvent event) {
             flash = false;
             break;
         case QuickWifidevS2Blackmagic:
-            boot = APP_DATA_PATH("assets/wifidev-s2/blackmagic/bootloader.bin");
-            part = APP_DATA_PATH("assets/wifidev-s2/blackmagic/partition-table.bin");
-            firm = APP_DATA_PATH("assets/wifidev-s2/blackmagic/blackmagic.bin");
+            boot = APP_DATA_PATH("assets/blackmagic/bootloader.bin");
+            part = APP_DATA_PATH("assets/blackmagic/partition-table.bin");
+            firm = APP_DATA_PATH("assets/blackmagic/blackmagic.bin");
             enter_bootloader = true;
             break;
-        case QuickWifidevS2Dualboot:
-            boot = APP_DATA_PATH("assets/wifidev-s2/dualboot.bin");
+        case QuickWifidevS2Marauder:
+            boot = APP_DATA_PATH("assets/marauder/esp32_marauder.ino.bootloader.bin");
+            part = APP_DATA_PATH("assets/marauder/esp32_marauder.ino.partitions.bin");
+            app0 = APP_DATA_PATH("assets/marauder/boot_app0.bin");
+            firm = APP_DATA_PATH("assets/marauder/esp32_marauder_flipper_sd_serial.bin");
             enter_bootloader = true;
             break;
-        case QuickDevproWroomEvilportal:
-            boot = APP_DATA_PATH("assets/devpro-wroom/evilportal/EvilPortal.ino.bootloader.bin");
-            part = APP_DATA_PATH("assets/devpro-wroom/evilportal/EvilPortal.ino.partitions.bin");
-            app0 = APP_DATA_PATH("assets/devpro-wroom/boot_app0.bin");
-            firm = APP_DATA_PATH("assets/devpro-wroom/evilportal/EvilPortal.ino.bin");
-            break;
         case QuickDevproWroomMarauder:
-            boot = APP_DATA_PATH("assets/devpro-wroom/marauder/bootloader.bin");
-            part = APP_DATA_PATH("assets/devpro-wroom/marauder/partitions.bin");
-            app0 = APP_DATA_PATH("assets/devpro-wroom/boot_app0.bin");
-            firm = APP_DATA_PATH("assets/devpro-wroom/marauder/marauder_dev_board_pro.bin");
+            boot = APP_DATA_PATH("assets/marauder/esp32_marauder.ino.bootloader.bin");
+            part = APP_DATA_PATH("assets/marauder/esp32_marauder.ino.partitions.bin");
+            app0 = APP_DATA_PATH("assets/marauder/boot_app0.bin");
+            firm = APP_DATA_PATH("assets/marauder/esp32_marauder_dev_board_pro.bin");
             break;
         default:
             flash = false;
diff --git a/applications/external/esp_flasher/scenes/esp_flasher_scene_start.c b/applications/external/esp_flasher/scenes/esp_flasher_scene_start.c
index 9b1962ba9..c96531576 100644
--- a/applications/external/esp_flasher/scenes/esp_flasher_scene_start.c
+++ b/applications/external/esp_flasher/scenes/esp_flasher_scene_start.c
@@ -31,22 +31,22 @@ void esp_flasher_scene_start_on_enter(void* context) {
         app);
     submenu_add_item(
         submenu,
-        "Select Evil Portal (Fw A)",
+        "Manual Flash",
+        SubmenuIndexEspFlasherManualFlash,
+        esp_flasher_scene_start_submenu_callback,
+        app);
+    submenu_add_item(
+        submenu,
+        "Switch to Firmware A",
         SubmenuIndexEspFlasherSwitchA,
         esp_flasher_scene_start_submenu_callback,
         app);
     submenu_add_item(
         submenu,
-        "Select Marauder (Fw B)",
+        "Switch to Firmware B",
         SubmenuIndexEspFlasherSwitchB,
         esp_flasher_scene_start_submenu_callback,
         app);
-    submenu_add_item(
-        submenu,
-        "Manual Flash",
-        SubmenuIndexEspFlasherManualFlash,
-        esp_flasher_scene_start_submenu_callback,
-        app);
     submenu_add_item(
         submenu,
         "Reset Board",