diff --git a/boards.txt b/boards.txt
index f1256a1ed28..903948aedb5 100644
--- a/boards.txt
+++ b/boards.txt
@@ -29364,7 +29364,7 @@ esp32s3_powerfeather.build.variant=esp32s3_powerfeather
 esp32s3_powerfeather.build.board=ESP32S3_POWERFEATHER
 
 esp32s3_powerfeather.build.usb_mode=1
-esp32s3_powerfeather.build.cdc_on_boot=0
+esp32s3_powerfeather.build.cdc_on_boot=1
 esp32s3_powerfeather.build.msc_on_boot=0
 esp32s3_powerfeather.build.dfu_on_boot=0
 esp32s3_powerfeather.build.f_cpu=240000000L
@@ -29377,8 +29377,9 @@ esp32s3_powerfeather.build.partitions=default_8MB
 esp32s3_powerfeather.build.defines=
 esp32s3_powerfeather.build.loop_core=
 esp32s3_powerfeather.build.event_core=
+esp32s3_powerfeather.build.flash_type=qio
 esp32s3_powerfeather.build.psram_type=qspi
-esp32s3_powerfeather.build.memory_type={build.boot}_{build.psram_type}
+esp32s3_powerfeather.build.memory_type={build.flash_type}_{build.psram_type}
 
 esp32s3_powerfeather.menu.PSRAM.disabled=Disabled
 esp32s3_powerfeather.menu.PSRAM.disabled.build.defines=
@@ -29418,10 +29419,10 @@ esp32s3_powerfeather.menu.USBMode.hwcdc.build.usb_mode=1
 esp32s3_powerfeather.menu.USBMode.default=USB-OTG (TinyUSB)
 esp32s3_powerfeather.menu.USBMode.default.build.usb_mode=0
 
-esp32s3_powerfeather.menu.CDCOnBoot.default=Disabled
-esp32s3_powerfeather.menu.CDCOnBoot.default.build.cdc_on_boot=0
 esp32s3_powerfeather.menu.CDCOnBoot.cdc=Enabled
 esp32s3_powerfeather.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+esp32s3_powerfeather.menu.CDCOnBoot.default=Disabled
+esp32s3_powerfeather.menu.CDCOnBoot.default.build.cdc_on_boot=0
 
 esp32s3_powerfeather.menu.MSCOnBoot.default=Disabled
 esp32s3_powerfeather.menu.MSCOnBoot.default.build.msc_on_boot=0
@@ -29440,39 +29441,21 @@ esp32s3_powerfeather.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
 esp32s3_powerfeather.menu.UploadMode.cdc.upload.use_1200bps_touch=true
 esp32s3_powerfeather.menu.UploadMode.cdc.upload.wait_for_upload_port=true
 
-esp32s3_powerfeather.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.default.build.partitions=default
-esp32s3_powerfeather.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
-esp32s3_powerfeather.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
 esp32s3_powerfeather.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
 esp32s3_powerfeather.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
 esp32s3_powerfeather.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
-esp32s3_powerfeather.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.minimal.build.partitions=minimal
-esp32s3_powerfeather.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.no_ota.build.partitions=no_ota
-esp32s3_powerfeather.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-esp32s3_powerfeather.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
-esp32s3_powerfeather.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
-esp32s3_powerfeather.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
-esp32s3_powerfeather.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
-esp32s3_powerfeather.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
-esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
-esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
-esp32s3_powerfeather.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
-esp32s3_powerfeather.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.huge_app.build.partitions=huge_app
-esp32s3_powerfeather.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-esp32s3_powerfeather.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
-esp32s3_powerfeather.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-esp32s3_powerfeather.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB=8M with ffat (3MB APP/1.5MB FATFS)
+esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB.build.partitions=default_ffat_8MB
+esp32s3_powerfeather.menu.PartitionScheme.default_ffat_8MB.upload.maximum_size=3342336
+esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB=Large SPIFFS (1.2MB APP/5.3MB SPIFFS)
+esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB.build.partitions=large_spiffs_8MB
+esp32s3_powerfeather.menu.PartitionScheme.large_spiffs_8MB.upload.maximum_size=1310720
+esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB=Large FFAT (1.2MB APP/5.3MB FATFS)
+esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB.build.partitions=large_ffat_8MB
+esp32s3_powerfeather.menu.PartitionScheme.large_ffat_8MB.upload.maximum_size=1310720
 esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB=Maximum APP (7.9MB APP No OTA/No FS)
 esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB.build.partitions=max_app_8MB
 esp32s3_powerfeather.menu.PartitionScheme.max_app_8MB.upload.maximum_size=8257536
-esp32s3_powerfeather.menu.PartitionScheme.rainmaker=RainMaker
-esp32s3_powerfeather.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
-esp32s3_powerfeather.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
 
 esp32s3_powerfeather.menu.CPUFreq.240=240MHz (WiFi)
 esp32s3_powerfeather.menu.CPUFreq.240.build.f_cpu=240000000L
diff --git a/tools/partitions/default_ffat_8MB.csv b/tools/partitions/default_ffat_8MB.csv
new file mode 100644
index 00000000000..2791bf7912e
--- /dev/null
+++ b/tools/partitions/default_ffat_8MB.csv
@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x330000,
+app1,     app,  ota_1,   0x340000,0x330000,
+ffat,     data, fat,     0x670000,0x180000,
+coredump, data, coredump,0x7F0000,0x10000,
diff --git a/tools/partitions/large_ffat_8MB.csv b/tools/partitions/large_ffat_8MB.csv
new file mode 100644
index 00000000000..20632d6c512
--- /dev/null
+++ b/tools/partitions/large_ffat_8MB.csv
@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x140000,
+app1,     app,  ota_1,   0x150000,0x140000,
+ffat,     data, fat,     0x290000,0x560000,
+coredump, data, coredump,0x7F0000,0x10000,
diff --git a/tools/partitions/large_spiffs_8MB.csv b/tools/partitions/large_spiffs_8MB.csv
new file mode 100644
index 00000000000..ecf87c6d280
--- /dev/null
+++ b/tools/partitions/large_spiffs_8MB.csv
@@ -0,0 +1,7 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x140000,
+app1,     app,  ota_1,   0x150000,0x140000,
+spiffs,   data, spiffs,  0x290000,0x560000,
+coredump, data, coredump,0x7F0000,0x10000,
diff --git a/variants/esp32s3_powerfeather/pins_arduino.h b/variants/esp32s3_powerfeather/pins_arduino.h
index d1c486901c7..2066cf3e002 100644
--- a/variants/esp32s3_powerfeather/pins_arduino.h
+++ b/variants/esp32s3_powerfeather/pins_arduino.h
@@ -9,12 +9,12 @@
 #define USB_PRODUCT        "ESP32-S3 PowerFeather"
 #define USB_SERIAL         ""
 
-static const uint8_t ALARM = 7;
+static const uint8_t ALARM = 21;
 static const uint8_t INT =   5;
 
 static const uint8_t LED =   46;
 static const uint8_t BTN =   0;
-static const uint8_t EN =    13;
+static const uint8_t EN =    7;
 
 static const uint8_t TX =    44;
 static const uint8_t RX =    42;
@@ -37,6 +37,8 @@ static const uint8_t A5 =    1;
 
 static const uint8_t D5 =    15;
 static const uint8_t D6 =    16;
+static const uint8_t D7 =    37;
+static const uint8_t D8 =    6;
 static const uint8_t D9 =    17;
 static const uint8_t D10 =   18;
 static const uint8_t D11 =   45;