diff --git a/lib_standalone/Arduino.cpp b/lib_standalone/Arduino.cpp
index 2afc4e78f..314f01601 100644
--- a/lib_standalone/Arduino.cpp
+++ b/lib_standalone/Arduino.cpp
@@ -17,17 +17,16 @@
 
 #ifdef EMSESP_STANDALONE
 
-#include <Arduino.h>
+
 #include <stdio.h>
 #include <stdarg.h>
-
 #include <iostream>
 #include <thread>
 #include <atomic>
-
 #include <string>
 
-#include <Network.h>
+#include "Arduino.h"
+#include "Network.h"
 
 NativeConsole Serial;
 
diff --git a/lib_standalone/Arduino.h b/lib_standalone/Arduino.h
index 83a93a166..b500609ab 100644
--- a/lib_standalone/Arduino.h
+++ b/lib_standalone/Arduino.h
@@ -25,16 +25,14 @@
 #include <cstring>
 #include <string>
 #include <math.h>
-
-#include <algorithm> // for count_if
-
+#include <algorithm>
 #include <Print.h>
 #include <Printable.h>
 #include <Stream.h>
-#include <WString.h>
-
 #include <iostream>
 
+#include "WString.h"
+
 typedef double double_t;
 
 #define ICACHE_FLASH_ATTR
@@ -188,6 +186,4 @@ void yield(void);
 void setup(void);
 void loop(void);
 
-
-
 #endif
diff --git a/lib_standalone/AsyncJson.h b/lib_standalone/AsyncJson.h
index 676062f34..e3af4f7a8 100644
--- a/lib_standalone/AsyncJson.h
+++ b/lib_standalone/AsyncJson.h
@@ -1,8 +1,10 @@
 
 #ifndef ASYNC_JSON_H_
 #define ASYNC_JSON_H_
+
 #include <ArduinoJson.h>
-#include <ESPAsyncWebServer.h>
+
+#include "ESPAsyncWebServer.h"
 
 #define DYNAMIC_JSON_DOCUMENT_SIZE 1024
 
diff --git a/lib_standalone/AsyncTCP.h b/lib_standalone/AsyncTCP.h
index c06bbd0a5..58307baab 100644
--- a/lib_standalone/AsyncTCP.h
+++ b/lib_standalone/AsyncTCP.h
@@ -2,6 +2,7 @@
 #define ASYNCTCP_H_
 
 #include "Arduino.h"
+
 #include <functional>
 
 class AsyncClient;
diff --git a/lib_standalone/ESP8266React.h b/lib_standalone/ESP8266React.h
index ea1b198e0..ca7b194b3 100644
--- a/lib_standalone/ESP8266React.h
+++ b/lib_standalone/ESP8266React.h
@@ -1,21 +1,19 @@
 #ifndef ESP8266React_h
 #define ESP8266React_h
 
-#include <Arduino.h>
-
-#include <ArduinoJson.h>
-#include <AsyncJson.h>
-
-#include <espMqttClient.h>
-#include <ESPAsyncWebServer.h>
-
 #include <list>
 
-#include <FS.h>
-#include <SecurityManager.h>
-#include <SecuritySettingsService.h>
-#include <StatefulService.h>
-#include <Network.h>
+#include "Arduino.h"
+#include "ArduinoJson.h"
+#include "AsyncJson.h"
+#include "ESPAsyncWebServer.h"
+#include "FS.h"
+#include "SecurityManager.h"
+#include "SecuritySettingsService.h"
+#include "StatefulService.h"
+#include "Network.h"
+
+#include <espMqttClient.h>
 
 #define AP_SETTINGS_FILE "/config/apSettings.json"
 #define MQTT_SETTINGS_FILE "/config/mqttSettings.json"
