diff --git a/wled00/json.cpp b/wled00/json.cpp
index dcd6f1e59..e63a09ee9 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -1051,10 +1051,10 @@ void serveJson(AsyncWebServerRequest* request)
   }
   #endif
   else if (url.indexOf("pal") > 0) {
-    request->send_P(200, "application/json", JSON_palette_names);
+    request->send_P(200, F("application/json"), JSON_palette_names);
     return;
   }
-  else if (url.indexOf("cfg") > 0 && handleFileRead(request, "/cfg.json")) {
+  else if (url.indexOf("cfg") > 0 && handleFileRead(request, F("/cfg.json"))) {
     return;
   }
   else if (url.length() > 6) { //not just /json
@@ -1081,7 +1081,7 @@ void serveJson(AsyncWebServerRequest* request)
     case JSON_PATH_NODES:
       serializeNodes(lDoc); break;
     case JSON_PATH_PALETTES:
-      serializePalettes(lDoc, request->hasParam("page") ? request->getParam("page")->value().toInt() : 0); break;
+      serializePalettes(lDoc, request->hasParam(F("page")) ? request->getParam(F("page"))->value().toInt() : 0); break;
     case JSON_PATH_EFFECTS:
       serializeModeNames(lDoc); break;
     case JSON_PATH_FXDATA:
@@ -1150,7 +1150,7 @@ bool serveLiveLeds(AsyncWebServerRequest* request, uint32_t wsClient)
   oappendi(n);
   oappend("}");
   if (request) {
-    request->send(200, "application/json", buffer);
+    request->send(200, F("application/json"), buffer);
   }
   #ifdef WLED_ENABLE_WEBSOCKETS
   else {
diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp
index eb4284097..385f87fee 100644
--- a/wled00/wled_server.cpp
+++ b/wled00/wled_server.cpp
@@ -80,13 +80,13 @@ void createEditHandler(bool enable) {
       editHandler = &server.addHandler(new SPIFFSEditor("","",WLED_FS));//http_username,http_password));
       #endif
     #else
-      editHandler = &server.on("/edit", HTTP_GET, [](AsyncWebServerRequest *request){
+      editHandler = &server.on(SET_F("/edit"), HTTP_GET, [](AsyncWebServerRequest *request){
         serveMessage(request, 501, "Not implemented", F("The FS editor is disabled in this build."), 254);
       });
     #endif
   } else {
-    editHandler = &server.on("/edit", HTTP_ANY, [](AsyncWebServerRequest *request){
-      serveMessage(request, 401, "Access Denied", FPSTR(s_unlock_cfg), 254);
+    editHandler = &server.on(SET_F("/edit"), HTTP_ANY, [](AsyncWebServerRequest *request){
+      serveMessage(request, 401, F("Access Denied"), FPSTR(s_unlock_cfg), 254);
     });
   }
 }
@@ -95,11 +95,11 @@ bool captivePortal(AsyncWebServerRequest *request)
 {
   if (ON_STA_FILTER(request)) return false; //only serve captive in AP mode
   String hostH;
-  if (!request->hasHeader("Host")) return false;
-  hostH = request->getHeader("Host")->value();
+  if (!request->hasHeader(F("Host"))) return false;
+  hostH = request->getHeader(F("Host"))->value();
 
-  if (!isIp(hostH) && hostH.indexOf("wled.me") < 0 && hostH.indexOf(cmDNS) < 0) {
-    DEBUG_PRINTLN("Captive portal");
+  if (!isIp(hostH) && hostH.indexOf(F("wled.me")) < 0 && hostH.indexOf(cmDNS) < 0) {
+    DEBUG_PRINTLN(F("Captive portal"));
     AsyncWebServerResponse *response = request->beginResponse(302);
     response->addHeader(F("Location"), F("http://4.3.2.1"));
     request->send(response);
@@ -117,7 +117,7 @@ void initServer()
 
 #ifdef WLED_ENABLE_WEBSOCKETS
   #ifndef WLED_DISABLE_2D
-  server.on("/liveview2D", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/liveview2D"), HTTP_GET, [](AsyncWebServerRequest *request){
     if (handleIfNoneMatchCacheHeader(request)) return;
     AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_liveviewws2D, PAGE_liveviewws2D_length);
     response->addHeader(FPSTR(s_content_enc),"gzip");
@@ -126,7 +126,7 @@ void initServer()
   });
   #endif
 #endif
-  server.on("/liveview", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/liveview"), HTTP_GET, [](AsyncWebServerRequest *request){
     if (handleIfNoneMatchCacheHeader(request)) return;
     AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_liveview, PAGE_liveview_length);
     response->addHeader(FPSTR(s_content_enc),"gzip");
@@ -135,13 +135,13 @@ void initServer()
   });
 
   //settings page
-  server.on("/settings", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/settings"), HTTP_GET, [](AsyncWebServerRequest *request){
     serveSettings(request);
   });
 
   // "/settings/settings.js&p=x" request also handled by serveSettings()
 
-  server.on("/style.css", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/style.css"), HTTP_GET, [](AsyncWebServerRequest *request){
     if (handleIfNoneMatchCacheHeader(request)) return;
     AsyncWebServerResponse *response = request->beginResponse_P(200, "text/css", PAGE_settingsCss, PAGE_settingsCss_length);
     response->addHeader(FPSTR(s_content_enc),"gzip");
@@ -149,31 +149,31 @@ void initServer()
     request->send(response);
   });
 
-  server.on("/favicon.ico", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/favicon.ico"), HTTP_GET, [](AsyncWebServerRequest *request){
     if(!handleFileRead(request, "/favicon.ico"))
     {
       request->send_P(200, "image/x-icon", favicon, 156);
     }
   });
 
-  server.on("/welcome", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/welcome"), HTTP_GET, [](AsyncWebServerRequest *request){
     serveSettings(request);
   });
 
-  server.on("/reset", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/reset"), HTTP_GET, [](AsyncWebServerRequest *request){
     serveMessage(request, 200,F("Rebooting now..."),F("Please wait ~10 seconds..."),129);
     doReboot = true;
   });
 
