diff --git a/boards/obp60_s3_light_n8r8.json b/boards/obp40_s3_n8r8.json
similarity index 89%
rename from boards/obp60_s3_light_n8r8.json
rename to boards/obp40_s3_n8r8.json
index b7b808a5..260050cb 100644
--- a/boards/obp60_s3_light_n8r8.json
+++ b/boards/obp40_s3_n8r8.json
@@ -10,7 +10,7 @@
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_ESP32S3_DEV",
       "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_CDC_ON_BOOT=0",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],
@@ -24,7 +24,7 @@
       ]
     ],
     "mcu": "esp32s3",
-    "variant": "obp60s3_light"
+    "variant": "obp40s3"
   },
   "connectivity": [
     "bluetooth",
@@ -41,7 +41,7 @@
     "arduino",
     "espidf"
   ],
-  "name": "OBP60 Light ESP32-S3-N8R8 (8 MB QD, 8 MB PSRAM)",
+  "name": "OBP40 ESP32-S3-N8R8 (8 MB QD, 8 MB PSRAM)",
   "upload": {
     "flash_size": "8MB",
     "maximum_ram_size": 327680,
diff --git a/lib/obp60task/AS5600.cpp b/lib/obp60task/AS5600.cpp
index 2a7081d6..675e47d7 100644
--- a/lib/obp60task/AS5600.cpp
+++ b/lib/obp60task/AS5600.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 /****************************************************
   AMS 5600 class for Arduino platform
diff --git a/lib/obp60task/OBP60Extensions.cpp b/lib/obp60task/OBP60Extensions.cpp
index 4a333ba3..8c4ec27e 100644
--- a/lib/obp60task/OBP60Extensions.cpp
+++ b/lib/obp60task/OBP60Extensions.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <Arduino.h>
 #include <PCF8574.h>      // Driver for PCF8574 output modul from Horter
@@ -426,7 +426,7 @@ void displayFooter(CommonData &commonData) {
         getdisplay().print("Press 1 and 6 fast to unlock keys");
     }
 #endif
-#ifdef HARDWARE_LIGHT
+#ifdef BOARD_OBP40S3
     // grapical page indicator
     static const uint16_t r = 5;
     static const uint16_t space = 4;
diff --git a/lib/obp60task/OBP60Formater.cpp b/lib/obp60task/OBP60Formater.cpp
index 2b8f7cf3..8fd4a93e 100644
--- a/lib/obp60task/OBP60Formater.cpp
+++ b/lib/obp60task/OBP60Formater.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <Arduino.h>
 #include "GwApi.h"
diff --git a/lib/obp60task/OBP60Hardware.h b/lib/obp60task/OBP60Hardware.h
index f146d131..aaa22b8e 100644
--- a/lib/obp60task/OBP60Hardware.h
+++ b/lib/obp60task/OBP60Hardware.h
@@ -76,9 +76,9 @@
     #define OBP_POWER_50 5          // 5.0V power rail
 #endif
 
-// Hardware configuration for OBP60 LIGHT
+// Hardware configuration for OBP40
 
-#ifdef HARDWARE_LIGHT
+#ifdef BOARD_OBP40S3
     // Direction pin for RS485 NMEA0183
     #define OBP_DIRECTION_PIN 8
     // I2C
diff --git a/lib/obp60task/OBP60Keypad.h b/lib/obp60task/OBP60Keypad.h
index 7caea028..122355c1 100644
--- a/lib/obp60task/OBP60Keypad.h
+++ b/lib/obp60task/OBP60Keypad.h
@@ -236,7 +236,7 @@ void initKeys(CommonData &commonData) {
   }
   #endif
 
-  #ifdef HARDWARE_LIGHT
+  #ifdef BOARD_OBP40S3
   int readSensorpads(){
       // Read key code
       if(digitalRead(UP) == LOW){
diff --git a/lib/obp60task/OBPSensorTask.cpp b/lib/obp60task/OBPSensorTask.cpp
index e2faa5d3..99071ab7 100644
--- a/lib/obp60task/OBPSensorTask.cpp
+++ b/lib/obp60task/OBPSensorTask.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include <Adafruit_Sensor.h>            // Adafruit Lib for sensors
 #include <Adafruit_BME280.h>            // Adafruit Lib for BME280
 #include <Adafruit_BMP280.h>            // Adafruit Lib for BMP280
diff --git a/lib/obp60task/PageBME280.cpp b/lib/obp60task/PageBME280.cpp
index f0f02c07..d731005c 100644
--- a/lib/obp60task/PageBME280.cpp
+++ b/lib/obp60task/PageBME280.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageBattery.cpp b/lib/obp60task/PageBattery.cpp
index bbde0987..cb9e0548 100644
--- a/lib/obp60task/PageBattery.cpp
+++ b/lib/obp60task/PageBattery.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageBattery2.cpp b/lib/obp60task/PageBattery2.cpp
index b8694a78..7bf25b33 100644
--- a/lib/obp60task/PageBattery2.cpp
+++ b/lib/obp60task/PageBattery2.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageClock.cpp b/lib/obp60task/PageClock.cpp
index 34427975..4a96a4a7 100644
--- a/lib/obp60task/PageClock.cpp
+++ b/lib/obp60task/PageClock.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageDST810.cpp b/lib/obp60task/PageDST810.cpp
index 0da67ffe..dc9de1b3 100644
--- a/lib/obp60task/PageDST810.cpp
+++ b/lib/obp60task/PageDST810.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageFluid.cpp b/lib/obp60task/PageFluid.cpp
index 4c121daf..b31f31cd 100644
--- a/lib/obp60task/PageFluid.cpp
+++ b/lib/obp60task/PageFluid.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageFourValues.cpp b/lib/obp60task/PageFourValues.cpp
index 73329e4b..e8e1024d 100644
--- a/lib/obp60task/PageFourValues.cpp
+++ b/lib/obp60task/PageFourValues.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageFourValues2.cpp b/lib/obp60task/PageFourValues2.cpp
index 6ac59816..27dd6eb0 100644
--- a/lib/obp60task/PageFourValues2.cpp
+++ b/lib/obp60task/PageFourValues2.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageGenerator.cpp b/lib/obp60task/PageGenerator.cpp
index 20e76523..30b8b547 100644
--- a/lib/obp60task/PageGenerator.cpp
+++ b/lib/obp60task/PageGenerator.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageKeelPosition.cpp b/lib/obp60task/PageKeelPosition.cpp
index f3eac495..71a8547b 100644
--- a/lib/obp60task/PageKeelPosition.cpp
+++ b/lib/obp60task/PageKeelPosition.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageOneValue.cpp b/lib/obp60task/PageOneValue.cpp
index 84aff6d0..3e7b0070 100644
--- a/lib/obp60task/PageOneValue.cpp
+++ b/lib/obp60task/PageOneValue.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageRollPitch.cpp b/lib/obp60task/PageRollPitch.cpp
index 320e43fd..3a4041b7 100644
--- a/lib/obp60task/PageRollPitch.cpp
+++ b/lib/obp60task/PageRollPitch.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageRudderPosition.cpp b/lib/obp60task/PageRudderPosition.cpp
index 6ed0d4cf..6883ca24 100644
--- a/lib/obp60task/PageRudderPosition.cpp
+++ b/lib/obp60task/PageRudderPosition.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageSolar.cpp b/lib/obp60task/PageSolar.cpp
index 646a568e..eb25aba2 100644
--- a/lib/obp60task/PageSolar.cpp
+++ b/lib/obp60task/PageSolar.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageSystem.cpp b/lib/obp60task/PageSystem.cpp
index 21561963..b69cd259 100644
--- a/lib/obp60task/PageSystem.cpp
+++ b/lib/obp60task/PageSystem.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageThreeValues.cpp b/lib/obp60task/PageThreeValues.cpp
index c740b300..5e9dc0a9 100644
--- a/lib/obp60task/PageThreeValues.cpp
+++ b/lib/obp60task/PageThreeValues.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageTwoValues.cpp b/lib/obp60task/PageTwoValues.cpp
index 6b8d0d15..34fa28a7 100644
--- a/lib/obp60task/PageTwoValues.cpp
+++ b/lib/obp60task/PageTwoValues.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageVoltage.cpp b/lib/obp60task/PageVoltage.cpp
index cc77b016..d05c9035 100644
--- a/lib/obp60task/PageVoltage.cpp
+++ b/lib/obp60task/PageVoltage.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageWhite.cpp b/lib/obp60task/PageWhite.cpp
index 4c9d0c79..f25c281b 100644
--- a/lib/obp60task/PageWhite.cpp
+++ b/lib/obp60task/PageWhite.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageWind.cpp b/lib/obp60task/PageWind.cpp
index 3702613c..e42e1f97 100644
--- a/lib/obp60task/PageWind.cpp
+++ b/lib/obp60task/PageWind.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageWindRose.cpp b/lib/obp60task/PageWindRose.cpp
index 88c490fc..49a7ba35 100644
--- a/lib/obp60task/PageWindRose.cpp
+++ b/lib/obp60task/PageWindRose.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageWindRoseFlex.cpp b/lib/obp60task/PageWindRoseFlex.cpp
index ba4b0292..413f047a 100644
--- a/lib/obp60task/PageWindRoseFlex.cpp
+++ b/lib/obp60task/PageWindRoseFlex.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/PageXTETrack.cpp b/lib/obp60task/PageXTETrack.cpp
index 7b5f4874..f73524e1 100644
--- a/lib/obp60task/PageXTETrack.cpp
+++ b/lib/obp60task/PageXTETrack.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/obp60task/Pagedata.h b/lib/obp60task/Pagedata.h
index b065049c..cc4c45b8 100644
--- a/lib/obp60task/Pagedata.h
+++ b/lib/obp60task/Pagedata.h
@@ -115,7 +115,7 @@ class Page{
             commonData->keydata[5].label = "";
         }
 #endif
-#ifdef HARDWARE_LIGHT
+#ifdef BOARD_OBP40S3
         commonData->keydata[0].label = "";
         commonData->keydata[1].label = "";
 
diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp
index 506e2ba9..f1a295d6 100644
--- a/lib/obp60task/obp60task.cpp
+++ b/lib/obp60task/obp60task.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include "obp60task.h"
 #include "Pagedata.h"                   // Data exchange for pages
 #include "OBP60Hardware.h"              // PIN definitions
@@ -13,7 +13,7 @@
 #include "OBP60Extensions.h"            // Functions lib for extension board
 #include "OBP60Keypad.h"                // Functions for keypad
 
-#ifdef HARDWARE_LIGHT
+#ifdef BOARD_OBP40S3
 #include <FS.h> // SD-Card access
 #include <SD.h>
 #include <SPI.h>
@@ -54,8 +54,9 @@ void OBP60Init(GwApi *api){
     // Init hardware
     hardwareInit(api);
 
-#ifdef HARDWARE_LIGHT
-    String sdcard = config->getConfigItem(config->useSDCard, true)->asString();
+#ifdef BOARD_OBP40S3
+    //String sdcard = config->getConfigItem(config->useSDCard, true)->asString();
+    String sdcard = "on";
     if (sdcard == "on") {
         setPortPin(OBP_POWER_SD, true); // Power on SD
         delay(10);
@@ -88,7 +89,7 @@ void OBP60Init(GwApi *api){
         #ifdef HARDWARE_V21
         setPortPin(OBP_POWER_50, true); // Power on 5.0V rail
         #endif
-        #ifdef HARDWARE_LIGHT
+        #ifdef BOARD_OBP40S3
         setPortPin(OBP_POWER_EPD, true);// Power on ePaper display
         #endif
     }
@@ -96,7 +97,7 @@ void OBP60Init(GwApi *api){
         #ifdef HARDWARE_V21
         setPortPin(OBP_POWER_50, false); // Power off 5.0V rail
         #endif
-        #ifdef HARDWARE_LIGHT
+        #ifdef BOARD_OBP40S3
         setPortPin(OBP_POWER_EPD, false);// Power off ePaper display
         #endif
     }
diff --git a/lib/obp60task/obp60task.h b/lib/obp60task/obp60task.h
index 2284e6f0..4d959f05 100644
--- a/lib/obp60task/obp60task.h
+++ b/lib/obp60task/obp60task.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "GwApi.h"
 //we only compile for some boards
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
     #define USBSerial Serial
     #ifdef HARDWARE_V21
         // CAN NMEA2000
@@ -14,7 +14,7 @@
         #define GWSERIAL_RX 8
         #define GWSERIAL_MODE "UNI"
     #endif
-    #ifdef HARDWARE_LIGHT
+    #ifdef BOARD_OBP40S3
         // CAN NMEA2000
         #define ESP32_CAN_TX_PIN 15
         #define ESP32_CAN_RX_PIN 16
@@ -38,7 +38,7 @@
     #ifdef HARDWARE_V21
     DECLARE_CAPABILITY(obp60,true);
     #endif
-    #ifdef HARDWARE_LIGHT
+    #ifdef BOARD_OBP40S3
     DECLARE_CAPABILITY(obp40,true)
     #endif
     DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/de/latest/"); // Link to help pages
diff --git a/lib/obp60task/platformio.ini b/lib/obp60task/platformio.ini
index ec58574f..d9d633f3 100644
--- a/lib/obp60task/platformio.ini
+++ b/lib/obp60task/platformio.ini
@@ -10,7 +10,6 @@ board_build.variants_dir = variants
 #board = obp60_s3_n16    #ESP32-S3 N16,16MB flash, no PSRAM, zero series
 #board = obp60_s3_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM
 board = obp60_s3_n16r8  #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
-#board = obp60_s3_light_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
 #board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
 board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
 framework = arduino
@@ -39,15 +38,12 @@ lib_deps =
     adafruit/Adafruit FRAM I2C@^2.0.3
 build_flags=
     #https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
-#    -D ARDUINO_USB_MODE=1           #0=OTG (to implement other external devices), 1=CDC (is a serial device) 
-#    -D ARDUINO_USB_CDC_ON_BOOT=1    #0=JTAG, 1=CDC (serial device)
 #    -D CORE_DEBUG_LEVEL=1           #Debug level for CPU core via CDC (seral device)
 #    -D TIME=$UNIX_TIME              #Set PC time for RTC (only settable via VSC)
     -D DISABLE_DIAGNOSTIC_OUTPUT    #Disable diagnostic output for GxEPD2 lib
     -D BOARD_OBP60S3                #Board OBP60 V2.1 with ESP32S3
 #    -D HARDWARE_V20                 #OBP60 hardware revision V2.0
     -D HARDWARE_V21                 #OBP60 hardware revision V2.1
-#    -D HARDWARE_LIGHT               #OBP60 hardware clone
 #    -D DISPLAY_GDEW042T2            #old E-Ink display from Waveshare, R10 0.47 ohm
     -D DISPLAY_GDEY042T81           #new E-Ink display from Waveshare, R10 2.2 ohm
 #    -D DISPLAY_GYE042A87            #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm
@@ -60,10 +56,10 @@ upload_protocol = esptool           #firmware upload via USB OTG seriell, by fir
 upload_speed = 230400
 monitor_speed = 115200
 
-[env:obp40]
+[env:obp40_s3]
 platform = espressif32@6.8.1
 board_build.variants_dir = variants
-board = obp60_s3_light_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
+board = obp40_s3_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone (CrowPanel 4.2)
 board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
 custom_config = config_obp40.json
 framework = arduino
@@ -93,8 +89,7 @@ lib_deps =
     adafruit/Adafruit FRAM I2C@^2.0.3
 build_flags=
     -D DISABLE_DIAGNOSTIC_OUTPUT    #Disable diagnostic output for GxEPD2 lib
-    -D BOARD_OBP60S3                #Board OBP60 V2.1 with ESP32S3
-    -D HARDWARE_LIGHT               #OBP60 hardware clone (OBP40)
+    -D BOARD_OBP40S3                #Board OBP40 V1.0 with ESP32S3 SKU:DIE07300S (CrowPanel 4.2)
     -D DISPLAY_GDEY042T81           #new E-Ink display from Waveshare, R10 2.2 ohm
     ${env.build_flags}
 upload_port = /dev/ttyUSB0          #OBP60 clone
diff --git a/lib/obp60task/platformio.ini.light b/lib/obp60task/platformio.ini.light
deleted file mode 100644
index 6d6ae65f..00000000
--- a/lib/obp60task/platformio.ini.light
+++ /dev/null
@@ -1,61 +0,0 @@
-[platformio]
-#if you want a pio run to only build
-#your special environments you can set this here
-#by uncommenting the next line
-default_envs = obp60_s3
-[env:obp60_s3]
-platform = espressif32@6.8.1
-board_build.variants_dir = variants
-#board = obp60_s3_n8     #ESP32-S3 N8, 8MB flash, no PSRAM
-#board = obp60_s3_n16    #ESP32-S3 N16,16MB flash, no PSRAM, zero series
-#board = obp60_s3_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM
-#board = obp60_s3_n16r8  #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
-board = obp60_s3_light_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
-board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
-#board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
-framework = arduino
-lib_deps = 
-    ${basedeps.lib_deps}
-    Wire
-    SPI
-    esphome/AsyncTCP-esphome@2.0.1
-    robtillaart/PCF8574@0.3.9
-    adafruit/Adafruit Unified Sensor @ 1.1.13
-    blemasle/MCP23017@2.0.0
-    adafruit/Adafruit BusIO@1.5.0
-    adafruit/Adafruit GFX Library@1.11.9
-    #zinggjm/GxEPD2@1.5.8
-    #https://github.com/ZinggJM/GxEPD2
-    https://github.com/thooge/GxEPD2
-    sstaub/Ticker@4.4.0
-    adafruit/Adafruit BMP280 Library@2.6.2
-    adafruit/Adafruit BME280 Library@2.2.2
-    adafruit/Adafruit BMP085 Library@1.2.1
-    enjoyneering/HTU21D@1.2.1
-    robtillaart/INA226@0.2.0
-    paulstoffregen/OneWire@2.3.8
-    milesburton/DallasTemperature@3.11.0
-    signetica/SunRise@2.0.2
-    adafruit/Adafruit FRAM I2C@^2.0.3
-build_flags=
-    #https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
-#    -D ARDUINO_USB_MODE=1           #0=OTG (to implement other external devices), 1=CDC (is a serial device) 
-    -D ARDUINO_USB_CDC_ON_BOOT=0    #Serial output via RX/TX
-#    -D CORE_DEBUG_LEVEL=1           #Debug level for CPU core via CDC (seral device)
-#    -D TIME=$UNIX_TIME              #Set PC time for RTC (only settable via VSC)
-    -D DISABLE_DIAGNOSTIC_OUTPUT    #Disable diagnostic output for GxEPD2 lib
-    -D BOARD_OBP60S3                #Board OBP60 V2.1 with ESP32S3
-#    -D HARDWARE_V20                 #OBP60 hardware revision V2.0
-#    -D HARDWARE_V21                 #OBP60 hardware revision V2.1
-    -D HARDWARE_LIGHT               #OBP60 hardware clone
-#    -D DISPLAY_GDEW042T2            #old E-Ink display from Waveshare, R10 0.47 ohm
-    -D DISPLAY_GDEY042T81           #new E-Ink display from Waveshare, R10 2.2 ohm
-#    -D DISPLAY_GYE042A87            #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm
-#    -D DISPLAY_SE0420NQ04           #alternativ E-Ink display from SID Technology, R10 2.2 ohm
-    ${env.build_flags}
-#CONFIG_ESP_TASK_WDT_TIMEOUT_S = 10 #Task Watchdog timeout period (seconds) [1...60] 5 default
-#upload_port = /dev/ttyACM0          #OBP60 original
-upload_port = /dev/ttyUSB0          #OBP60 clone
-upload_protocol = esptool           #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27 
-upload_speed = 230400
-monitor_speed = 115200
diff --git a/lib/obp60task/platformio.ini.orig b/lib/obp60task/platformio.ini.orig
deleted file mode 100644
index 4010a824..00000000
--- a/lib/obp60task/platformio.ini.orig
+++ /dev/null
@@ -1,61 +0,0 @@
-[platformio]
-#if you want a pio run to only build
-#your special environments you can set this here
-#by uncommenting the next line
-default_envs = obp60_s3
-[env:obp60_s3]
-platform = espressif32@6.8.1
-board_build.variants_dir = variants
-#board = obp60_s3_n8     #ESP32-S3 N8, 8MB flash, no PSRAM
-#board = obp60_s3_n16    #ESP32-S3 N16,16MB flash, no PSRAM, zero series
-#board = obp60_s3_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM
-board = obp60_s3_n16r8  #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
-#board = obp60_s3_light_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
-#board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
-board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
-framework = arduino
-lib_deps = 
-    ${basedeps.lib_deps}
-    Wire
-    SPI
-    esphome/AsyncTCP-esphome@2.0.1
-    robtillaart/PCF8574@0.3.9
-    adafruit/Adafruit Unified Sensor @ 1.1.13
-    blemasle/MCP23017@2.0.0
-    adafruit/Adafruit BusIO@1.5.0
-    adafruit/Adafruit GFX Library@1.11.9
-    #zinggjm/GxEPD2@1.5.8
-    #https://github.com/ZinggJM/GxEPD2
-    https://github.com/thooge/GxEPD2
-    sstaub/Ticker@4.4.0
-    adafruit/Adafruit BMP280 Library@2.6.2
-    adafruit/Adafruit BME280 Library@2.2.2
-    adafruit/Adafruit BMP085 Library@1.2.1
-    enjoyneering/HTU21D@1.2.1
-    robtillaart/INA226@0.2.0
-    paulstoffregen/OneWire@2.3.8
-    milesburton/DallasTemperature@3.11.0
-    signetica/SunRise@2.0.2
-    adafruit/Adafruit FRAM I2C@^2.0.3
-build_flags=
-    #https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
-#    -D ARDUINO_USB_MODE=1           #0=OTG (to implement other external devices), 1=CDC (is a serial device) 
-#    -D ARDUINO_USB_CDC_ON_BOOT=1    #0=JTAG, 1=CDC (serial device)
-#    -D CORE_DEBUG_LEVEL=1           #Debug level for CPU core via CDC (seral device)
-#    -D TIME=$UNIX_TIME              #Set PC time for RTC (only settable via VSC)
-    -D DISABLE_DIAGNOSTIC_OUTPUT    #Disable diagnostic output for GxEPD2 lib
-    -D BOARD_OBP60S3                #Board OBP60 V2.1 with ESP32S3
-#    -D HARDWARE_V20                 #OBP60 hardware revision V2.0
-    -D HARDWARE_V21                 #OBP60 hardware revision V2.1
-#    -D HARDWARE_LIGHT               #OBP60 hardware clone
-#    -D DISPLAY_GDEW042T2            #old E-Ink display from Waveshare, R10 0.47 ohm
-    -D DISPLAY_GDEY042T81           #new E-Ink display from Waveshare, R10 2.2 ohm
-#    -D DISPLAY_GYE042A87            #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm
-#    -D DISPLAY_SE0420NQ04           #alternativ E-Ink display from SID Technology, R10 2.2 ohm
-    ${env.build_flags}
-#CONFIG_ESP_TASK_WDT_TIMEOUT_S = 10 #Task Watchdog timeout period (seconds) [1...60] 5 default
-upload_port = /dev/ttyACM0          #OBP60 original
-#upload_port = /dev/ttyUSB0          #OBP60 clone
-upload_protocol = esptool           #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27 
-upload_speed = 230400
-monitor_speed = 115200
diff --git a/lib/queue/obp60task/AS5600.cpp b/lib/queue/obp60task/AS5600.cpp
index 2a7081d6..675e47d7 100644
--- a/lib/queue/obp60task/AS5600.cpp
+++ b/lib/queue/obp60task/AS5600.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 /****************************************************
   AMS 5600 class for Arduino platform
diff --git a/lib/queue/obp60task/OBP60Extensions.cpp b/lib/queue/obp60task/OBP60Extensions.cpp
index 6fdfed9e..bdb5d6d3 100644
--- a/lib/queue/obp60task/OBP60Extensions.cpp
+++ b/lib/queue/obp60task/OBP60Extensions.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <Arduino.h>
 #define FASTLED_ALL_PINS_HARDWARE_SPI
diff --git a/lib/queue/obp60task/OBP60Formater.cpp b/lib/queue/obp60task/OBP60Formater.cpp
index 1ddbe76f..9caf6898 100644
--- a/lib/queue/obp60task/OBP60Formater.cpp
+++ b/lib/queue/obp60task/OBP60Formater.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <Arduino.h>
 #include "GwApi.h"
diff --git a/lib/queue/obp60task/OBPSensorTask.cpp b/lib/queue/obp60task/OBPSensorTask.cpp
index 93266087..35eb0bde 100644
--- a/lib/queue/obp60task/OBPSensorTask.cpp
+++ b/lib/queue/obp60task/OBPSensorTask.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include <Adafruit_Sensor.h>            // Adafruit Lib for sensors
 #include <Adafruit_BME280.h>            // Adafruit Lib for BME280
 #include <Adafruit_BMP280.h>            // Adafruit Lib for BMP280
diff --git a/lib/queue/obp60task/PageApparentWind.cpp b/lib/queue/obp60task/PageApparentWind.cpp
index 92849c3d..63a2ad5e 100644
--- a/lib/queue/obp60task/PageApparentWind.cpp
+++ b/lib/queue/obp60task/PageApparentWind.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageBME280.cpp b/lib/queue/obp60task/PageBME280.cpp
index bd6ece72..e865f284 100644
--- a/lib/queue/obp60task/PageBME280.cpp
+++ b/lib/queue/obp60task/PageBME280.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageBattery.cpp b/lib/queue/obp60task/PageBattery.cpp
index a27f88fb..8fdab0db 100644
--- a/lib/queue/obp60task/PageBattery.cpp
+++ b/lib/queue/obp60task/PageBattery.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageBattery2.cpp b/lib/queue/obp60task/PageBattery2.cpp
index 51891afe..c5ab8818 100644
--- a/lib/queue/obp60task/PageBattery2.cpp
+++ b/lib/queue/obp60task/PageBattery2.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageClock.cpp b/lib/queue/obp60task/PageClock.cpp
index 3a56fe34..58925e21 100644
--- a/lib/queue/obp60task/PageClock.cpp
+++ b/lib/queue/obp60task/PageClock.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageDST810.cpp b/lib/queue/obp60task/PageDST810.cpp
index 12c24bb5..6fef4caf 100644
--- a/lib/queue/obp60task/PageDST810.cpp
+++ b/lib/queue/obp60task/PageDST810.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageFourValues.cpp b/lib/queue/obp60task/PageFourValues.cpp
index 4b063008..4928ef99 100644
--- a/lib/queue/obp60task/PageFourValues.cpp
+++ b/lib/queue/obp60task/PageFourValues.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageFourValues2.cpp b/lib/queue/obp60task/PageFourValues2.cpp
index d61b7549..6307f54e 100644
--- a/lib/queue/obp60task/PageFourValues2.cpp
+++ b/lib/queue/obp60task/PageFourValues2.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageGenerator.cpp b/lib/queue/obp60task/PageGenerator.cpp
index 3a496ee3..ff276e59 100644
--- a/lib/queue/obp60task/PageGenerator.cpp
+++ b/lib/queue/obp60task/PageGenerator.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3s
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageKeelPosition.cpp b/lib/queue/obp60task/PageKeelPosition.cpp
index ecdb11e7..d6777695 100644
--- a/lib/queue/obp60task/PageKeelPosition.cpp
+++ b/lib/queue/obp60task/PageKeelPosition.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageOneValue.cpp b/lib/queue/obp60task/PageOneValue.cpp
index 283fc4f5..2ba1bced 100644
--- a/lib/queue/obp60task/PageOneValue.cpp
+++ b/lib/queue/obp60task/PageOneValue.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageRollPitch.cpp b/lib/queue/obp60task/PageRollPitch.cpp
index 9bc9b498..b69795d8 100644
--- a/lib/queue/obp60task/PageRollPitch.cpp
+++ b/lib/queue/obp60task/PageRollPitch.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageRudderPosition.cpp b/lib/queue/obp60task/PageRudderPosition.cpp
index 02125a00..1799d9c4 100644
--- a/lib/queue/obp60task/PageRudderPosition.cpp
+++ b/lib/queue/obp60task/PageRudderPosition.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageSolar.cpp b/lib/queue/obp60task/PageSolar.cpp
index 06b50223..deff7caa 100644
--- a/lib/queue/obp60task/PageSolar.cpp
+++ b/lib/queue/obp60task/PageSolar.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageThreeValues.cpp b/lib/queue/obp60task/PageThreeValues.cpp
index 8953c9b1..73097564 100644
--- a/lib/queue/obp60task/PageThreeValues.cpp
+++ b/lib/queue/obp60task/PageThreeValues.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageTwoValues.cpp b/lib/queue/obp60task/PageTwoValues.cpp
index 506ded2b..1a260805 100644
--- a/lib/queue/obp60task/PageTwoValues.cpp
+++ b/lib/queue/obp60task/PageTwoValues.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageVoltage.cpp b/lib/queue/obp60task/PageVoltage.cpp
index 8e280db2..1b31c18c 100644
--- a/lib/queue/obp60task/PageVoltage.cpp
+++ b/lib/queue/obp60task/PageVoltage.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageWhite.cpp b/lib/queue/obp60task/PageWhite.cpp
index e9417320..a460d5d6 100644
--- a/lib/queue/obp60task/PageWhite.cpp
+++ b/lib/queue/obp60task/PageWhite.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/PageWindRose.cpp b/lib/queue/obp60task/PageWindRose.cpp
index fd8f55ac..51552155 100644
--- a/lib/queue/obp60task/PageWindRose.cpp
+++ b/lib/queue/obp60task/PageWindRose.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
diff --git a/lib/queue/obp60task/obp60task.cpp b/lib/queue/obp60task/obp60task.cpp
index 7127c057..9b905708 100644
--- a/lib/queue/obp60task/obp60task.cpp
+++ b/lib/queue/obp60task/obp60task.cpp
@@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include "obp60task.h"
 #include "Pagedata.h"                   // Data exchange for pages
 #include "OBP60Hardware.h"              // PIN definitions
diff --git a/lib/queue/obp60task/obp60task.h b/lib/queue/obp60task/obp60task.h
index e1842204..d998b3ad 100644
--- a/lib/queue/obp60task/obp60task.h
+++ b/lib/queue/obp60task/obp60task.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "GwApi.h"
 //we only compile for some boards
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
     #define USBSerial Serial
     // CAN NMEA2000
     #define ESP32_CAN_TX_PIN 46
diff --git a/variants/obp60s3_light/pins_arduino.h b/variants/obp40s3/pins_arduino.h
similarity index 98%
rename from variants/obp60s3_light/pins_arduino.h
rename to variants/obp40s3/pins_arduino.h
index 3e1fdeb2..267926ec 100644
--- a/variants/obp60s3_light/pins_arduino.h
+++ b/variants/obp40s3/pins_arduino.h
@@ -12,7 +12,7 @@
 #define NUM_DIGITAL_PINS        48
 #define NUM_ANALOG_INPUTS       20
 
-// Multi Function Display OBP60 V2.0
+// Multi Function Display OBP40 V1.0
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 #define LED_BUILTIN LED_BUILTIN