diff --git a/Controllers/AMBXController/RGBController_AMBX.cpp b/Controllers/AMBXController/RGBController_AMBX.cpp
index 53d217e9..48edae0c 100644
--- a/Controllers/AMBXController/RGBController_AMBX.cpp
+++ b/Controllers/AMBXController/RGBController_AMBX.cpp
@@ -58,7 +58,7 @@ void RGBController_AMBX::SetupZones()
     side_lights_zone.leds_count = 2;
     side_lights_zone.matrix_map = NULL;
     zones.push_back(side_lights_zone);
-    
+
     zone wallwasher_zone;
     wallwasher_zone.name       = "Wallwasher";
     wallwasher_zone.type       = ZONE_TYPE_LINEAR;
@@ -108,16 +108,16 @@ void RGBController_AMBX::DeviceUpdateLEDs()
     {
         return;
     }
-    
+
     unsigned int led_values[5];
     RGBColor led_colors[5];
-    
+
     for(unsigned int led_idx = 0; led_idx < leds.size(); led_idx++)
     {
         led_values[led_idx] = leds[led_idx].value;
         led_colors[led_idx] = colors[led_idx];
     }
-    
+
     controller->SetLEDColors(led_values, led_colors, static_cast<unsigned int>(leds.size()));
 }
 
@@ -127,10 +127,10 @@ void RGBController_AMBX::UpdateZoneLEDs(int zone)
     {
         return;
     }
-    
+
     unsigned int start_idx = 0;
     unsigned int zone_size = 0;
-    
+
     // Calculate start index and size
     for(unsigned int z_idx = 0; z_idx < zones.size(); z_idx++)
     {
@@ -139,20 +139,20 @@ void RGBController_AMBX::UpdateZoneLEDs(int zone)
             zone_size = zones[z_idx].leds_count;
             break;
         }
-        
+
         start_idx += zones[z_idx].leds_count;
     }
-    
+
     unsigned int led_values[5];
     RGBColor led_colors[5];
-    
+
     for(unsigned int led_idx = 0; led_idx < zone_size; led_idx++)
     {
         unsigned int current_idx = start_idx + led_idx;
         led_values[led_idx] = leds[current_idx].value;
         led_colors[led_idx] = colors[current_idx];
     }
-    
+
     controller->SetLEDColors(led_values, led_colors, zone_size);
 }
 
@@ -162,7 +162,7 @@ void RGBController_AMBX::UpdateSingleLED(int led)
     {
         return;
     }
-    
+
     unsigned int led_value = leds[led].value;
     RGBColor color = colors[led];
     controller->SetLEDColor(led_value, color);
@@ -174,11 +174,6 @@ void RGBController_AMBX::DeviceUpdateMode()
     {
         return;
     }
-    
+
     DeviceUpdateLEDs();
 }
-
-void RGBController_AMBX::SetCustomMode()
-{
-    active_mode = 0;
-}
diff --git a/Controllers/AMBXController/RGBController_AMBX.h b/Controllers/AMBXController/RGBController_AMBX.h
index 29c772bb..143f10c9 100644
--- a/Controllers/AMBXController/RGBController_AMBX.h
+++ b/Controllers/AMBXController/RGBController_AMBX.h
@@ -20,13 +20,12 @@ public:
 
     void        SetupZones();
     void        ResizeZone(int zone, int new_size);
-    
+
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
-    
+
     void        DeviceUpdateMode();
-    void        SetCustomMode();
 
 private:
     AMBXController* controller;
