diff --git a/keyboard/RedScarfII/Makefile b/keyboard/RedScarfII/Makefile
index b6973d61..e5756ea1 100644
--- a/keyboard/RedScarfII/Makefile
+++ b/keyboard/RedScarfII/Makefile
@@ -125,7 +125,7 @@ endif
 #   comment out to disable the options.
 #
 BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
-#MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
+MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 CONSOLE_ENABLE = yes	# Console for debug(+400)
 COMMAND_ENABLE = yes	# Commands for debug and configuration
diff --git a/keyboard/RedScarfII/backlight.c b/keyboard/RedScarfII/backlight.c
index b10c2a0d..dec6e847 100644
--- a/keyboard/RedScarfII/backlight.c
+++ b/keyboard/RedScarfII/backlight.c
@@ -72,7 +72,8 @@ void backlight_set(uint8_t level)
         case 2:
         case 3:
 #ifdef SOFTPWM_LED_ENABLE
-            softpwm_led_enable();
+            softpwm_enable();
+            softpwm_led_enable_all();
 #ifdef FADING_LED_ENABLE
             fading_led_disable_all();
 #endif
@@ -87,7 +88,8 @@ void backlight_set(uint8_t level)
         case 5:
         case 6:
 #ifdef SOFTPWM_LED_ENABLE
-            softpwm_led_enable();
+            softpwm_enable();
+            softpwm_led_enable_all();
 #ifdef FADING_LED_ENABLE
             fading_led_disable_all();
 #endif
@@ -101,14 +103,16 @@ void backlight_set(uint8_t level)
 #ifdef SOFTPWM_LED_ENABLE
 #ifdef FADING_LED_ENABLE
         case 7:
-            softpwm_led_enable();
+            softpwm_enable();
+            softpwm_led_enable_all();
             fading_led_enable_all();
             breathing_led_disable_all();
             fading_led_set_direction_all(FADING_LED_FADE_IN);
             fading_led_set_duration(3);
             break;
         case 8:
-            softpwm_led_enable();
+            softpwm_enable();
+            softpwm_led_enable_all();
             fading_led_enable_all();
             breathing_led_disable_all();
             fading_led_set_direction_all(FADING_LED_FADE_OUT);
@@ -123,7 +127,8 @@ void backlight_set(uint8_t level)
             fading_led_disable_all();
 #endif
             breathing_led_disable_all();
-            softpwm_led_disable();
+            softpwm_led_disable_all();
+            softpwm_disable();
 #else
             breathing_led_disable();
             backlight_disable();
diff --git a/keyboard/RedScarfII/ledmap.c b/keyboard/RedScarfII/ledmap.c
index dca51c7f..a1d81d0f 100644
--- a/keyboard/RedScarfII/ledmap.c
+++ b/keyboard/RedScarfII/ledmap.c
@@ -22,7 +22,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 static const uint16_t ledmaps[LED_COUNT] PROGMEM = {
     [0] = LEDMAP_CAPS_LOCK | LEDMAP_BACKLIGHT,      // CapsLock
+#ifdef NO_NUMLOCK
+    [1] = LEDMAP_BACKLIGHT,                         // NumLock
+#else
     [1] = LEDMAP_NUM_LOCK | LEDMAP_BACKLIGHT,       // NumLock
+#endif
 #ifdef REDSCARFII_PLUS
     [2] = LEDMAP_BACKLIGHT,                         // Backlight
 #else