diff --git a/keyboards/dz60/keymaps/briemens/keymap.c b/keyboards/dz60/keymaps/briemens/keymap.c
index c4422f44f..1e889d6b3 100644
--- a/keyboards/dz60/keymaps/briemens/keymap.c
+++ b/keyboards/dz60/keymaps/briemens/keymap.c
@@ -1,18 +1,85 @@
+/* Copyright 2018 Yiancar
+ *
+ * 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/>.
+ */
 #include QMK_KEYBOARD_H
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	LAYOUT_60_ansi(
-		KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
-		KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
-		KC_LCTL, KC_LALT,          KC_LGUI,                   KC_SPC,                             KC_RALT, MO(1),          KC_RGUI,   KC_RCTL),
-
-	LAYOUT_60_ansi(
-		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_DEL,
-		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
-		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
+//tapdance declarations
+enum {
+  SFT_LCK
 };
+
+//alias for tapdance
+#define SftLck TD(SFT_LCK)
+//This is the ANSI version of the PCB
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Base */
+      KC_GRV,                KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC, KC_BSPC,\
+      MT(KC_LCTL, KC_TAB),   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,\
+      LT(2, KC_ESC),         KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,    KC_J,  KC_K,     KC_L,     KC_SCLN,  KC_QUOT,           KC_ENT, \
+      SftLck,  SftLck,              KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,           KC_RSFT, KC_RSFT,\
+      KC_LCTL,  KC_LALT,  KC_LGUI,                      KC_SPC, KC_SPC, KC_SPC,                          KC_RALT,  MO(1)  ,  KC_APP, KC_APP,  KC_RCTL),
+
+  [1] = LAYOUT( /* FN */
+      KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL, KC_DEL ,\
+      KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RESET,  RESET,    KC_TRNS,\
+      KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RGHT,  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,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,             KC_TRNS, KC_TRNS,\
+      KC_VOLD,  KC_VOLU,  KC_MUTE,                                KC_TRNS, KC_TRNS,   KC_TRNS,                  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS),
+
+  [2] = LAYOUT( /* Empty for dynamic keymaps */
+      KC_TRNS,  KC_BRIGHTNESS_DOWN, KC_BRIGHTNESS_UP,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_MEDIA_PREV_TRACK,  KC_MEDIA_NEXT_TRACK,  KC_MEDIA_PLAY_PAUSE,  KC_VOLD,  KC_VOLU,  KC_TRNS, KC_TRNS,\
+      KC_TRNS,  LCTL(KC_Q),  LCTL(KC_W),  LCTL(KC_E),  LCTL(KC_R),  LCTL(KC_T),  LCTL(KC_Y),  KC_PGUP,  KC_HOME,  KC_END,  KC_PGDOWN,  LSFT(LCTL(KC_TAB)),  LCTL(KC_TAB),  KC_TRNS,\
+      KC_TRNS,  LCTL(KC_A),  LCTL(KC_S),  LCTL(KC_D),  LCTL(KC_F),  LCTL(KC_G),  KC_LEFT,  KC_DOWN,  KC_UP,  KC_RIGHT,   LCTL(LALT(KC_SCOLON)),  LCTL(LALT(KC_QUOTE)), LGUI(KC_TAB),\
+      KC_TRNS,  KC_TRNS,     LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C),  LCTL(KC_V),  KC_TRNS,  LALT(KC_BSPACE),  KC_BSPACE,  KC_DELETE,  LALT(KC_DELETE),  LGUI(KC_F),      KC_TRNS, KC_TRNS,\
+      KC_LCTL,  KC_LALT,     KC_LGUI,                  KC_SPC,      KC_SPC,      KC_SPC,                     KC_RALT,    MO(1),      KC_APP,           KC_APP,          KC_RCTL)
+
+};
+
+void matrix_init_user(void) {
+  //user initialization
+}
+
+void matrix_scan_user(void) {
+  //user matrix
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+// Shift vs capslock function. From bbaserdem's Planck keymap.
+void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count == 1) {
+    register_code (KC_LSFT);
+  } else if (state->count == 2) {
+    unregister_code (KC_LSFT);
+    register_code (KC_CAPS);
+  }
+}
+void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
+  if (state->count == 1) {
+    unregister_code (KC_LSFT);
+  } else {
+    unregister_code (KC_CAPS);
+  }
+}
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  //Tap once for Shift, twice for Caps Lock
+  [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end )
+};
+
diff --git a/keyboards/dz60/rules.mk b/keyboards/dz60/rules.mk
index 7ed2571da..7e1dcd5db 100644
--- a/keyboards/dz60/rules.mk
+++ b/keyboards/dz60/rules.mk
@@ -14,15 +14,16 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes	# Mouse keys(+4700)
+BOOTMAGIC_ENABLE = lite	# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
 CONSOLE_ENABLE = no	# Console for debug(+400)
 COMMAND_ENABLE = no    # Commands for debug and configuration
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
 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 per-key backlight LEDs
-AUDIO_ENABLE = no    # There is no speaker on this PCB
-RGBLIGHT_ENABLE = yes # Enable the RGB underglow LEDs
+BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
+AUDIO_ENABLE = no
+RGBLIGHT_ENABLE = no
+TAP_DANCE_ENABLE = yes
 
 LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_abnt2