-  server.on("/settings", HTTP_POST, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/settings"), HTTP_POST, [](AsyncWebServerRequest *request){
     serveSettings(request, true);
   });
 
-  server.on("/json", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/json"), HTTP_GET, [](AsyncWebServerRequest *request){
     serveJson(request);
   });
 
-  AsyncCallbackJsonWebHandler* handler = new AsyncCallbackJsonWebHandler("/json", [](AsyncWebServerRequest *request) {
+  AsyncCallbackJsonWebHandler* handler = new AsyncCallbackJsonWebHandler(F("/json"), [](AsyncWebServerRequest *request) {
     bool verboseResponse = false;
     bool isConfig = false;
 
@@ -222,15 +222,15 @@ void initServer()
   }, JSON_BUFFER_SIZE);
   server.addHandler(handler);
 
-  server.on("/version", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/version"), HTTP_GET, [](AsyncWebServerRequest *request){
     request->send(200, "text/plain", (String)VERSION);
   });
 
-  server.on("/uptime", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/uptime"), HTTP_GET, [](AsyncWebServerRequest *request){
     request->send(200, "text/plain", (String)millis());
   });
 
-  server.on("/freeheap", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/freeheap"), HTTP_GET, [](AsyncWebServerRequest *request){
     request->send(200, "text/plain", (String)ESP.getFreeHeap());
   });
 
@@ -244,17 +244,17 @@ void initServer()
   });
 #endif
 
-  server.on("/teapot", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/teapot"), HTTP_GET, [](AsyncWebServerRequest *request){
     serveMessage(request, 418, F("418. I'm a teapot."), F("(Tangible Embedded Advanced Project Of Twinkling)"), 254);
   });
 
-  server.on("/upload", HTTP_POST, [](AsyncWebServerRequest *request) {},
+  server.on(SET_F("/upload"), HTTP_POST, [](AsyncWebServerRequest *request) {},
         [](AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data,
                       size_t len, bool final) {handleUpload(request, filename, index, data, len, final);}
   );
 
 #ifdef WLED_ENABLE_SIMPLE_UI
-  server.on("/simple.htm", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/simple.htm"), HTTP_GET, [](AsyncWebServerRequest *request){
     if (handleFileRead(request, "/simple.htm")) return;
     if (handleIfNoneMatchCacheHeader(request)) return;
     AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_simple, PAGE_simple_L);
@@ -264,14 +264,14 @@ void initServer()
   });
 #endif
 
-  server.on("/iro.js", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/iro.js"), HTTP_GET, [](AsyncWebServerRequest *request){
     AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", iroJs, iroJs_length);
     response->addHeader(FPSTR(s_content_enc),"gzip");
     setStaticContentCacheHeaders(response);
     request->send(response);
   });
 
-  server.on("/rangetouch.js", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/rangetouch.js"), HTTP_GET, [](AsyncWebServerRequest *request){
     AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", rangetouchJs, rangetouchJs_length);
     response->addHeader(FPSTR(s_content_enc),"gzip");
     setStaticContentCacheHeaders(response);
@@ -282,20 +282,20 @@ void initServer()
 
 #ifndef WLED_DISABLE_OTA
   //init ota page
-  server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/update"), HTTP_GET, [](AsyncWebServerRequest *request){
     if (otaLock) {
-      serveMessage(request, 401, "Access Denied", FPSTR(s_unlock_ota), 254);
+      serveMessage(request, 401, F("Access Denied"), FPSTR(s_unlock_ota), 254);
     } else
       serveSettings(request); // checks for "upd" in URL and handles PIN
   });
 