diff --git a/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.cpp b/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.cpp
index ca5a9d85..e755a6fd 100644
--- a/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.cpp
+++ b/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.cpp
@@ -390,11 +390,6 @@ void RGBController_CherryKeyboard::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CherryKeyboard::SetCustomMode()
-{
-
-}
-
 void RGBController_CherryKeyboard::DeviceUpdateMode()
 {
     unsigned char red    = 0x00;
diff --git a/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.h b/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.h
index 7363ba43..245af656 100644
--- a/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.h
+++ b/Controllers/CherryKeyboardController/RGBController_CherryKeyboard.h
@@ -28,7 +28,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.cpp b/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.cpp
index 230fb860..88b04380 100644
--- a/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.cpp
+++ b/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.cpp
@@ -400,18 +400,6 @@ void RGBController_CMARGBController::UpdateSingleLED(int led)
     UpdateZoneLEDs(GetLED_Zone(led));
 }
 
-void RGBController_CMARGBController::SetCustomMode()
-{
-    for(int mode_idx = 0; mode_idx < (int)modes.size() ; mode_idx++)
-    {
-        if (modes[mode_idx].value == CM_ARGB_MODE_DIRECT)
-        {
-            active_mode = mode_idx;
-            break;
-        }
-    }
-}
-
 void RGBController_CMARGBController::DeviceUpdateMode()
 {
     bool     random_colours = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
diff --git a/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h b/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h
index 07b8c7ef..b42bdedf 100644
--- a/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h
+++ b/Controllers/CoolerMasterController/CMARGBController/RGBController_CMARGBController.h
@@ -31,7 +31,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp
index d0540662..2fbd4704 100644
--- a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp
+++ b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.cpp
@@ -309,11 +309,6 @@ void RGBController_CMARGBGen2A1Controller::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CMARGBGen2A1Controller::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CMARGBGen2A1Controller::DeviceUpdateMode()
 {
     const mode& active = modes[active_mode];
diff --git a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h
index 269ee6c3..49fb613c 100644
--- a/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h
+++ b/Controllers/CoolerMasterController/CMARGBGen2A1Controller/RGBController_CMARGBGen2A1Controller.h
@@ -28,7 +28,6 @@ public:
     void UpdateZoneLEDs(int zone);
     void UpdateSegmentLEDs(int zone, int subchannel);
     void UpdateSingleLED(int led);
-    void SetCustomMode();
     void DeviceUpdateMode();
     void DeviceSaveMode();
 
diff --git a/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp
index d09e34d8..cda06f4e 100644
--- a/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp
+++ b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.cpp
@@ -184,18 +184,6 @@ void RGBController_CMMM711Controller::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CMMM711Controller::SetCustomMode()
-{
-    for(int mode_index = 0; mode_index < (int)modes.size(); mode_index++)
-    {
-        if(modes[mode_index].value == CM_MM711_MODE_CUSTOM)
-        {
-            active_mode = mode_index;
-            break;
-        }
-    }
-}
-
 void RGBController_CMMM711Controller::DeviceUpdateMode()
 {
     RGBColor colour = 0;
diff --git a/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h
index 1afe3abc..b993e444 100644
--- a/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h
+++ b/Controllers/CoolerMasterController/CMMM711Controller/RGBController_CMMM711Controller.h
@@ -32,7 +32,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
 private:
diff --git a/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp
index 65a5666a..cfaf7c26 100644
--- a/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp
+++ b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.cpp
@@ -249,18 +249,6 @@ void RGBController_CMMMController::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CMMMController::SetCustomMode()
-{
-    for(int mode_index = 0; mode_index < (int)modes.size(); mode_index++)
-    {
-        if(modes[mode_index].value == CM_MM_MODE_CUSTOM)
-        {
-            active_mode = mode_index;
-            break;
-        }
-    }
-}
-
 void RGBController_CMMMController::DeviceUpdateMode()
 {
     RGBColor mode_one = 0;
diff --git a/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h
index 18fa2a12..5c07a06a 100644
--- a/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h
+++ b/Controllers/CoolerMasterController/CMMMController/RGBController_CMMMController.h
@@ -33,9 +33,9 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
+
 private:
     void        Init_Controller();
     int         GetDeviceMode();
diff --git a/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.cpp b/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.cpp
index f87087fe..eceac678 100644
--- a/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.cpp
+++ b/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.cpp
@@ -175,11 +175,6 @@ void RGBController_CMMP750Controller::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_CMMP750Controller::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CMMP750Controller::DeviceUpdateMode()
 {
     controller->SetMode(modes[active_mode].value, modes[active_mode].speed);
diff --git a/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h b/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h
index 07f11a21..aaab9e81 100644
--- a/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h
+++ b/Controllers/CoolerMasterController/CMMP750Controller/RGBController_CMMP750Controller.h
@@ -27,8 +27,8 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
+
 private:
     CMMP750Controller*  controller;
 
diff --git a/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp
index 1235486d..e7c1f075 100644
--- a/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp
+++ b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.cpp
@@ -197,11 +197,6 @@ void RGBController_CMMonitorController::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CMMonitorController::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CMMonitorController::DeviceUpdateMode()
 {
     switch(modes[active_mode].value)
diff --git a/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h
index 28f5cbe7..9b8bd767 100644
--- a/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h
+++ b/Controllers/CoolerMasterController/CMMonitorController/RGBController_CMMonitorController.h
@@ -21,11 +21,13 @@ public:
     ~RGBController_CMMonitorController();
 
     void SetupZones();
+
     void ResizeZone(int zone, int new_size);
+
     void DeviceUpdateLEDs();
     void UpdateZoneLEDs(int zone);
     void UpdateSingleLED(int led);
-    void SetCustomMode();
+
     void DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.cpp b/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.cpp
index 5d73c911..92f4e49d 100644
--- a/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.cpp
+++ b/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.cpp
@@ -222,11 +222,6 @@ void RGBController_CMR6000Controller::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CMR6000Controller::SetCustomMode()
-{
-    active_mode = 1;
-}
-
 void RGBController_CMR6000Controller::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();
diff --git a/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h b/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h
index 74492595..09e66b7c 100644
--- a/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h
+++ b/Controllers/CoolerMasterController/CMR6000Controller/RGBController_CMR6000Controller.h
@@ -28,7 +28,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 private:
     CMR6000Controller*  controller;
diff --git a/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.cpp b/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.cpp
index 24aab1f1..fccbfc63 100644
--- a/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.cpp
+++ b/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.cpp
@@ -265,18 +265,6 @@ void RGBController_CMRGBController::UpdateSingleLED(int /*led*/)
 {
 }
 
-void RGBController_CMRGBController::SetCustomMode()
-{
-    for(int mode_idx = 0; mode_idx < (int)modes.size() ; mode_idx++)
-    {
-        if(modes[mode_idx].value == CM_RGBC_MODE_MULTIPLE)
-        {
-            active_mode = mode_idx;
-            break;
-        }
-    }
-}
-
 void RGBController_CMRGBController::DeviceUpdateMode()
 {
     RGBColor color_1 = (modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC) ? modes[active_mode].colors[0] : 0;
diff --git a/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h b/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h
index 684ed071..5b5d0f20 100644
--- a/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h
+++ b/Controllers/CoolerMasterController/CMRGBController/RGBController_CMRGBController.h
@@ -28,7 +28,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.cpp b/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.cpp
index cd6c6daa..1afb24e9 100644
--- a/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.cpp
+++ b/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.cpp
@@ -207,11 +207,6 @@ void RGBController_CryorigH7QuadLumi::UpdateSingleLED(int led)
     controller->SetChannelLEDs(zone_idx, zones[zone_idx].colors, zones[zone_idx].leds_count);
 }
 
-void RGBController_CryorigH7QuadLumi::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CryorigH7QuadLumi::DeviceUpdateMode()
 {
     if(modes[active_mode].value == CRYORIG_H7_QUAD_LUMI_MODE_FIXED)
diff --git a/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.h b/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.h
index c13a95c4..e59b12df 100644
--- a/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.h
+++ b/Controllers/CryorigH7QuadLumiController/RGBController_CryorigH7QuadLumi.h
@@ -28,7 +28,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/DDPController/RGBController_DDP.cpp b/Controllers/DDPController/RGBController_DDP.cpp
index 9ba2a453..087a7e0b 100644
--- a/Controllers/DDPController/RGBController_DDP.cpp
+++ b/Controllers/DDPController/RGBController_DDP.cpp
@@ -91,7 +91,7 @@ void RGBController_DDP::DeviceUpdateLEDs()
     std::vector<unsigned int> brightness_adjusted_colors;
     brightness_adjusted_colors.reserve(colors.size());
     float brightness_scale = (float)modes[active_mode].brightness / 100.0f;
-    
+
     for(unsigned int color_idx = 0; color_idx < colors.size(); color_idx++)
     {
         unsigned int color = colors[color_idx];
@@ -122,11 +122,6 @@ void RGBController_DDP::DeviceUpdateMode()
 {
 }
 
-void RGBController_DDP::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_DDP::SetKeepaliveTime(unsigned int time_ms)
 {
     if(controller != nullptr)
diff --git a/Controllers/DDPController/RGBController_DDP.h b/Controllers/DDPController/RGBController_DDP.h
index 7738ba3c..699df8db 100644
--- a/Controllers/DDPController/RGBController_DDP.h
+++ b/Controllers/DDPController/RGBController_DDP.h
@@ -21,11 +21,13 @@ public:
 
     void        SetupZones();
     void        ResizeZone(int zone, int new_size);
+
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
+
     void        DeviceUpdateMode();
-    void        SetCustomMode();
+
     void        SetKeepaliveTime(unsigned int time_ms);
 
 private:
diff --git a/Controllers/DebugController/RGBController_Debug.cpp b/Controllers/DebugController/RGBController_Debug.cpp
index 42cfe107..65c3abe9 100644
--- a/Controllers/DebugController/RGBController_Debug.cpp
+++ b/Controllers/DebugController/RGBController_Debug.cpp
@@ -627,11 +627,6 @@ void RGBController_Debug::UpdateSingleLED(int /*led*/)
 
 }
 
-void RGBController_Debug::SetCustomMode()
-{
-
-}
-
 void RGBController_Debug::DeviceUpdateMode()
 {
 
diff --git a/Controllers/DebugController/RGBController_Debug.h b/Controllers/DebugController/RGBController_Debug.h
index 816b47d6..db01efe7 100644
--- a/Controllers/DebugController/RGBController_Debug.h
+++ b/Controllers/DebugController/RGBController_Debug.h
@@ -31,6 +31,5 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 };
diff --git a/Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.cpp b/Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.cpp
index 3629a0ba..744f93c3 100644
--- a/Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.cpp
+++ b/Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.cpp
@@ -933,18 +933,6 @@ void RGBController_EVisionV2Keyboard::UpdateSingleLED(int led)
     last_update_time = std::chrono::steady_clock::now();
 }
 
-void RGBController_EVisionV2Keyboard::SetCustomMode()
-{
-    if(part == EVISION_V2_KEYBOARD_PART_KEYBOARD)
-    {
-        active_mode = EVISION_V2_MODE_DIRECT;
-    }
-    else
-    {
-        active_mode = EVISION_V2_MODE2_STATIC;
-    }
-}
-
 void RGBController_EVisionV2Keyboard::DeviceUpdateMode()
 {
     mode set_mode = modes[active_mode];
diff --git a/Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.h b/Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.h
index 56a01e08..235d768f 100644
--- a/Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.h
+++ b/Controllers/EVisionKeyboardController/RGBController_EVisionV2Keyboard.h
@@ -24,7 +24,6 @@ public:
 
     void SetupZones() override;
     void ResizeZone(int zone, int new_size) override;
-    void SetCustomMode() override;
 
     void DeviceUpdateLEDs() override;
     void UpdateZoneLEDs(int zone) override;
diff --git a/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.cpp b/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.cpp
index 2183d03c..a9546a30 100644
--- a/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.cpp
+++ b/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.cpp
@@ -148,11 +148,6 @@ void RGBController_GainwardGPUv2::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_GainwardGPUv2::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_GainwardGPUv2::DeviceUpdateMode()
 {
     mode current_mode = modes[(unsigned int)active_mode];
diff --git a/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.h b/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.h
index cba2c730..5dd58b0d 100644
--- a/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.h
+++ b/Controllers/GainwardGPUController/GainwardGPUv2Controller/RGBController_GainwardGPUv2.h
@@ -28,7 +28,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.cpp b/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.cpp
index 22d3175d..ee523972 100644
--- a/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.cpp
+++ b/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.cpp
@@ -415,9 +415,3 @@ void RGBController_LianLiGAIITrinity::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();
 }
-
-void RGBController_LianLiGAIITrinity::SetCustomMode()
-{
-
-}
-
diff --git a/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.h b/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.h
index 511af59f..b186af6c 100644
--- a/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.h
+++ b/Controllers/LianLiController/LianLiGAIITrinityController/RGBController_LianLiGAIITrinity.h
@@ -30,8 +30,6 @@ public:
 
     void DeviceUpdateMode();
 
-    void SetCustomMode();
-
     LianLiGAIITrinityController::GAII_Direction OpenRGBDirection2GAIIDirection(unsigned int openrgb_direction)
     {
         if(openrgb_direction == MODE_DIRECTION_LEFT)
diff --git a/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.cpp b/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.cpp
index e66695da..1df41d8e 100644
--- a/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.cpp
+++ b/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.cpp
@@ -522,12 +522,3 @@ void RGBController_LianLiUniHubAL::DeviceUpdateMode()
         controller->SetChannelMode((unsigned char)zone_idx, modes[active_mode].value,modes[active_mode].colors, (unsigned int)modes[active_mode].colors.size(), (fan_idx >= 0 ? fan_idx : 0), upd_both_fan_edge, modes[active_mode].brightness, modes[active_mode].speed, modes[active_mode].direction);
     }
 }
-
-void RGBController_LianLiUniHubAL::SetCustomMode()
-{
-    /*-------------------------------------------------*\
-    | Set mode to Static Color                          |
-    \*-------------------------------------------------*/
-    active_mode = 0;
-}
-
diff --git a/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.h b/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.h
index df170495..52277a43 100644
--- a/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.h
+++ b/Controllers/LianLiController/LianLiUniHubALController/RGBController_LianLiUniHubAL.h
@@ -33,8 +33,6 @@ public:
 
     void DeviceUpdateMode();
 
-    void SetCustomMode();
-
 private:
     LianLiUniHubALController* controller;
     bool                    initializedMode;
diff --git a/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.cpp b/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.cpp
index 68874911..9780690c 100644
--- a/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.cpp
+++ b/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.cpp
@@ -443,12 +443,3 @@ void RGBController_LianLiUniHubSLInfinity::DeviceUpdateMode()
 
     }
 }
-
-void RGBController_LianLiUniHubSLInfinity::SetCustomMode()
-{
-    /*-------------------------------------------------*\
-    | Set mode to Static Color                          |
-    \*-------------------------------------------------*/
-    active_mode = 0;
-}
-
diff --git a/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.h b/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.h
index 9ff452c3..2b544659 100644
--- a/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.h
+++ b/Controllers/LianLiController/LianLiUniHubSLInfinityController/RGBController_LianLiUniHubSLInfinity.h
@@ -35,8 +35,6 @@ public:
 
     void DeviceUpdateMode();
 
-    void SetCustomMode();
-
 private:
     LianLiUniHubSLInfinityController* controller;
     bool                    initializedMode;
diff --git a/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.cpp b/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.cpp
index 2c81915e..267db8ed 100644
--- a/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.cpp
+++ b/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.cpp
@@ -442,12 +442,3 @@ void RGBController_LianLiUniHubSLV2::DeviceUpdateMode()
 
     }
 }
-
-void RGBController_LianLiUniHubSLV2::SetCustomMode()
-{
-    /*-------------------------------------------------*\
-    | Set mode to Static Color                          |
-    \*-------------------------------------------------*/
-    active_mode = 0;
-}
-
diff --git a/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.h b/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.h
index 6493b014..381f19af 100644
--- a/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.h
+++ b/Controllers/LianLiController/LianLiUniHubSLV2Controller/RGBController_LianLiUniHubSLV2.h
@@ -34,8 +34,6 @@ public:
 
     void DeviceUpdateMode();
 
-    void SetCustomMode();
-
 private:
     LianLiUniHubSLV2Controller* controller;
     bool                    initializedMode;
diff --git a/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.cpp b/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.cpp
index 82de2fbb..b17fe5e0 100644
--- a/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.cpp
+++ b/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.cpp
@@ -544,14 +544,6 @@ void RGBController_LianLiUniHub_AL10::DeviceUpdateMode()
     controller->Synchronize();
 }
 
-void RGBController_LianLiUniHub_AL10::SetCustomMode()
-{
-    /*-------------------------------------------------*\
-    | Set mode to Static Color                          |
-    \*-------------------------------------------------*/
-    active_mode = 0;
-}
-
 uint8_t RGBController_LianLiUniHub_AL10::convertAnyFanCount(uint8_t count)
 {
     switch (count)
diff --git a/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.h b/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.h
index e9786552..a72df08b 100644
--- a/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.h
+++ b/Controllers/LianLiController/LianLiUniHub_AL10Controller/RGBController_LianLiUniHub_AL10.h
@@ -32,8 +32,6 @@ public:
 
     void DeviceUpdateMode();
 
-    void SetCustomMode();
-
 private:
     uint8_t convertAnyFanCount(uint8_t count);
     uint8_t convertLedSpeed(uint8_t speed);
diff --git a/Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.cpp b/Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.cpp
index a8031a72..6ae71ea7 100644
--- a/Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.cpp
+++ b/Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.cpp
@@ -23,14 +23,14 @@
 RGBController_MadCatzCyborg::RGBController_MadCatzCyborg(MadCatzCyborgController* controller_ptr)
 {
     controller  = controller_ptr;
-    
+
     name        = "MadCatz Cyborg Gaming Light";
     vendor      = "MadCatz";
     type        = DEVICE_TYPE_ACCESSORY;
     description = "MadCatz Cyborg Gaming Light";
     location    = controller->GetDeviceLocation();
     serial      = controller->GetSerialString();
-    
+
     mode Direct;
     Direct.name           = "Direct";
     Direct.value          = 0;
@@ -40,9 +40,9 @@ RGBController_MadCatzCyborg::RGBController_MadCatzCyborg(MadCatzCyborgController
     Direct.brightness_max = 100;
     Direct.brightness     = 100;
     modes.push_back(Direct);
-    
+
     SetupZones();
-    
+
     controller->SetIntensity(modes[active_mode].brightness);
 }
 
@@ -54,20 +54,20 @@ RGBController_MadCatzCyborg::~RGBController_MadCatzCyborg()
 void RGBController_MadCatzCyborg::SetupZones()
 {
     zone cyborg_zone;
-    
+
     cyborg_zone.name       = "Cyborg";
     cyborg_zone.type       = ZONE_TYPE_SINGLE;
     cyborg_zone.leds_min   = 1;
     cyborg_zone.leds_max   = 1;
     cyborg_zone.leds_count = 1;
     cyborg_zone.matrix_map = NULL;
-    
+
     zones.push_back(cyborg_zone);
-    
+
     led cyborg_led;
     cyborg_led.name = "LED";
     leds.push_back(cyborg_led);
-    
+
     SetupColors();
 }
 
@@ -102,8 +102,3 @@ void RGBController_MadCatzCyborg::DeviceUpdateMode()
         controller->SetIntensity(modes[active_mode].brightness);
     }
 }
-
-void RGBController_MadCatzCyborg::SetCustomMode()
-{
-    active_mode = 0;
-}
diff --git a/Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.h b/Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.h
index 25f3ce55..bfdaa866 100644
--- a/Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.h
+++ b/Controllers/MadCatzCyborgController/RGBController_MadCatzCyborg.h
@@ -20,13 +20,12 @@ public:
 
     void        SetupZones();
     void        ResizeZone(int zone, int new_size);
-    
+
     void        DeviceUpdateLEDs();
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
-    
+
     void        DeviceUpdateMode();
-    void        SetCustomMode();
 
 private:
     MadCatzCyborgController* controller;
diff --git a/Controllers/OKSController/RGBController_OKSKeyboard.cpp b/Controllers/OKSController/RGBController_OKSKeyboard.cpp
index f4ff48dd..50c8ea3c 100644
--- a/Controllers/OKSController/RGBController_OKSKeyboard.cpp
+++ b/Controllers/OKSController/RGBController_OKSKeyboard.cpp
@@ -281,11 +281,6 @@ void RGBController_OKSKeyboard::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_OKSKeyboard::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_OKSKeyboard::DeviceUpdateMode()
 {
     mode m = modes[active_mode];
diff --git a/Controllers/OKSController/RGBController_OKSKeyboard.h b/Controllers/OKSController/RGBController_OKSKeyboard.h
index 84b25881..2733b58a 100644
--- a/Controllers/OKSController/RGBController_OKSKeyboard.h
+++ b/Controllers/OKSController/RGBController_OKSKeyboard.h
@@ -66,7 +66,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.cpp b/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.cpp
index c8c1babb..ccdb8d69 100644
--- a/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.cpp
+++ b/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.cpp
@@ -143,10 +143,3 @@ void RGBController_GenesisXenon200::UpdateSingleLED(int /*led*/)
 {
 
 }
-
-
-
-void RGBController_GenesisXenon200::SetCustomMode()
-{
-
-}
diff --git a/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.h b/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.h
index 6ae1a9c7..58c31e17 100644
--- a/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.h
+++ b/Controllers/SinowealthController/GenesisXenon200Controller/RGBController_GenesisXenon200.h
@@ -40,8 +40,6 @@ public:
     void            DeviceUpdateMode();
     void            DeviceSaveMode();
 
-    void            SetCustomMode();
-
 private:
     GenesisXenon200Controller* controller;
 };
diff --git a/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.cpp b/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.cpp
index af25b827..8952452c 100644
--- a/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.cpp
+++ b/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.cpp
@@ -156,14 +156,6 @@ void RGBController_SinowealthKeyboard90::UpdateSingleLED(int /*key*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_SinowealthKeyboard90::SetCustomMode()
-{
-    /*---------------------------------------------------------*\
-    | In our case, custom mode is on index MODE_CUSTOM          |
-    \*---------------------------------------------------------*/
-    active_mode = MODE_CUSTOM;
-}
-
 void RGBController_SinowealthKeyboard90::DeviceUpdateMode()
 {
     if (modes[active_mode].value == MODE_CUSTOM)
diff --git a/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.h b/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.h
index 1fe22985..175f3650 100644
--- a/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.h
+++ b/Controllers/SinowealthController/SinowealthKeyboard90Controller/RGBController_SinowealthKeyboard90.h
@@ -26,7 +26,6 @@ public:
     void            UpdateZoneLEDs(int zone);
     void            UpdateSingleLED(int led);
 
-    void            SetCustomMode();
     void            DeviceUpdateMode();
 
 private: