diff --git a/sonoff/settings.ino b/sonoff/settings.ino
index 2fb9a9afa..843c9fee5 100644
--- a/sonoff/settings.ino
+++ b/sonoff/settings.ino
@@ -587,6 +587,7 @@ void SettingsDefaultSet2(void)
 //  Settings.flag.stop_flash_rotate = 0;
   Settings.save_data = SAVE_DATA;
   Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
+  Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
   Settings.sleep = APP_SLEEP;
   if (Settings.sleep < 50) {
     Settings.sleep = 50;                // Default to 50 for sleep, for now
@@ -1055,6 +1056,9 @@ void SettingsDelta(void)
     if (Settings.version < 0x06040110) {
       ModuleDefault(WEMOS);
     }
+    if (Settings.version < 0x06040112) {
+      Settings.param[P_RGB_REMAP] = RGB_REMAP_RGBW;
+    }
 
     Settings.version = VERSION;
     SettingsSave(1);
diff --git a/sonoff/sonoff.h b/sonoff/sonoff.h
index f83e7e390..951c7f6d2 100644
--- a/sonoff/sonoff.h
+++ b/sonoff/sonoff.h
@@ -171,6 +171,13 @@ typedef unsigned long power_t;              // Power (Relay) type
 
 #define LT_SM16716             16           // Lights that use SM16716 will have this bit set in light_type
 
+#define RGB_REMAP_RGBW         0
+#define RGB_REMAP_RBGW         6
+#define RGB_REMAP_GRBW         24
+#define RGB_REMAP_GBRW         30
+#define RGB_REMAP_BRGW         48
+#define RGB_REMAP_BGRW         54
+
 #define MQTT_PUBSUBCLIENT      1            // Mqtt PubSubClient library
 #define MQTT_TASMOTAMQTT       2            // Mqtt TasmotaMqtt library based on esp-mqtt-arduino - soon obsolete
 #define MQTT_ESPMQTTARDUINO    3            // Mqtt esp-mqtt-arduino library by Ingo Randolf - obsolete but define is present for debugging purposes
diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
index 2a65f8f65..2c771a8ab 100755
--- a/sonoff/sonoff.ino
+++ b/sonoff/sonoff.ino
@@ -789,9 +789,19 @@ void MqttDataHandler(char* topic, uint8_t* data, unsigned int data_len)
               param_low = 1;
               param_high = 250;
               break;
+
+	    case P_RGB_REMAP:
+              param_low = 0;
+              param_high = 119;
+              break;
           }
           if ((payload >= param_low) && (payload <= param_high)) {
             Settings.param[pindex] = payload;
+            switch (pindex) {
+	      case P_RGB_REMAP:
+	        LightUpdateColorMapping();
+                break;
+            }
           }
         }
       }
diff --git a/sonoff/xdrv_04_light.ino b/sonoff/xdrv_04_light.ino
index c6868a09e..c606425b4 100644
--- a/sonoff/xdrv_04_light.ino
+++ b/sonoff/xdrv_04_light.ino
@@ -86,7 +86,7 @@ struct LCwColor {
 #define MAX_FIXED_COLD_WARM  4
 const LCwColor kFixedColdWarm[MAX_FIXED_COLD_WARM] PROGMEM = { 0,0, 255,0, 0,255, 128,128 };
 
-uint8_t remap[5];
+uint8_t color_remap[5];
 
 uint8_t ledTable[] = {
   0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
@@ -566,30 +566,35 @@ void LightInit(void)
   light_update = 1;
   light_wakeup_active = 0;
 
+  LightUpdateColorMapping();
+}
+
+void LightUpdateColorMapping(void)
+{
   uint8_t param = Settings.param[P_RGB_REMAP];
   if(param > 119){
     param = 119;
   }
   uint8_t tmp[] = {0,1,2,3,4};
-  remap[0] = tmp[param / 24];
+  color_remap[0] = tmp[param / 24];
   for (uint8_t i = param / 24; i<4; ++i){
     tmp[i] = tmp[i+1];
   }
   param = param % 24;
-  remap[1] = tmp[(param / 6)];
+  color_remap[1] = tmp[(param / 6)];
   for (uint8_t i = param / 6; i<3; ++i){
     tmp[i] = tmp[i+1];
   }
   param = param % 6;
-  remap[2] = tmp[(param / 2)];
+  color_remap[2] = tmp[(param / 2)];
   for (uint8_t i = param / 2; i<2; ++i){
     tmp[i] = tmp[i+1];
   }
   param = param % 2;
-  remap[3] = tmp[param];
-  remap[4] = tmp[1-param];
+  color_remap[3] = tmp[param];
+  color_remap[4] = tmp[1-param];
 
-  //snprintf_P(log_data, sizeof(log_data), "%d colors: %d %d %d %d %d",Settings.param[P_RGB_REMAP], remap[0],remap[1],remap[2],remap[3],remap[4]);
+  //snprintf_P(log_data, sizeof(log_data), "%d colors: %d %d %d %d %d",Settings.param[P_RGB_REMAP], color_remap[0],color_remap[1],color_remap[2],color_remap[3],color_remap[4]);
   //AddLog(LOG_LEVEL_DEBUG);
 }
 
@@ -996,7 +1001,7 @@ void LightAnimate(void)
       uint8_t orig_col[5];
       memcpy(orig_col, cur_col, sizeof(orig_col));
       for (uint8_t i = 0; i < 5; i++) {
-        cur_col[i] = orig_col[remap[i]];
+        cur_col[i] = orig_col[color_remap[i]];
       }
 
       for (uint8_t i = 0; i < light_subtype; i++) {