1 files changed, 7 insertions, 13 deletions

diff --git a/keyboards/6ball/keymaps/default/keymap.c b/keyboards/6ball/keymaps/default/keymap.c
index f93587ffc..5081161e3 100644
--- a/keyboards/6ball/keymaps/default/keymap.c
+++ b/keyboards/6ball/keymaps/default/keymap.c
@@ -1,28 +1,22 @@
-#include "6ball.h"
+#include QMK_KEYBOARD_H
 
 #define _MAIN 0
 #define _FN 1
 
-#define KC_ KC_TRNS
-
 #define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
 #define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
 #define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
 #define KC_CPYP LGUI(LSFT(LCTL(KC_4)))  // Copy portion of screen
 #define KC_X0 LT(_FN, KC_ESC)
-#define KC_RTOG RGB_TOG
-#define KC_RMOD RGB_MOD
-#define KC_RHUI RGB_HUI
-#define KC_RHUD RGB_HUD
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_MAIN] = KC_KEYMAP(
-      F  , X0 ,LCTL,
-      R  , D  , M  
+  [_MAIN] = LAYOUT(
+    KC_F, KC_X0, KC_LCTL,
+    KC_R, KC_D,  KC_M
   ),
 
-  [_FN] = KC_KEYMAP(
-      F  ,    ,RHUI,
-     RTOG,RMOD,RHUD
+  [_FN] = LAYOUT(
+    KC_F,    KC_TRNS, RGB_HUI,
+    RGB_TOG, RGB_MOD, RGB_HUD
   )
 };