diff --git a/keyboards/nyquist/keymaps/333fred/config.h b/keyboards/nyquist/keymaps/333fred/config.h
index 6335ce9b0..575ec9ac5 100644
--- a/keyboards/nyquist/keymaps/333fred/config.h
+++ b/keyboards/nyquist/keymaps/333fred/config.h
@@ -1,5 +1,4 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+#pragma once
 
 #include "../../config.h"
 #include "333fred_config.h"
@@ -9,5 +8,3 @@
 
 #undef  TAPPING_TERM
 #define TAPPING_TERM 150
-
-#endif
diff --git a/keyboards/nyquist/keymaps/333fred/keymap.c b/keyboards/nyquist/keymaps/333fred/keymap.c
index fd1a7d47f..c25bf1c5f 100644
--- a/keyboards/nyquist/keymaps/333fred/keymap.c
+++ b/keyboards/nyquist/keymaps/333fred/keymap.c
@@ -94,13 +94,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [GAME] =  LAYOUT( \
-    KC_ESC,  _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______,    \
-    _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______,    \
-    KC_LCTL, _______, _______, _______, KC_F,    _______, _______,     _______, _______, _______, _______, _______,    \
-    KC_LSFT, KC_Z,    _______, _______, _______, _______, _______,     _______, _______, _______, _______, KC_LGUI,    \
+    KC_ESC,  _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______,    \
+    _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______,    \
+    KC_LCTL, _______, _______, _______, KC_F,    _______, _______,   _______, _______, _______, _______, _______,    \
+    KC_LSFT, KC_Z,    _______, _______, _______, _______, _______,   _______, _______, _______, _______, KC_LGUI,    \
     KC_ENT,  _______, KC_LOCK, KC_BSPC, KC_LALT, KC_SPC,  OSL(SYMB), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
 )
