diff --git a/platformio.ini b/platformio.ini
index 248d27fe..49f9da49 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -81,7 +81,8 @@ default_envs =
   esp32S3_16MB_PSRAM_M_HUB75   ;; for S3 with 16MB flash, and MOONHUB HUB75 adapter board
   esp32S3_WROOM-2_M        ;; for S3 WROOM-2
   ;; esp32s2_tinyUF2_PSRAM_S  ;; experimental - only for adafruit -S2 boards with tinyUF2 bootloader !!!
-  esp32s2_PSRAM_M          ;; experimental
+  esp32s2_PSRAM_S          ;; OTA-compatible with upstream
+  esp32s2_PSRAM_M          ;; for lolin S2 mini
   esp32c3dev_4MB_M         ;; experimental
   esp32c3dev_2MB_M         ;; experimental - 2MB Flash, no OTA
   esp32c3mini_dio_4MB_M    ;; for boards that need "dio" flash mode (instead of qio)
@@ -2299,7 +2300,7 @@ platform = ${esp32s2.platform}                           ;; using 5.2.0, due to
 platform_packages = ${esp32s2.platform_packages}
 
 board = lolin_s2_mini
-board_build.partitions = tools/WLED_ESP32_4MB_256KB_FS.csv   ;; 1.8MB firmware, 256KB filesystem (esptool erase_flash needed when changing from "standard WLED" partitions)
+board_build.partitions = ${esp32.extended_partitions}   ;; 1.65MB firmware, 700KB filesystem (esptool erase_flash needed when changing from "standard WLED" partitions)
 board_build.flash_mode = dio
 upload_speed = 256000 ;; 921600
 build_unflags = ${common.build_unflags}
@@ -2308,7 +2309,6 @@ build_unflags = ${common.build_unflags}
   -D USERMOD_DALLASTEMPERATURE ;; disabled because it hangs during usermod setup on -S3 (autodetect broken?)
   -D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX)
   -D WLED_ENABLE_DMX_INPUT ;; needs more testing
-  -DWLEDMM_FASTPATH ;; needs more testing on -S2
   -D WLED_ENABLE_HUB75MATRIX
 build_flags = ${common.build_flags} ${esp32s2.build_flags} 
   ;; ${Debug_Flags.build_flags}
@@ -2340,9 +2340,32 @@ lib_deps = ${esp32s2.lib_deps} ${common_mm.lib_deps_S} ${common_mm.lib_deps_V4_M
 lib_ignore = 
   IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
   OneWire         ; not needed as we don't include USERMOD_DALLASTEMPERATURE
+  ${common_mm.HUB75_lib_ignore}
+  ${common_mm.DMXin_lib_ignore}
 monitor_filters = esp32_exception_decoder
-; RAM:   [==        ]  21.8% (used 71304 bytes from 327680 bytes)
-; Flash: [========  ]  84.0% (used 1596970 bytes from 1900544 bytes)
+; RAM:   [==        ]  20.5% (used 67256 bytes from 327680 bytes)
+; Flash: [========= ]  93.3% (used 1590266 bytes from 1703936 bytes)
+
+[env:esp32s2_PSRAM_S]
+extends = env:esp32s2_PSRAM_M
+board_build.partitions = ${esp32.default_partitions}   ;; 1.55MB firmware, 1MB filesystem
+build_unflags = ${env:esp32s2_PSRAM_M.build_unflags}
+  -DWLED_DISABLE_ADALIGHT
+  -D WLED_RELEASE_NAME=esp32s2_4MB_M
+  -DUSE_ALT_DISPLAY
+  -DUSERMOD_FOUR_LINE_DISPLAY
+  -DUSERMOD_ROTARY_ENCODER_UI
+  -DUSERMOD_ANIMARTRIX
+  ;; -DUSERMOD_ARTIFX  ;; uncomment to reduce flash size
+build_flags = ${env:esp32s2_PSRAM_M.build_flags}
+  -D WLED_RELEASE_NAME=esp32s2_4MB_S
+lib_deps = ${env:esp32s2_PSRAM_M.lib_deps}
+lib_ignore =  ${env:esp32s2_PSRAM_M.lib_ignore}
+  U8g2
+  ${common_mm.animartrix_lib_ignore}
+; RAM:   [==        ]  20.4% (used 66792 bytes from 327680 bytes)
+; Flash: [========= ]  94.8% (used 1490390 bytes from 1572864 bytes)
+
 
 # ------------------------------------------------------------------------------
 # esp32-C3 environments