-  server.on("/update", HTTP_POST, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/update"), HTTP_POST, [](AsyncWebServerRequest *request){
     if (!correctPIN) {
       serveSettings(request, true); // handle PIN page POST request
       return;
     }
     if (otaLock) {
-      serveMessage(request, 401, "Access Denied", FPSTR(s_unlock_ota), 254);
+      serveMessage(request, 401, F("Access Denied"), FPSTR(s_unlock_ota), 254);
       return;
     }
     if (Update.hasError()) {
@@ -328,19 +328,19 @@ void initServer()
     }
   });
 #else
-  server.on("/update", HTTP_GET, [](AsyncWebServerRequest *request){
-    serveMessage(request, 501, "Not implemented", F("OTA updating is disabled in this build."), 254);
+  server.on(SET_F("/update"), HTTP_GET, [](AsyncWebServerRequest *request){
+    serveMessage(request, 501, F("Not implemented"), F("OTA updating is disabled in this build."), 254);
   });
 #endif
 
 
   #ifdef WLED_ENABLE_DMX
-  server.on("/dmxmap", HTTP_GET, [](AsyncWebServerRequest *request){
+  server.on(SET_F("/dmxmap"), HTTP_GET, [](AsyncWebServerRequest *request){
     request->send_P(200, "text/html", PAGE_dmxmap     , dmxProcessor);
   });
   #else
-  server.on("/dmxmap", HTTP_GET, [](AsyncWebServerRequest *request){
-    serveMessage(request, 501, "Not implemented", F("DMX support is not enabled in this build."), 254);
+  server.on(SET_F("/dmxmap"), HTTP_GET, [](AsyncWebServerRequest *request){
+    serveMessage(request, 501, F("Not implemented"), F("DMX support is not enabled in this build."), 254);
   });
   #endif
 
@@ -354,8 +354,8 @@ void initServer()
   });
 
   #ifdef WLED_ENABLE_PIXART
-  server.on("/pixart.htm", HTTP_GET, [](AsyncWebServerRequest *request){
-    if (handleFileRead(request, "/pixart.htm")) return;
+  server.on(SET_F("/pixart.htm"), HTTP_GET, [](AsyncWebServerRequest *request){
+    if (handleFileRead(request, F("/pixart.htm"))) return;
     if (handleIfNoneMatchCacheHeader(request)) return;
     AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_pixart, PAGE_pixart_L);
     response->addHeader(FPSTR(s_content_enc),"gzip");
@@ -365,8 +365,8 @@ void initServer()
   #endif
 
   #ifndef WLED_DISABLE_PXMAGIC
-  server.on("/pxmagic.htm", HTTP_GET, [](AsyncWebServerRequest *request){
-    if (handleFileRead(request, "/pxmagic.htm")) return;
+  server.on(SET_F("/pxmagic.htm"), HTTP_GET, [](AsyncWebServerRequest *request){
+    if (handleFileRead(request, F("/pxmagic.htm"))) return;
     if (handleIfNoneMatchCacheHeader(request)) return;
     AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_pxmagic, PAGE_pxmagic_L);
     response->addHeader(FPSTR(s_content_enc),"gzip");
@@ -375,8 +375,8 @@ void initServer()
   });
   #endif
 
-  server.on("/cpal.htm", HTTP_GET, [](AsyncWebServerRequest *request){
-    if (handleFileRead(request, "/cpal.htm")) return;
+  server.on(SET_F("/cpal.htm"), HTTP_GET, [](AsyncWebServerRequest *request){
+    if (handleFileRead(request, F("/cpal.htm"))) return;
     if (handleIfNoneMatchCacheHeader(request)) return;
     AsyncWebServerResponse *response = request->beginResponse_P(200, "text/html", PAGE_cpal, PAGE_cpal_L);
     response->addHeader(FPSTR(s_content_enc),"gzip");
@@ -442,7 +442,7 @@ void setStaticContentCacheHeaders(AsyncWebServerResponse *response)
 
 void serveIndex(AsyncWebServerRequest* request)
 {
-  if (handleFileRead(request, "/index.htm")) return;
+  if (handleFileRead(request, F("/index.htm"))) return;
 
   if (handleIfNoneMatchCacheHeader(request)) return;
 
@@ -586,7 +586,7 @@ void serveSettings(AsyncWebServerRequest* request, bool post)
   // if OTA locked or too frequent PIN entry requests fail hard
   if ((subPage == SUBPAGE_WIFI && wifiLock && otaLock) || (post && !correctPIN && millis()-lastEditTime < PIN_RETRY_COOLDOWN))
   {
-    serveMessage(request, 401, "Access Denied", FPSTR(s_unlock_ota), 254); return;
+    serveMessage(request, 401, F("Access Denied"), FPSTR(s_unlock_ota), 254); return;
   }
 
   if (post) { //settings/set POST request, saving