-
 };
 
 void persistent_default_layer_set(uint16_t default_layer) {
diff --git a/keyboards/nyquist/keymaps/333fred/rules.mk b/keyboards/nyquist/keymaps/333fred/rules.mk
index 5a3543a6f..0cfb23466 100644
--- a/keyboards/nyquist/keymaps/333fred/rules.mk
+++ b/keyboards/nyquist/keymaps/333fred/rules.mk
@@ -2,7 +2,3 @@ KEY_LOCK_ENABLE = yes
 NKRO_ENABLE = yes
 CONSOLE_ENABLE = no
 TAP_DANCE_ENABLE = yes
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/zen/config.h b/keyboards/zen/config.h
index f8f8bbf33..4478062eb 100644
--- a/keyboards/zen/config.h
+++ b/keyboards/zen/config.h
@@ -26,4 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 16
 
-#define TAPPING_TERM 100
\ No newline at end of file
+#ifndef TAPPING_TERM
+#define TAPPING_TERM 100
+#endif
diff --git a/keyboards/zen/keymaps/333fred/config.h b/keyboards/zen/keymaps/333fred/config.h
new file mode 100644
index 000000000..1634f368c
--- /dev/null
+++ b/keyboards/zen/keymaps/333fred/config.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2018 Fredric Silberberg
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* Use I2C or Serial, not both */
+
+#define USE_SERIAL
+
+/* Select hand configuration */
+//#define MASTER_LEFT
+#define EE_HANDS
+
+#undef RGBLED_NUM
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 16
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+
+#undef  TAPPING_TERM
+#define TAPPING_TERM 150
diff --git a/keyboards/zen/keymaps/333fred/keymap.c b/keyboards/zen/keymaps/333fred/keymap.c
new file mode 100644
index 000000000..5332062e0
--- /dev/null
+++ b/keyboards/zen/keymaps/333fred/keymap.c
@@ -0,0 +1,129 @@
+#include QMK_KEYBOARD_H
+#include "333fred.h"
+
+extern keymap_config_t keymap_config;
+
+enum custom_macros {
+    DLEFT,
+    DRIGHT,
+    PSCREEN_APP
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------.             .-----------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |  \   |
+ * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |             |   N  |   M  |   ,  |   .  |   /  |SHIFT |
+ * |------+------+------+------+------+------+------..-----+------+------+------+------+------+------|
+ * | Ctrl |  F4  |  F5  |  GUI | Alt  | Bksp |Lwr/VM||Enter|Space |  NAV |   -  |   =  |  Alt | Del  |
+ * `------------------------------------------------''-----------------------------------------------'
+ */
+[BASE] = KEYMAP( \
+  KC_GRV,        KC_1,         KC_2,  KC_3,    KC_4,    KC_5,                            KC_6,     KC_7,     KC_8,    KC_9,    KC_0,    KC_MINUS, \
+  KC_TAB,        KC_Q,         KC_W,  KC_E,    KC_R,    KC_T,                            KC_Y,     KC_U,     KC_I,    KC_O,    KC_P,    KC_BSLS, \
+  KC_ESC,        KC_A,         KC_S,  KC_D,    KC_F,    KC_G,                            KC_H,     KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+  OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X,  KC_C,    KC_V,    KC_B,                            KC_N,     KC_M,     KC_COMM, KC_DOT,  KC_SLSH, OSM(MOD_RSFT) , \
+  KC_LCTL,       KC_F4,        KC_F5, KC_LGUI, KC_LALT, KC_BSPC, TD(TD_SYM_VIM), KC_ENT, KC_SPACE, OSL(VIM), KC_MINS, KC_EQL,  KC_RALT, KC_DEL \
+),
+
+/* Symbols
+ * ,-----------------------------------------.              .-----------------------------------------.
+ * | Caps |  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
+ * |------+------+------+------+------+------|              |------+------+------+------+------+------|
+ * |      |   !  |   @  |   (  |   )  |   |  |              |   7  |   8  |   9  |   *  |   )  |  F12 |
+ * |------+------+------+------+------+------|              |------+------+------+------+------+------|
+ * |      |   #  |   $  |   {  |   }  |   `  |              |   4  |   5  |   6  |   +  |   }  |  |   |
+ * |------+------+------+------+------+------|              |------+------+------+------+------+------|
+ * | APscr|   %  |   ^  |   [  |   ]  |   ~  |              |   1  |   2  |   3  |   \  | Vol- | Vol+ |
+ * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
+ * | Pscr |      | RESET|      |      | GAME |      ||      |   0  |   .  |   =  | Prev | Next | Play |
+ * `------------------------------------------------- -------------------------------------------------'
+ */
+[SYMB] = KEYMAP( \
+    KC_CAPS,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6, KC_F7,  KC_F8,  KC_F9,   KC_F10,  KC_F11, \
+    _______,        KC_EXLM, KC_AT,   KC_LPRN, KC_RPRN, KC_PIPE,                    KC_7,  KC_8,   KC_9,   KC_ASTR, KC_RPRN, KC_F12, \
+    _______,        KC_HASH, KC_DLR,  KC_LCBR, KC_RCBR, KC_GRV,                     KC_4,  KC_5,   KC_6,   KC_PLUS, KC_RCBR, KC_PIPE, \
+    M(PSCREEN_APP), KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD,                    KC_1,  KC_2,   KC_3,   KC_BSLS, KC_VOLD, KC_VOLU, \
+    KC_PSCR,        _______, RESET,   _______, _______, TO(GAME), _______, _______, KC_0,  KC_DOT, KC_EQL, KC_MPRV, KC_MNXT, KC_MPLY \
+),
+
+/* Vim Movement
+ * ,-----------------------------------------.              .-----------------------------------------.
+ * |      |      |      |      |      |      |              |      |      |      |      | RESET|      |
+ * |------+------+------+------+------+------|              |------+------+------+------+------+------|
+ * |      |RGBSAI|RGBVAI|RGBSAD| LSFT |      |              |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|              |------+------+------+------+------+------|
+ * |      | DLeft|DRight| LCTRL| LGUI |      |              | Left | Down |  Up  | Right|      |      |
+ * |------+------+------+------+------+------|              |------+------+------+------+------+------|
+ * |      |RGBHUD|RGBVAD|RGBHUI|      |      |              |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      ||      |      |      |      |      |      |      |
+ * `------------------------------------------------..------------------------------------------------'
+ */
+[VIM] =  KEYMAP( \
+    _______, _______,  _______,   _______, _______, _______,                   _______, _______, _______, _______, RESET,   _______, \
+    _______, RGB_SAI,  RGB_VAI,   RGB_SAD, KC_LSFT, _______,                   _______, _______, _______, _______, _______, _______, \
+    _______, M(DLEFT), M(DRIGHT), KC_LCTL, KC_LGUI, _______,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
+    _______, RGB_HUD,  RGB_VAD,   RGB_HUI, _______, _______,                   _______, _______, _______, _______, _______, _______, \
+    _______, _______,  _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+),
+
+/* Gaming mode (Raise)
+ * All one-shot mods are disabled on this layer
+ * ,-----------------------------------------.              .-----------------------------------------.
+ * | ESC  |      |      |      |      |      |              |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|              |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |              |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|              |------+------+------+------+------+------|
+ * | CTRL |      |      |      |   F  |      |              |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|              |------+------+------+------+------+------|
+ * | Shift|   Z  |      |      |      |      |              |      |      |      |      |      |  GUI |
+ * |------+------+------+------+------+------+------..------+------+------+------+------+------+------|
+ * | Enter|      | Lock | Bksp |  Alt |  Spc | RESET||      | Lower| Left |  Up  | Down | Right|QWERTY|
+ * `------------------------------------------------..-----------------------------------------------'
+ */
+[GAME] =  KEYMAP( \
+    KC_ESC,  _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \
+    KC_LCTL, _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______, \
+    KC_LSFT, KC_Z,    _______, _______, _______, _______,                    _______, _______, _______, _______, _______, KC_LGUI, \
+    KC_ENT,  _______, KC_LOCK, KC_BSPC, KC_F5,   KC_LALT, KC_SPC, OSL(SYMB), KC_F6,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, TO(BASE) \
+)
+};
+
+void persistant_default_layer_set(uint16_t default_layer) {
+  eeconfig_update_default_layer(default_layer);
+  default_layer_set(default_layer);
+}
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+    switch(id) {
+        case DLEFT:
+            if (record->event.pressed) { // Windows move desktop left
+                return MACRO(D(LCTL), D(LGUI), T(LEFT), U(LGUI), U(LCTL), END);
+            }
+            break;
+        case DRIGHT:
+            if (record->event.pressed) { // Windows move desktop right
+                return MACRO(D(LCTL), D(LGUI), T(RIGHT), U(LGUI), U(LCTL), END);
+            }
+            break;
+        case PSCREEN_APP:
+            if (record->event.pressed) {
+                return MACRO(D(LALT), T(PSCR), U(LALT), END);
+            }
+            break;
+    }
+    return MACRO_NONE;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    tap_dance_process_record(keycode);
+    return true;
+}
diff --git a/keyboards/zen/keymaps/333fred/rules.mk b/keyboards/zen/keymaps/333fred/rules.mk
new file mode 100644
index 000000000..38b715550
--- /dev/null
+++ b/keyboards/zen/keymaps/333fred/rules.mk
@@ -0,0 +1,7 @@
+RGBLIGHT_ENABLE = yes
+BACKLIGHT_ENABLE = no
+NKRO_ENABLE = yes
+KEY_LOCK_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+CONSOLE_ENABLE = no
+EXTRAFLAGS += -flto
diff --git a/layouts/community/ergodox/333fred/config.h b/layouts/community/ergodox/333fred/config.h
index d886bf821..82255e05e 100644
--- a/layouts/community/ergodox/333fred/config.h
+++ b/layouts/community/ergodox/333fred/config.h
@@ -1,11 +1,7 @@
-#ifndef CONFIG_H_
-#define CONFIG_H_
+#pragma once
 
 #include QMK_KEYBOARD_CONFIG_H
 #include "333fred_config.h"
 
 #undef TAPPING_TERM
 #define TAPPING_TERM 200
-
-
-#endif
diff --git a/layouts/community/ergodox/333fred/keymap.c b/layouts/community/ergodox/333fred/keymap.c
index 479e4702c..d7728a5bd 100644
--- a/layouts/community/ergodox/333fred/keymap.c
+++ b/layouts/community/ergodox/333fred/keymap.c
@@ -363,15 +363,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-};
-
-
 // Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
+void matrix_scan_user_keyboard(void) {
     ergodox_board_led_on();
     ergodox_led_all_on();
-};
+}
 
diff --git a/layouts/community/ergodox/333fred/rules.mk b/layouts/community/ergodox/333fred/rules.mk
index 2a522112e..1549bcfc8 100644
--- a/layouts/community/ergodox/333fred/rules.mk
+++ b/layouts/community/ergodox/333fred/rules.mk
@@ -5,5 +5,3 @@ NKRO_ENABLE = yes
 KEY_LOCK_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 CONSOLE_ENABLE = no
-
-
diff --git a/users/333fred/333fred.c b/users/333fred/333fred.c
index ef2d741e5..12ee9e7d7 100644
--- a/users/333fred/333fred.c
+++ b/users/333fred/333fred.c
@@ -34,6 +34,7 @@ void tap_dance_layer_finished(qk_tap_dance_state_t *state, void *user_data) {
             break;
         case DOUBLE:
             layer_on(VIM);
+            break;
     }
 }
 