@@ -104,7 +102,6 @@ class ESP8266React {
         , _securitySettingsService(server, fs){};
 
     void begin() {
-        // initialize mqtt
         _mqttClient = new espMqttClient();
     };
     void loop(){};
diff --git a/lib_standalone/ESPAsyncWebServer.h b/lib_standalone/ESPAsyncWebServer.h
index 50b341849..54d431706 100644
--- a/lib_standalone/ESPAsyncWebServer.h
+++ b/lib_standalone/ESPAsyncWebServer.h
@@ -2,9 +2,9 @@
 #define _ESPAsyncWebServer_H_
 
 #include "Arduino.h"
+#include "AsyncTCP.h"
 
 #include <functional>
-#include <AsyncTCP.h>
 #include <ArduinoJson.h>
 
 class AsyncWebServer;
diff --git a/lib_standalone/ESPmDNS.h b/lib_standalone/ESPmDNS.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib_standalone/FS.h b/lib_standalone/FS.h
index d85355f22..f3e3ef2e8 100644
--- a/lib_standalone/FS.h
+++ b/lib_standalone/FS.h
@@ -21,9 +21,10 @@
 #ifndef FS_H
 #define FS_H
 
+#include "Arduino.h"
+
 #include <memory>
 #include <string>
-#include <Arduino.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <dirent.h>
diff --git a/lib_standalone/FSPersistence.h b/lib_standalone/FSPersistence.h
index 12fffd5d8..74672aa84 100644
--- a/lib_standalone/FSPersistence.h
+++ b/lib_standalone/FSPersistence.h
@@ -1,8 +1,8 @@
 #ifndef FSPersistence_h
 #define FSPersistence_h
 
-#include <StatefulService.h>
-#include <FS.h>
+#include "StatefulService.h"
+#include "FS.h"
 
 template <class T>
 class FSPersistence {
diff --git a/lib_standalone/HttpEndpoint.h b/lib_standalone/HttpEndpoint.h
index e3fae9ba0..e6efe4a7d 100644
--- a/lib_standalone/HttpEndpoint.h
+++ b/lib_standalone/HttpEndpoint.h
@@ -3,11 +3,11 @@
 
 #include <functional>
 
-#include <AsyncJson.h>
-#include <ESPAsyncWebServer.h>
+#include "AsyncJson.h"
+#include "ESPAsyncWebServer.h"
 
-#include <SecurityManager.h>
-#include <StatefulService.h>
+#include "SecurityManager.h"
+#include "StatefulService.h"
 
 #define HTTP_ENDPOINT_ORIGIN_ID "http"
 
diff --git a/lib_standalone/LittleFS.cpp b/lib_standalone/LittleFS.cpp
index 36e635fa3..f207f88f0 100644
--- a/lib_standalone/LittleFS.cpp
+++ b/lib_standalone/LittleFS.cpp
@@ -17,9 +17,9 @@
  */
 #ifdef ENV_NATIVE
 
-#include <Arduino.h>
-#include <FS.h>
-#include <LittleFS.h>
+#include "Arduino.h"
+#include "FS.h"
+#include "LittleFS.h"
 
 fs::LittleFSFS LittleFS;
 
diff --git a/lib_standalone/Network.h b/lib_standalone/Network.h
index c7a750180..7dad09f10 100644
--- a/lib_standalone/Network.h
+++ b/lib_standalone/Network.h
@@ -1,7 +1,8 @@
 #ifndef Network_h
 #define Network_h
 
-#include <Arduino.h>
+#include "Arduino.h"
+
 #include <functional>
 #include <IPAddress.h>
 
diff --git a/lib_standalone/Print.h b/lib_standalone/Print.h
index 548a6fa26..d8f40e25e 100644
--- a/lib_standalone/Print.h
+++ b/lib_standalone/Print.h
@@ -28,7 +28,8 @@
 #include <string>
 
 #include <Printable.h>
-#include <WString.h>
+
+#include "WString.h"
 
 int vsnprintf_P(char * str, size_t size, const char * format, va_list ap);
 
diff --git a/lib_standalone/SecurityManager.h b/lib_standalone/SecurityManager.h
index 80f83d049..5f8a9e6fd 100644
--- a/lib_standalone/SecurityManager.h
+++ b/lib_standalone/SecurityManager.h
@@ -1,18 +1,15 @@
 #ifndef SecurityManager_h
 #define SecurityManager_h
 
-#include <Arduino.h>
-#include <Features.h>
-#include <ESPAsyncWebServer.h>
-#include <AsyncJson.h>
+#include "Arduino.h"
+#include "Features.h"
+#include "ESPAsyncWebServer.h"
+#include "AsyncJson.h"
+
 #include <list>
 
-#ifndef FACTORY_JWT_SECRET
-#define FACTORY_JWT_SECRET ESPUtils::defaultDeviceValue()
-#endif
-
+#define FACTORY_JWT_SECRET "ems-esp"
 #define ACCESS_TOKEN_PARAMATER "access_token"
-
 #define AUTHORIZATION_HEADER "Authorization"
 #define AUTHORIZATION_HEADER_PREFIX "Bearer "
 #define AUTHORIZATION_HEADER_PREFIX_LEN 7
diff --git a/lib_standalone/SecuritySettingsService.cpp b/lib_standalone/SecuritySettingsService.cpp
index 58b894995..862adc5e3 100644
--- a/lib_standalone/SecuritySettingsService.cpp
+++ b/lib_standalone/SecuritySettingsService.cpp
@@ -1,6 +1,6 @@
 #ifdef EMSESP_STANDALONE
 
-#include <SecuritySettingsService.h>
+#include "SecuritySettingsService.h"
 
 User ADMIN_USER = User(FACTORY_ADMIN_USERNAME, FACTORY_ADMIN_PASSWORD, true);
 
diff --git a/lib_standalone/SecuritySettingsService.h b/lib_standalone/SecuritySettingsService.h
index cf8dca1d9..d4176462e 100644
--- a/lib_standalone/SecuritySettingsService.h
+++ b/lib_standalone/SecuritySettingsService.h
@@ -1,10 +1,10 @@
 #ifndef SecuritySettingsService_h
 #define SecuritySettingsService_h
 
-#include <Features.h>
-#include <SecurityManager.h>
-#include <HttpEndpoint.h>
-#include <FSPersistence.h>
+#include "Features.h"
+#include "SecurityManager.h"
+#include "HttpEndpoint.h"
+#include "FSPersistence.h"
 
 #ifndef FACTORY_ADMIN_USERNAME
 #define FACTORY_ADMIN_USERNAME "admin"
diff --git a/lib_standalone/StatefulService.cpp b/lib_standalone/StatefulService.cpp
index ece6b1fb3..d5f847aba 100644
--- a/lib_standalone/StatefulService.cpp
+++ b/lib_standalone/StatefulService.cpp
@@ -1,3 +1,3 @@
-#include <StatefulService.h>
+#include "StatefulService.h"
 
 update_handler_id_t StateUpdateHandlerInfo::currentUpdatedHandlerId = 0;
diff --git a/lib_standalone/StatefulService.h b/lib_standalone/StatefulService.h
index ceb2ae965..2a1a04376 100644
--- a/lib_standalone/StatefulService.h
+++ b/lib_standalone/StatefulService.h
@@ -1,7 +1,8 @@
 #ifndef StatefulService_h
 #define StatefulService_h
 
-#include <Arduino.h>
+#include "Arduino.h"
+
 #include <ArduinoJson.h>
 
 #include <list>
diff --git a/lib_standalone/WString.cpp b/lib_standalone/WString.cpp
index 853c80c63..994fe9817 100644
--- a/lib_standalone/WString.cpp
+++ b/lib_standalone/WString.cpp
@@ -1,7 +1,7 @@
 
 #ifdef EMSESP_STANDALONE
 
-#include <Arduino.h>
+#include "Arduino.h"
 #include "WString.h"
 
 /*
diff --git a/lib_standalone/WebSocketTxRx.h b/lib_standalone/WebSocketTxRx.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib_standalone/emsuart_standalone.h b/lib_standalone/emsuart_standalone.h
index ab63a9a0e..844de9cae 100644
--- a/lib_standalone/emsuart_standalone.h
+++ b/lib_standalone/emsuart_standalone.h
@@ -19,7 +19,7 @@
 #ifndef EMSESP_EMSUART_H
 #define EMSESP_EMSUART_H
 
-#include <Arduino.h>
+#include "Arduino.h"
 
 namespace emsesp {