diff --git a/esp32_huge_app.csv b/esp32_huge_app.csv
new file mode 100644
index 0000000..9070da5
--- /dev/null
+++ b/esp32_huge_app.csv
@@ -0,0 +1,6 @@
+# Name,   Type, SubType,  Offset,    Size
+nvs,      data, nvs,      0x9000,    0x5000,
+otadata,  data, ota,      0xE000,    0x2000,
+app0,     app,  factory,  0x10000,   0x300000,
+spiffs,   data, spiffs,   0x310000,  0xD0000,
+coredump, data, coredump, 0x3E0000,  0x10000,
\ No newline at end of file
diff --git a/platformio.ini b/platformio.ini
index 2614eb3..0913212 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,24 +9,22 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = esp32devdbg
+default_envs = esp32c6
+src_dir = src
 
 [env]
-platform =  espressif32 @ 5.4.0
+platform = https://github.com/pioarduino/platform-espressif32
+; platform = espressif32 @ 5.4.0
 framework = arduino
 lib_deps = 
 	bblanchon/ArduinoJson@^7.2.2
 	lsatan/SmartRC-CC1101-Driver-Lib@^2.5.7
 	knolleary/PubSubClient@^2.8
-	; esp32async/ESPAsyncWebServer@^3.10.3
-	; esp32async/AsyncTCP@^3.4.10
-	; 4. ESP32-C6 / Arduino 3.0 Compatible Async Stack (CRITICAL)
-    https://github.com/mathieucarbou/AsyncTCP.git
-    https://github.com/mathieucarbou/ESPAsyncWebServer.git
+	esp32async/ESPAsyncWebServer@^3.10.3
+	esp32async/AsyncTCP@^3.4.10
 extra_scripts = 
 	pre:minify.py
 	post:archive_elf.py
-
 board_build.filesystem = littlefs
 build_flags = 
 	-DCORE_DEBUG_LEVEL=1
@@ -58,36 +56,20 @@ board_build.partitions = esp32_3MB.csv
 board = esp32-s3-devkitc-1
 
 [env:esp32c6]
-; platform = https://github.com/mnowak32/platform-espressif32.git#boards/seeed_xiao_esp32c6
-; platform_packages =
-;   framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.4
-;   framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.4/esp32-arduino-libs-3.0.4.zip
-; board = seeed_xiao_esp32c6
-; board_build.partitions = esp32_3MB.csv
-; build_flags =
-; 	${env.build_flags}
-; 	-I${platformio.packages_dir}/framework-arduinoespressif32/libraries/Network/src
-; platform = espressif32 ; Not working
-platform = https://github.com/pioarduino/platform-espressif32
-# Ensure we are using the 3.0+ core
-; platform_packages =
-;     framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.7
-;     framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.7/esp32-arduino-libs-3.0.7.zip
 board = seeed_xiao_esp32c6
-; board = esp32-c6-devkitc-1
-
-lib_deps = 
-	bblanchon/ArduinoJson@^7.2.2
-	lsatan/SmartRC-CC1101-Driver-Lib@^2.5.7
-	knolleary/PubSubClient@^2.8
-    https://github.com/ESP32Async/AsyncTCP.git
-    https://github.com/ESP32Async/ESPAsyncWebServer.git
-; platform_packages =
-;     framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.7
-
-board_build.partitions = esp32_3MB.csv
-
-build_flags =
+board_build.partitions = esp32_huge_app.csv
+build_flags = 
 	${env.build_flags}
-	-I${platformio.packages_dir}/framework-arduinoespressif32/libraries/Network/src
+	-include "driver/gpio.h"
+lib_deps = 
+	; Low-Level libs, frameowrks and drivers
+	ESP32Async/AsyncTCP
+	https://github.com/Viproz/SmartRC-CC1101-Driver-Lib.git
+	; Commmunication Protocol
+	links2004/WebSockets
+	https://github.com/hmueller01/pubsubclient3.git
+	; Data-Parsing
+	bblanchon/ArduinoJson
+	; High-level wrappers/servers
+	ESP32Async/ESPAsyncWebServer
 
diff --git a/src/ConfigSettings.cpp b/src/ConfigSettings.cpp
index cb9a6a9..b10ca26 100644
--- a/src/ConfigSettings.cpp
+++ b/src/ConfigSettings.cpp
@@ -158,11 +158,9 @@ bool ConfigSettings::begin() {
     case esp_chip_model_t::CHIP_ESP32C3:
       strcpy(this->chipModel, "c3");
       break;
-#ifdef CHIP_ESP32C6
     case esp_chip_model_t::CHIP_ESP32C6:
       strcpy(this->chipModel, "c6");
       break;
-#endif
     default:
       sprintf(this->chipModel, "UNK%d", static_cast<int>(ci.model));
       break;
diff --git a/src/Somfy.cpp b/src/Somfy.cpp
index 3807bf1..af237cf 100644
--- a/src/Somfy.cpp
+++ b/src/Somfy.cpp
@@ -4712,8 +4712,8 @@ void transceiver_config_t::load() {
         this->SCKPin = 15;
         this->CSNPin = 14;
         break;
-	#ifdef CHIP_ESP32C6
       case esp_chip_model_t::CHIP_ESP32C6:
+      // Pinout applicable for the ESP32-C6-WROOM-1 module (ESP32-C6-DevKitC-1-N4)      
         this->TXPin = 10;
         this->RXPin = 10;
         this->MOSIPin = 7;
@@ -4721,7 +4721,6 @@ void transceiver_config_t::load() {
         this->SCKPin = 6;
         this->CSNPin = 0;
         break;
-#endif
       default:
         this->TXPin = 13;
         this->RXPin = 12;