diff --git a/keyboard/clueboard1/Makefile b/keyboard/clueboard1/Makefile
index 429ea6088..50cde1517 100644
--- a/keyboard/clueboard1/Makefile
+++ b/keyboard/clueboard1/Makefile
@@ -119,8 +119,7 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 CONSOLE_ENABLE = yes	# Console for debug(+400)
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality
+# RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality
 # MIDI_ENABLE = YES 		# MIDI controls
 # UNICODE_ENABLE = YES 		# Unicode
 # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
diff --git a/keyboard/clueboard1/config.h b/keyboard/clueboard1/config.h
index 1801e3d2c..2b20c3873 100644
--- a/keyboard/clueboard1/config.h
+++ b/keyboard/clueboard1/config.h
@@ -67,9 +67,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Underlight configuration
  */
- #define ws2812_PORTREG PORTF
- #define ws2812_DDRREG DDRF
- #define ws2812_pin 6
+ #define ws2812_PORTREG PORTB
+ #define ws2812_DDRREG DDRB
+ #define ws2812_pin 2
  #define RGBLED_NUM 14     // Number of LEDs
  #define RGBLIGHT_HUE_STEP 10
  #define RGBLIGHT_SAT_STEP 17
diff --git a/keyboard/clueboard1/keymaps/keymap_default.c b/keyboard/clueboard1/keymaps/keymap_default.c
index 33443f582..3f4f3c414 100644
--- a/keyboard/clueboard1/keymaps/keymap_default.c
+++ b/keyboard/clueboard1/keymaps/keymap_default.c
@@ -1,6 +1,6 @@
 #include "clueboard1.h"
 
-#ifdef ENABLE_RGBLIGHT
+#ifdef RGBLIGHT_ENABLE
 #include "rgblight.h"
 #endif
 
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----------------------------------------------------------------------------------'
    */
 [_RS] = KEYMAP(
-  #ifdef ENABLE_RGBLIGHT
+  #ifdef RGBLIGHT_ENABLE
   KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, F(1),             F(7), \
   KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                   F(8), \
   KC_TRNS, KC_TRNS, MO(_RS),KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                         \
@@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 enum function_id {
     SHIFT_ESC,
-    #ifdef ENABLE_RGBLIGHT
+    #ifdef RGBLIGHT_ENABLE
     RGBLED_TOGGLE,
     RGBLED_STEP_MODE,
     RGBLED_INCREASE_HUE,
@@ -101,7 +101,7 @@ enum function_id {
 
 const uint16_t PROGMEM fn_actions[] = {
   [0]  = ACTION_FUNCTION(SHIFT_ESC),
-  #ifdef ENABLE_RGBLIGHT
+  #ifdef RGBLIGHT_ENABLE
   [1]  = ACTION_FUNCTION(RGBLED_TOGGLE),
   [2]  = ACTION_FUNCTION(RGBLED_STEP_MODE),
   [3]  = ACTION_FUNCTION(RGBLED_INCREASE_HUE),
@@ -137,7 +137,7 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
       }
       break;
     //led operations
-    #ifdef ENABLE_RGBLIGHT
+    #ifdef RGBLIGHT_ENABLE
     case RGBLED_TOGGLE:
       if (record->event.pressed) {
         rgblight_toggle();