@@ -61,3 +62,26 @@ void tap_dance_process_record(uint16_t keycode) {
         tap_dance_active = false;
     }
 }
+
+__attribute__ ((weak))
+void matrix_init_rgb(void) {}
+
+__attribute__ ((weak))
+void layer_state_set_rgb(uint32_t state) {}
+
+__attribute__ ((weak))
+void matrix_scan_user_keyboard(void) {}
+
+void matrix_scan_user() {
+  static bool first_run = true;
+  if (first_run) {
+    first_run = false;
+    matrix_init_rgb();
+  }
+  matrix_scan_user_keyboard();
+}
+
+uint32_t layer_state_set_user(uint32_t state) {
+  layer_state_set_rgb(state);
+  return state;
+}
diff --git a/users/333fred/333fred.h b/users/333fred/333fred.h
index 4a0462b7a..8599198a5 100644
--- a/users/333fred/333fred.h
+++ b/users/333fred/333fred.h
@@ -1,5 +1,4 @@
-#ifndef FRED_333
-#define FRED_333
+#pragma once
 
 #include "quantum.h"
 
@@ -18,5 +17,3 @@ enum tap_dance_declarations {
 void tap_dance_layer_finished(qk_tap_dance_state_t*, void*);
 void tap_dance_layer_reset(qk_tap_dance_state_t*, void*);
 void tap_dance_process_record(uint16_t);
-
-#endif
diff --git a/users/333fred/333fred_config.h b/users/333fred/333fred_config.h
index f796abc09..7c637d8d3 100644
--- a/users/333fred/333fred_config.h
+++ b/users/333fred/333fred_config.h
@@ -1,7 +1,4 @@
-#ifndef FRED333_CONFIG
-#define FRED333_CONFIG
+#pragma once
 
 #define PREVENT_STUCK_MODIFIERS
 #define PERMISSIVE_HOLD
-
-#endif
diff --git a/users/333fred/rgb.c b/users/333fred/rgb.c
new file mode 100644
index 000000000..a3dfd905c
--- /dev/null
+++ b/users/333fred/rgb.c
@@ -0,0 +1,28 @@
+#include "quantum.h"
+#include "333fred.h"
+
+void matrix_init_rgb(void) {
+  rgblight_enable_noeeprom();
+  rgblight_sethsv_noeeprom(270, 255, 20);
+}
+
+void layer_state_set_rgb(uint32_t state) {
+  switch (biton32(state)) {
+    case BASE:
+      // purple
+      rgblight_sethsv_noeeprom(270, 255, 20);
+      break;
+    case SYMB:
+      // blue
+      rgblight_sethsv_noeeprom(240, 255, 20);
+      break;
+    case VIM:
+      // green
+      rgblight_sethsv_noeeprom(120, 255, 20);
+      break;
+    case GAME:
+      // red
+      rgblight_sethsv_noeeprom(0, 255, 20);
+      break;
+  }
+}
diff --git a/users/333fred/rules.mk b/users/333fred/rules.mk
index 3160ac2e6..0e2cc2588 100644
--- a/users/333fred/rules.mk
+++ b/users/333fred/rules.mk
@@ -1,2 +1,5 @@
-
 SRC += 333fred.c
+
+ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
+  SRC += rgb.c
+endif