diff --git a/code/sdkconfig.defaults b/code/sdkconfig.defaults
index e41514a1..8e7fbc64 100644
--- a/code/sdkconfig.defaults
+++ b/code/sdkconfig.defaults
@@ -109,6 +109,11 @@ CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
 
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
 CONFIG_HTTPD_PURGE_BUF_LEN=16
+<<<<<<< Updated upstream
+=======
+CONFIG_HTTPD_WS_SUPPORT=y
+CONFIG_LWIP_MAX_SOCKETS=12
+>>>>>>> Stashed changes
 
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
diff --git a/images/Flowstate_initialization.xcf b/images/Flowstate_initialization.xcf
index 6a54f159..ddfedf70 100644
Binary files a/images/Flowstate_initialization.xcf and b/images/Flowstate_initialization.xcf differ
diff --git a/images/Flowstate_initialization_delayed.xcf b/images/Flowstate_initialization_delayed.xcf
index 80e61e5d..2e465cf4 100644
Binary files a/images/Flowstate_initialization_delayed.xcf and b/images/Flowstate_initialization_delayed.xcf differ
diff --git a/images/Flowstate_take_image.xcf b/images/Flowstate_take_image.xcf
index 961597d5..1fe747f6 100644
Binary files a/images/Flowstate_take_image.xcf and b/images/Flowstate_take_image.xcf differ
diff --git a/images/icon/logo.png b/images/icon/logo.png
new file mode 100644
index 00000000..194cb4af
Binary files /dev/null and b/images/icon/logo.png differ
diff --git a/sd-card/html/Flowstate_initialization.jpg b/sd-card/html/Flowstate_initialization.jpg
index b490fc47..54d9ccfd 100644
Binary files a/sd-card/html/Flowstate_initialization.jpg and b/sd-card/html/Flowstate_initialization.jpg differ
diff --git a/sd-card/html/Flowstate_initialization_delayed.jpg b/sd-card/html/Flowstate_initialization_delayed.jpg
index 4be8f74f..bce3d2c5 100644
Binary files a/sd-card/html/Flowstate_initialization_delayed.jpg and b/sd-card/html/Flowstate_initialization_delayed.jpg differ
diff --git a/sd-card/html/Flowstate_take_image.jpg b/sd-card/html/Flowstate_take_image.jpg
index dbc4feee..8ce51e3e 100644
Binary files a/sd-card/html/Flowstate_take_image.jpg and b/sd-card/html/Flowstate_take_image.jpg differ