diff --git a/README.md b/README.md
index dc33da57b..55bb426c3 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,12 @@
-# Tasmota ESP32 Arduino Lib Builder [![Build Status](https://travis-ci.org/espressif/esp32-arduino-lib-builder.svg?branch=master)](https://travis-ci.org/espressif/esp32-arduino-lib-builder)
+# Tasmota ESP32 Arduino Lib Builder [![ESP32 builder](https://github.com/Jason2866/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/Jason2866/esp32-arduino-lib-builder/actions/workflows/push.yml)
 
-This repository contains the scripts that produce the libraries included with esp32-arduino.
+This repository contains the scripts that produce the libraries included with Tasmota esp32-arduino.
 
-Tested on Ubuntu (32 and 64 bit), Raspberry Pi and MacOS.
-
-### Build on Ubuntu and Raspberry Pi
+### Build on Ubuntu
 ```bash
 sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache
 sudo pip install --upgrade pip
-git clone https://github.com/espressif/esp32-arduino-lib-builder
+git clone https://github.com/Jason2866/esp32-arduino-lib-builder
 cd esp32-arduino-lib-builder
 ./build.sh
 ```
diff --git a/components/fb_gfx/fb_gfx.c b/components/fb_gfx/fb_gfx.c
index 7f0c66026..ab373c16f 100644
--- a/components/fb_gfx/fb_gfx.c
+++ b/components/fb_gfx/fb_gfx.c
@@ -38,17 +38,24 @@ typedef struct { // Data stored for FONT AS A WHOLE:
 
 void fb_gfx_fillRect(fb_data_t *fb, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color)
 {
-    int32_t line_step = (fb->width - w) * 3;
-    uint8_t *data = fb->data + ((x + (y * fb->width)) * 3);
+    int32_t line_step = (fb->width - w) * fb->bytes_per_pixel;
+    uint8_t *data = fb->data + ((x + (y * fb->width)) * fb->bytes_per_pixel);
     uint8_t c0 = color >> 16;
     uint8_t c1 = color >> 8;
     uint8_t c2 = color;
     for (int i=0; i<h; i++){
         for (int j=0; j<w; j++){
-            data[0] = c0;
-            data[1] = c1;
-            data[2] = c2;
-            data+=3;
+            if(fb->bytes_per_pixel == 2){
+                data[0] = c1;
+                data[1] = c2;
+            } else if(fb->bytes_per_pixel == 1){
+                data[0] = c2;
+            } else {
+                data[0] = c0;
+                data[1] = c1;
+                data[2] = c2;
+            }
+            data+=fb->bytes_per_pixel;
         }
         data += line_step;
     }
diff --git a/components/fb_gfx/include/fb_gfx.h b/components/fb_gfx/include/fb_gfx.h
index 079ff7bfe..158c80f6b 100644
--- a/components/fb_gfx/include/fb_gfx.h
+++ b/components/fb_gfx/include/fb_gfx.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
     typedef enum {
-        FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565
+        FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565, FB_GRAY
     } fb_format_t;
 
     typedef struct {
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index 3ed646c21..b0694e949 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -27,10 +27,9 @@ CONFIG_SPIRAM_BOOT_INIT=y
 # CONFIG_SPIRAM_MEMTEST is not set
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
-CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
 CONFIG_D0WD_PSRAM_CLK_IO=5
-CONFIG_D0WD_PSRAM_CS_IO=18
+CONFIG_D0WD_PSRAM_CS_IO=1
 CONFIG_ESP32_XTAL_FREQ_AUTO=y
 CONFIG_ETH_SPI_ETHERNET_DM9051=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
@@ -41,6 +40,7 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000
 CONFIG_ESP_TASK_WDT_PANIC=y
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=10
+# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8
@@ -79,7 +79,6 @@ CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
-CONFIG_SPI_FLASH_ROM_IMPL=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
index 9d4f23b2e..8e2bd2d12 100644
--- a/configs/defconfig.esp32c3
+++ b/configs/defconfig.esp32c3
@@ -61,7 +61,6 @@ CONFIG_LWIP_DHCP_OPTIONS_LEN=128
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_NEWLIB_NANO_FORMAT=y
-CONFIG_SPI_FLASH_ROM_IMPL=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 # CONFIG_UNITY_ENABLE_FLOAT is not set
 # CONFIG_UNITY_ENABLE_DOUBLE is not set
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
index f00dd53cc..4a2973315 100644
--- a/configs/defconfig.esp32s2
+++ b/configs/defconfig.esp32s2
@@ -71,7 +71,6 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
-CONFIG_SPI_FLASH_ROM_IMPL=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index 53c5d2d6c..4254c69ee 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -97,7 +97,6 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
-CONFIG_SPI_FLASH_ROM_IMPL=y
 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
diff --git a/tools/config.sh b/tools/config.sh
index 1e7dbe09a..c9da545dd 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -118,4 +118,3 @@ function git_create_pr(){ # git_create_pr <branch> <title>
 	local done_pr=`echo "$git_create_pr_res" | jq -r '.title'`
 	if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi
 }
-