diff --git a/platformio.ini b/platformio.ini
index 15485d2941..459cda94cb 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,11 +11,10 @@
 
 # CI binaries
 ;; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth # ESP32 variant builds are temporarily excluded from CI due to toolchain issues on the GitHub Actions Linux environment
-; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32dev_audioreactive, lolin_s2_mini, esp32c3dev, esp32s3dev_8MB, esp32s3dev_8MB_PSRAM_opi
+; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, esp32dev_audioreactive, lolin_s2_mini, esp32c3dev, esp32s3dev_8MB, esp32s3dev_8MB_PSRAM_opi, esp32s3dev_16MB_PSRAM_opi
 
 # Release binaries
-; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, lolin_s2_mini, esp32c3dev, esp32s3dev_8MB
-
+; default_envs = nodemcuv2, esp8266_2m, esp01_1m_full, esp32dev, esp32_eth, lolin_s2_mini, esp32c3dev, esp32s3dev_8M, esp32s3dev_16MB
 # Build everything
 ; default_envs = esp32dev, esp8285_4CH_MagicHome, codm-controller-0_6-rev2, codm-controller-0_6, esp32s2_saola, d1_mini_5CH_Shojo_PCB, d1_mini, sp501e, nodemcuv2, esp32_eth, anavi_miracle_controller, esp07, esp01_1m_full, m5atom, h803wf, d1_mini_ota, heltec_wifi_kit_8, esp8285_H801, d1_mini_debug, wemos_shield_esp32, elekstube_ips
 
@@ -43,6 +42,7 @@
 ; default_envs = esp32c3dev
 ; default_envs = lolin_s2_mini
 ; default_envs = esp32s3dev_16MB_PSRAM_opi
+; default_envs = esp32s3_16MB_OPI
 
 ; MoonModules entries
 ; ===================
@@ -105,6 +105,7 @@ default_envs =
   esp32S3_8MB_PSRAM_M_qspi ;; for S3 with 8MB flash, 2 or 4MB PSRAM, HUB75 supported
   esp32S3_8MB_PSRAM_M_opi  ;; for S3 with 8MB flash, 8 or 16MB PSRAM, HUB75 supported
   ;;  === esp32-S3  === with 16MB flash
+  esp32s3_16MB_OPI
   esp32S3_16MB_PSRAM_M_HUB75  ;; for S3 with 16MB flash, HUB75 supported (MOONHUB HUB75 adapter board)
   esp32S3_WROOM-2_M        ;; for S3 WROOM-2; HUB75 supported
   ;;
diff --git a/wled00/wled.h b/wled00/wled.h
index 6036c43af5..052c9a7dc1 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -1,3 +1,20 @@
+#ifndef WLED_MY_PINS
+#define WLED_MY_PINS
+#define R1_PIN 4
+#define G1_PIN 5
+#define B1_PIN 6
+#define R2_PIN 7
+#define G2_PIN 15
+#define B2_PIN 16
+#define A_PIN 8
+#define B_PIN 9
+#define C_PIN 10
+#define D_PIN 11
+#define E_PIN 12
+#define LAT_PIN 13
+#define OE_PIN 14
+#define CLK_PIN 17
+#endif
 #ifndef WLED_H
 #define WLED_H
 /*