diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 419897df6..d2d75f689 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -5908,7 +5908,7 @@ static const char _data_FX_MODE_2DDRIFTROSE[] PROGMEM = "Drift Rose@Fade,Blur;;;
 #endif // WLED_DISABLE_2D
 
 
-#ifndef WLED_NO_AUDIO
+#ifndef WLED_DISABLE_AUDIO
 ///////////////////////////////////////////////////////////////////////////////
 /********************     audio enhanced routines     ************************/
 ///////////////////////////////////////////////////////////////////////////////
@@ -7372,7 +7372,7 @@ uint16_t mode_2DAkemi(void) {
 static const char _data_FX_MODE_2DAKEMI[] PROGMEM = "Akemi@Color speed,Dance;Head palette,Arms & Legs,Eyes & Mouth;Face palette;ssim=0,2d,fr"; //beatsin
 #endif // WLED_DISABLE_2D
 
-#endif // WLED_NO_AUDIO
+#endif // WLED_DISABLE_AUDIO
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // mode data
@@ -7538,14 +7538,14 @@ void WS2812FX::setupEffectData() {
   addEffect(FX_MODE_2DMETABALLS, &mode_2Dmetaballs, _data_FX_MODE_2DMETABALLS);
   addEffect(FX_MODE_2DPULSER, &mode_2DPulser, _data_FX_MODE_2DPULSER);
   addEffect(FX_MODE_2DSUNRADIATION, &mode_2DSunradiation, _data_FX_MODE_2DSUNRADIATION);
-  #ifndef WLED_NO_AUDIO
+  #ifndef WLED_DISABLE_AUDIO
   addEffect(FX_MODE_2DWAVERLY, &mode_2DWaverly, _data_FX_MODE_2DWAVERLY);
   #endif
   addEffect(FX_MODE_2DDRIFT, &mode_2DDrift, _data_FX_MODE_2DDRIFT);
   addEffect(FX_MODE_2DCOLOREDBURSTS, &mode_2DColoredBursts, _data_FX_MODE_2DCOLOREDBURSTS);
   addEffect(FX_MODE_2DTARTAN, &mode_2Dtartan, _data_FX_MODE_2DTARTAN);
   addEffect(FX_MODE_2DPOLARLIGHTS, &mode_2DPolarLights, _data_FX_MODE_2DPOLARLIGHTS);
-  #ifndef WLED_NO_AUDIO
+  #ifndef WLED_DISABLE_AUDIO
   addEffect(FX_MODE_2DSWIRL, &mode_2DSwirl, _data_FX_MODE_2DSWIRL);
   #endif
   addEffect(FX_MODE_2DLISSAJOUS, &mode_2DLissajous, _data_FX_MODE_2DLISSAJOUS);
@@ -7555,11 +7555,11 @@ void WS2812FX::setupEffectData() {
   addEffect(FX_MODE_2DSINDOTS, &mode_2DSindots, _data_FX_MODE_2DSINDOTS);
   addEffect(FX_MODE_2DDNASPIRAL, &mode_2DDNASpiral, _data_FX_MODE_2DDNASPIRAL);
   addEffect(FX_MODE_2DBLACKHOLE, &mode_2DBlackHole, _data_FX_MODE_2DBLACKHOLE);
-  #ifndef WLED_NO_AUDIO
+  #ifndef WLED_DISABLE_AUDIO
   addEffect(FX_MODE_2DAKEMI, &mode_2DAkemi, _data_FX_MODE_2DAKEMI);
   #endif
   #endif
-  #ifndef WLED_NO_AUDIO
+  #ifndef WLED_DISABLE_AUDIO
   addEffect(FX_MODE_PIXELWAVE, &mode_pixelwave, _data_FX_MODE_PIXELWAVE);
   addEffect(FX_MODE_JUGGLES, &mode_juggles, _data_FX_MODE_JUGGLES);
   addEffect(FX_MODE_MATRIPIX, &mode_matripix, _data_FX_MODE_MATRIPIX);
@@ -7576,8 +7576,8 @@ void WS2812FX::setupEffectData() {
   #endif
 #else
   // WLED-SR
-  #ifdef WLED_NO_AUDIO
-    #error Incompatible options: WLED_NO_AUDIO and USERMOD_AUDIOREACTIVE
+  #ifdef WLED_DISABLE_AUDIO
+    #error Incompatible options: WLED_DISABLE_AUDIO and USERMOD_AUDIOREACTIVE
   #endif
   #ifdef WLED_DISABLE_2D
     #error AUDIOREACTIVE requires 2D support.
diff --git a/wled00/FX.h b/wled00/FX.h
index 1fc4ffe06..0e9000d17 100644
--- a/wled00/FX.h
+++ b/wled00/FX.h
@@ -276,7 +276,7 @@
   #define FX_MODE_2DPULSER               143 // non audio
   #define FX_MODE_2DDRIFT                144 // non audio
 #endif
-#ifndef WLED_NO_AUDIO
+#ifndef WLED_DISABLE_AUDIO
   #ifndef WLED_DISABLE_2D
     #define FX_MODE_2DWAVERLY              145 // audio enhanced
     #define FX_MODE_2DSWIRL                146 // audio enhanced
@@ -299,7 +299,7 @@
 
 #ifndef USERMOD_AUDIOREACTIVE
 
-  #ifndef WLED_NO_AUDIO
+  #ifndef WLED_DISABLE_AUDIO
   #define MODE_COUNT                   173
   #else
     #ifndef WLED_DISABLE_2D
@@ -314,7 +314,7 @@
   #ifdef WLED_DISABLE_2D
   #error Audioreactive usermod requires 2D support.
   #endif
-  #ifdef WLED_NO_AUDIO
+  #ifdef WLED_DISABLE_AUDIO
   #error Audioreactive usermod requires audio support.
   #endif
   #define FX_MODE_PIXELS                 173
diff --git a/wled00/json.cpp b/wled00/json.cpp
index a53f6924a..202675f8d 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -188,8 +188,8 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
         && elem[F("c3")].isNull() )
       {
         int16_t sOpt;
-        uint8_t tmp = 255;
 /*
+        uint8_t tmp = 255;
         // compatibility mode begin
         char buf[5]; // dummy buffer
         for (int i=0; i<5; i++) {
@@ -629,7 +629,7 @@ void serializeInfo(JsonObject root)
   leds[F("wv")]   = totalLC & 0x02;     // deprecated, true if white slider should be displayed for any segment
   leds["cct"]     = totalLC & 0x04;     // deprecated, use info.leds.lc
 
-  #ifdef WLED_NO_AUDIO
+  #ifdef WLED_DISABLE_AUDIO
   root[F("noaudio")] = true;
   #endif
 
diff --git a/wled00/usermods_list.cpp b/wled00/usermods_list.cpp
index d138264d9..7738a1e96 100644
--- a/wled00/usermods_list.cpp
+++ b/wled00/usermods_list.cpp
@@ -133,8 +133,8 @@
 #endif
 
 #ifdef USERMOD_AUDIOREACTIVE
-  #ifdef WLED_NO_AUDIO
-    #error Incompatible options: WLED_NO_AUDIO and USERMOD_AUDIOREACTIVE
+  #ifdef WLED_DISABLE_AUDIO
+    #error Incompatible options: WLED_DISABLE_AUDIO and USERMOD_AUDIOREACTIVE
   #endif
 #include "../usermods/audioreactive/audio_reactive.h"
 #endif
@@ -260,8 +260,8 @@ void registerUsermods()
   #endif
   
   #ifdef USERMOD_AUDIOREACTIVE
-    #ifdef WLED_NO_AUDIO
-      #error Incompatible options: WLED_NO_AUDIO and USERMOD_AUDIOREACTIVE
+    #ifdef WLED_DISABLE_AUDIO
+      #error Incompatible options: WLED_DISABLE_AUDIO and USERMOD_AUDIOREACTIVE
     #endif
   usermods.add(new AudioReactive());
   #endif
diff --git a/wled00/util.cpp b/wled00/util.cpp
index 990500f2f..a6f5363d9 100644
--- a/wled00/util.cpp
+++ b/wled00/util.cpp
@@ -385,7 +385,7 @@ uint16_t crc16(const unsigned char* data_p, size_t length) {
 }
 
 
-#ifndef WLED_NO_AUDIO
+#ifndef WLED_DISABLE_AUDIO
 ///////////////////////////////////////////////////////////////////////////////
 // Begin simulateSound (to enable audio enhanced effects to display something)
 ///////////////////////////////////////////////////////////////////////////////