diff --git a/wled00/NpbWrapper.h b/wled00/NpbWrapper.h
index 0f0ce4e0..359036d1 100644
--- a/wled00/NpbWrapper.h
+++ b/wled00/NpbWrapper.h
@@ -6,13 +6,12 @@
//see https://github.com/Aircoookie/WLED/issues/2 for flicker free ESP32 support
//PIN CONFIGURATION
-#define LEDPIN 3 //strip pin. Any for ESP32, gpio2 is recommended for ESP8266
+#define LEDPIN 2 //strip pin. Any for ESP32, gpio2 or 3 is recommended for ESP8266 (gpio2/3 are labeled D4/RX on NodeMCU and Wemos)
#define BTNPIN 0 //button pin. Needs to have pullup (gpio0 recommended)
#define IR_PIN 4 //infrared pin.
#define AUXPIN 15 //unused auxiliary output pin
-
//automatically uses the right driver method for each platform
#ifdef ARDUINO_ARCH_ESP32
#ifdef WORKAROUND_ESP32_BITBANG
diff --git a/wled00/html_classic.h b/wled00/html_classic.h
index 0cdd8c41..875318b9 100644
--- a/wled00/html_classic.h
+++ b/wled00/html_classic.h
@@ -10,9 +10,9 @@
* 4. update length value
*/
-const uint16_t PAGE_index0_L = 10264;
+const uint16_t PAGE_index_L = 10264;
-const char PAGE_index0[] PROGMEM = {
+const uint8_t PAGE_index[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x08, 0x67, 0x5e, 0x61, 0x5c, 0x00, 0x03, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65,
0x73, 0x73, 0x65, 0x64, 0x20, 0x28, 0x37, 0x29, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00, 0xcc, 0x5a,
0xe9, 0x72, 0xdb, 0x46, 0xb6, 0xfe, 0xaf, 0xa7, 0x80, 0xe9, 0x4a, 0x4c, 0x46, 0x04, 0x88, 0x9d,
diff --git a/wled00/html_mobile.h b/wled00/html_mobile.h
index 9cfe4302..51053bb1 100644
--- a/wled00/html_mobile.h
+++ b/wled00/html_mobile.h
@@ -19,7 +19,7 @@ Mobile UI is unsupported in this build. Go to /settings/ui and change UI mode to
#else WLED_DISABLE_MOBILE_UI
const uint16_t PAGE_indexM_L = 19259; //length of the binary payload
-const char PAGE_indexM[] PROGMEM = {
+const uint8_t PAGE_indexM[] PROGMEM = {
0x1f, 0x8b, 0x08, 0x08, 0xcf, 0xcd, 0x62, 0x5c, 0x00, 0x03, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65,
0x73, 0x73, 0x65, 0x64, 0x20, 0x28, 0x39, 0x29, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00, 0xed, 0xbd,
0x69, 0x7b, 0xda, 0x48, 0xb7, 0x28, 0xfa, 0xfd, 0xfd, 0x15, 0x6e, 0xfa, 0x79, 0xbb, 0x21, 0xc2,
diff --git a/wled00/html_other.h b/wled00/html_other.h
index 11194601..4846a245 100644
--- a/wled00/html_other.h
+++ b/wled00/html_other.h
@@ -8,23 +8,20 @@ const char PAGE_usermod[] PROGMEM = R"=====(
//server message
-const char PAGE_msg0[] PROGMEM = R"=====(
+const char PAGE_msg[] PROGMEM = R"=====(
WLED Message
-)=====";
-
-const char PAGE_msg1[] PROGMEM = R"=====(button{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:20px;margin:8px;margin-top:12px}body{font-family:var(--cFn),sans-serif;text-align:center;background:var(--cCol);color:var(--tCol);line-height:200%;margin:0;background-attachment:fixed}
-
-)=====";
+
+%CSS%button{background:var(--bCol);color:var(--tCol);font-family:var(--cFn),sans-serif;border:.3ch solid var(--bCol);display:inline-block;filter:drop-shadow(-5px -5px 5px var(--sCol));font-size:20px;margin:8px;margin-top:12px}body{font-family:var(--cFn),sans-serif;text-align:center;background:var(--cCol);color:var(--tCol);line-height:200%%;margin:0;background-attachment:fixed}
+%MSG%)=====";
//new user welcome page
#ifndef WLED_DISABLE_MOBILE_UI
-const char PAGE_welcome0[] PROGMEM = R"=====(
+const char PAGE_welcome[] PROGMEM = R"=====(
-WLED Welcome!)=====";
-
-const char PAGE_welcome1[] PROGMEM = R"=====(body{font-family:var(--cFn),sans-serif;text-align:center;background:linear-gradient(var(--bCol),black);margin:0;background-attachment: fixed;color: var(--tCol);}svg {fill: var(--dCol);}
+WLED Welcome!
+%CSS%body{font-family:var(--cFn),sans-serif;text-align:center;background:linear-gradient(var(--bCol),black);margin:0;background-attachment: fixed;color: var(--tCol);}svg {fill: var(--dCol);}