diff --git a/.github/workflows/Development.yml b/.github/workflows/Development.yml
index e18cd734..02ad323b 100644
--- a/.github/workflows/Development.yml
+++ b/.github/workflows/Development.yml
@@ -28,7 +28,7 @@ jobs:
     needs: intro
     strategy:
       matrix:
-        environment: ["adafruit_feather_esp32_v2", "esp32doit-devkit-v1", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "ulanzi-tc001", "wemos_lolin_s2_mini"]
+        environment: ["adafruit_feather_esp32_v2", "esp32doit-devkit-v1", "esp32-s3-devkitc-1-n16r8v", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "ulanzi-tc001", "wemos_lolin_s2_mini"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job.
     steps:
@@ -72,7 +72,7 @@ jobs:
     needs: intro
     strategy:
       matrix:
-        environment: ["adafruit_feather_esp32_v2", "esp32doit-devkit-v1", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "ulanzi-tc001", "wemos_lolin_s2_mini"]
+        environment: ["adafruit_feather_esp32_v2", "esp32doit-devkit-v1", "esp32-s3-devkitc-1-n16r8v", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "ulanzi-tc001", "wemos_lolin_s2_mini"]
 
     steps:
     - name: Checkout repository
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c3580862..c4f7ff36 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
     needs: intro
     strategy:
       matrix:
-        environment: ["adafruit_feather_esp32_v2", "az-delivery-devkit-v4", "esp32doit-devkit-v1", "esp32-nodemcu", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "m5stack_core", "ulanzi-tc001", "wemos_lolin_s2_mini"]
+        environment: ["adafruit_feather_esp32_v2", "az-delivery-devkit-v4", "esp32doit-devkit-v1", "esp32-s3-devkitc-1-n16r8v", "esp32-nodemcu", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "m5stack_core", "ulanzi-tc001", "wemos_lolin_s2_mini"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job.
     steps:
@@ -90,7 +90,7 @@ jobs:
     needs: intro
     strategy:
       matrix:
-        environment: ["adafruit_feather_esp32_v2", "az-delivery-devkit-v4", "esp32doit-devkit-v1", "esp32-nodemcu", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "m5stack_core", "ulanzi-tc001", "wemos_lolin_s2_mini"]
+        environment: ["adafruit_feather_esp32_v2", "az-delivery-devkit-v4", "esp32doit-devkit-v1", "esp32-s3-devkitc-1-n16r8v", "esp32-nodemcu", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "m5stack_core", "ulanzi-tc001", "wemos_lolin_s2_mini"]
 
     steps:
     - name: Checkout repository
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d02c29b9..d2afa119 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
     needs: intro
     strategy:
       matrix:
-        environment: ["adafruit_feather_esp32_v2", "az-delivery-devkit-v4", "esp32doit-devkit-v1", "esp32-nodemcu", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "m5stack_core", "ulanzi-tc001", "wemos_lolin_s2_mini"]
+        environment: ["adafruit_feather_esp32_v2", "az-delivery-devkit-v4", "esp32doit-devkit-v1", "esp32-s3-devkitc-1-n16r8v", "esp32-nodemcu", "lilygo-ttgo-t-display", "lilygo-t-display-s3", "m5stack_core", "ulanzi-tc001", "wemos_lolin_s2_mini"]
 
     # Steps represent a sequence of tasks that will be executed as part of the job.
     steps:
diff --git a/config/board.ini b/config/board.ini
index b271b3ca..a472b01c 100644
--- a/config/board.ini
+++ b/config/board.ini
@@ -188,6 +188,59 @@ extra_scripts =
     ${config:smallHub75.extra_scripts}
     pre:./scripts/get_git_rev.py
 
+; ********************************************************************************
+; ESP32-S3 DevKitC-1-N16R8V - LED matrix
+; https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/user-guide-devkitc-1.html
+; ********************************************************************************
+[board:esp32-s3-devkitc-1-n16r8v]
+extends = mcu:esp32, display:led_matrix_column_major_alternating, config:normal
+board = esp32-s3-devkitc-1
+board_name = "ESP32-S3 DevKitC-1-N16R8V"
+board_build.partitions = default_16MB.csv
+board_build.filesystem = littlefs
+board_upload.flash_size = 16MB
+board_build.arduino.memory_type = qio_opi 
+build_flags =
+    ${mcu:esp32.build_flags}
+    ${display:led_matrix_column_major_alternating.build_flags}
+    ${config:normal.build_flags}
+    -D BOARD_HAS_PSRAM
+    -D CONFIG_PIN_ONBOARD_LED=IoPin::NC
+    -D CONFIG_PIN_BUTTON_OK=4U
+    -D CONFIG_PIN_BUTTON_LEFT=IoPin::NC
+    -D CONFIG_PIN_BUTTON_RIGHT=IoPin::NC
+    -D CONFIG_PIN_DHT_IN=5U
+    -D CONFIG_PIN_I2C_SDA=8U
+    -D CONFIG_PIN_I2C_SCL=9U
+    -D CONFIG_PIN_TEST=IoPin::NC
+    -D CONFIG_PIN_I2S_WS=10U
+    -D CONFIG_PIN_I2S_SC=12U
+    -D CONFIG_PIN_I2S_DI=13U
+    -D CONFIG_PIN_LED_MATRIX_OUT=47U
+    -D CONFIG_PIN_LDR_IN=6U
+    -D CONFIG_PIN_BATTERY_IN=IoPin::NC
+    -D CONFIG_PIN_BUZZER_OUT=IoPin::NC
+    -D CONFIG_SENSOR_LDR=SensorLdr::LDR_TYPE_GL5528
+    -D CONFIG_SENSOR_LDR_SERIES_RESISTANCE=1000.0F
+    -D CONFIG_BUTTON_CTRL=1
+    -D CONFIG_LED_TOPO=ColumnMajorAlternatingLayout
+    -D CONFIG_SUPPLY_CURRENT=3500U
+    -D CONFIG_RTC=0
+lib_deps =
+    ${mcu:esp32.lib_deps_builtin}
+    ${mcu:esp32.lib_deps_external}
+    ${display:led_matrix_column_major_alternating.lib_deps_builtin}
+    ${display:led_matrix_column_major_alternating.lib_deps_external}
+    ${config:normal.lib_deps}
+lib_ignore =
+    ${mcu:esp32.lib_ignore_builtin}
+    ${mcu:esp32.lib_ignore_external}
+    ${display:led_matrix_column_major_alternating.lib_ignore_builtin}
+    ${display:led_matrix_column_major_alternating.lib_ignore_external}
+extra_scripts =
+    ${config:normal.extra_scripts}
+    pre:./scripts/get_git_rev.py
+
 ; ********************************************************************************
 ; ESP32 NodeMCU - LED matrix
 ; ********************************************************************************
diff --git a/config/display.ini b/config/display.ini
index 050c3ea3..dd86084c 100644
--- a/config/display.ini
+++ b/config/display.ini
@@ -50,7 +50,7 @@ build_flags =
 lib_deps_builtin =
     HalLedMatrix
 lib_deps_external =
-    makuna/NeoPixelBus @ ~2.7.5
+    https://github.com/Makuna/NeoPixelBus#89a6a8b0194846e8d68024bed4d3587fca92045d
 lib_ignore_builtin =
     HalHub75Esp32
     HalTftDisplay
@@ -68,7 +68,7 @@ build_flags =
 lib_deps_builtin =
     HalLedMatrix
 lib_deps_external =
-    makuna/NeoPixelBus @ ~2.7.5
+    https://github.com/Makuna/NeoPixelBus#89a6a8b0194846e8d68024bed4d3587fca92045d
 lib_ignore_builtin =
     HalHub75Esp32
     HalTftDisplay
diff --git a/doc/boards/README.md b/doc/boards/README.md
index b4cfb9ea..dd2513c0 100644
--- a/doc/boards/README.md
+++ b/doc/boards/README.md
@@ -13,6 +13,7 @@ To find out which part shall be connected to which pin of your development board
   * [AZ-Delivery ESP-32 Dev Kit C V4](#az-delivery-esp-32-dev-kit-c-v4)
   * [DOIT ESP32 DEVKIT V1](#doit-esp32-devkit-v1)
   * [DOIT ESP32 DEVKIT V1 - HUB75 panel](#doit-esp32-devkit-v1---hub75-panel)
+  * [ESP32-S3 DEVKITC-1-N16R8V](#esp32-s3-devkitc-1-n16r8v)
   * [ESP32 NodeMCU](#esp32-nodemcu)
   * [LILYGO® TTGO ESP32 T-Display](#lilygo-ttgo-esp32-t-display)
   * [LILYGO® ESP32 T-Display S3](#lilygo-esp32-t-display-s3)
@@ -51,6 +52,13 @@ To find out which part shall be connected to which pin of your development board
   * Display: [display:hub75-esp32](../../config/display.ini)
 * Pixelix boards doesn't support HUB75 panels.
 
+## ESP32-S3 DEVKITC-1-N16R8V
+* Reference design: [ESP32-S3-DevKitC-1](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/user-guide-devkitc-1-v1.0.html)
+* Pinning:
+  * Board: [board:esp32-s3-devkitc-1-n16r8v](../../config/board.ini)
+  * Display: [display:led_matrix_column_major_alternating](../../config/display.ini)
+* Not compatible with Pixelix boards.
+
 ## ESP32 NodeMCU
 * Pinning:
   * Board: [board:esp32-nodemcu](../../config/board.ini)
diff --git a/lib/HalLedMatrix/library.json b/lib/HalLedMatrix/library.json
index d87b18bc..efbed965 100644
--- a/lib/HalLedMatrix/library.json
+++ b/lib/HalLedMatrix/library.json
@@ -16,9 +16,8 @@
     }, {
         "name": "YAGfx"
     }, {
-        "owner": "makuna",
-        "name": "NeoPixelBus",
-        "version": "~2.7.3"
+        "name": "external-repo",
+        "version": "https://github.com/Makuna/NeoPixelBus#89a6a8b0194846e8d68024bed4d3587fca92045d"
     }],
     "frameworks": "*",
     "platforms": "*"
diff --git a/platformio.ini b/platformio.ini
index 63771d9e..c1c5144a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -114,6 +114,18 @@ extra_scripts =
     ${board:esp32doit-devkit-v1-hub75.extra_scripts}
     ${common:prog_usb.extra_scripts}
 
+; ********************************************************************************
+; ESP32-S3 DevKitC-1-N16R8V - LED matrix - Programming via USB
+; ********************************************************************************
+[env:esp32-s3-devkitc-1-n16r8v]
+extends = board:esp32-s3-devkitc-1-n16r8v, common:prog_usb, mode:selected, checker
+build_flags =
+    ${board:esp32-s3-devkitc-1-n16r8v.build_flags}
+    ${mode:selected.build_flags}
+extra_scripts =
+    ${board:esp32-s3-devkitc-1-n16r8v.extra_scripts}
+    ${common:prog_usb.extra_scripts}
+
 ; ********************************************************************************
 ; ESP32 NodeMCU - LED matrix - Programming via USB
 ; ********************************************************************************