diff --git a/keyboards/kbd66/keymaps/maartenwut/config.h b/keyboards/kbd66/keymaps/maartenwut/config.h
new file mode 100755
index 000000000..c7b3d6ecc
--- /dev/null
+++ b/keyboards/kbd66/keymaps/maartenwut/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2018 Alex Peters
+ *
+ * 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/>.
+ */
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "config_common.h"
+
+// place overrides here
+
+#endif
diff --git a/keyboards/kbd66/keymaps/maartenwut/keymap.c b/keyboards/kbd66/keymaps/maartenwut/keymap.c
new file mode 100755
index 000000000..762bed221
--- /dev/null
+++ b/keyboards/kbd66/keymaps/maartenwut/keymap.c
@@ -0,0 +1,69 @@
+#include "kbd66.h"
+
+#define _MA 0
+#define _GA 1
+#define _FL 2
+#define _AR 3
+#define _LE 4
+#define _LO 5
+#define _UL 6
+
+#define TRNS KC_TRNS
+#define ______ KC_NO
+#define trigger_time 400
+
+#define LSHIFT OSM(MOD_LSFT)
+#define SPACE LT(_AR, KC_SPC)
+#define CAPS LT(_LE, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// Main Layer
+[_MA] = KEYMAP_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_MPLY,	KC_BSPC,	KC_PSCR,
+	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_DEL,
+	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,
+	LSHIFT, 	TRNS,		KC_Z, 		KC_X,   	KC_C, 		KC_V, 		KC_B, 		KC_N, 		KC_M, 		KC_COMM, 	KC_DOT,		KC_SLSH, 	KC_RSFT,    TRNS,		KC_UP,
+	KC_LCTL, 	KC_LGUI, 	KC_LALT,							SPACE,					SPACE,								KC_RALT,	KC_RCTRL, 	MO(_FL),	KC_LEFT, 	KC_DOWN, 	KC_RGHT),
+
+//Function Layer
+[_FL] = KEYMAP_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,		TRNS,		RESET,		KC_PGUP,
+	TRNS, 		KC_BTN1,	KC_MS_U,  	KC_BTN2, 	TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS,		TRNS,					KC_PGDN,
+	TRNS, 		KC_MS_L,	KC_MS_D, 	KC_MS_R,	TRNS,		TG(_GA),	TRNS,		TRNS,		TRNS,		TRNS,		TRNS,		TRNS,					TRNS,
+	TRNS, 		TRNS,		TRNS,		TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS,		TRNS,		KC_VOLD,	KC_VOLU,	KC_MUTE,	TRNS,		TRNS,		KC_WH_U,
+	TRNS, 		TRNS, 		TRNS,								TRNS,					TRNS,								TRNS,		TRNS,		TRNS,   	KC_WH_L,	KC_WH_D, 	KC_WH_R),
+
+//Arrow keys layer (space bar)
+[_AR] = KEYMAP_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,		TRNS,		TRNS,		TRNS,
+	TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,		TRNS,		TRNS,					TRNS,
+	TRNS,		TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS,	  	TRNS, 		TRNS, 	 				TRNS,
+	TRNS,		TRNS,		TRNS,		TRNS,		TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS,   	TRNS,		TRNS,
+	TRNS, 		TRNS, 		TRNS,								TRNS,					TRNS,								TRNS,		TRNS, 		M(0),		TRNS, 		TRNS, 		TRNS),
+//LED control layer (caps)
+[_LE] = KEYMAP_ANSI(
+	TRNS,		TRNS,		TRNS,  		TRNS,  		TRNS,  		TRNS,		TRNS,		TRNS, 		TRNS,		TRNS,		TRNS,  		TRNS,		TRNS,		TRNS,		TRNS,		TRNS,
+	TRNS,		BL_TOGG, 	TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,		TRNS,		TRNS,					TRNS,
+	TRNS,		BL_INC,		TRNS,   	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS, 	 				TRNS,
+	TRNS,		TRNS,		BL_DEC,		TRNS,		TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS,   	TRNS,		TRNS,
+	TRNS, 		TRNS, 		TRNS,								TRNS,					TRNS,								TRNS,		TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS),
+
+//Game layer (fn + g)
+[_GA] = KEYMAP_ANSI(
+	TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS,		TRNS,		TRNS,		TRNS,
+	TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,		TRNS,		TRNS,					TRNS,
+	KC_CAPS,	TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,  					TRNS,
+	KC_LSFT, 	TRNS,		TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS,		TRNS,		TRNS,
+	TRNS, 		TRNS, 		TRNS,								KC_SPC,					KC_SPC,								TRNS,		TRNS, 		MO(_FL),	TRNS, 		TRNS, 		TRNS),
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+    switch (id) {
+		case 0:
+			if (record->event.pressed) {
+				SEND_STRING("AdminF123!");
+			}
+			break;
+	}
+    return MACRO_NONE;
+};
\ No newline at end of file
diff --git a/keyboards/kbd66/keymaps/maartenwut/readme.md b/keyboards/kbd66/keymaps/maartenwut/readme.md
new file mode 100755
index 000000000..24be72c01
--- /dev/null
+++ b/keyboards/kbd66/keymaps/maartenwut/readme.md
@@ -0,0 +1,3 @@
+# Maartenwut's KBD66 layout
+
+This is Maartenwut's layout, which is really similar to Maartenwut's Tada68 layout.
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/maartenwut/config.h b/keyboards/tada68/keymaps/maartenwut/config.h
index 7d81548b7..a5568e400 100755
--- a/keyboards/tada68/keymaps/maartenwut/config.h
+++ b/keyboards/tada68/keymaps/maartenwut/config.h
@@ -1,3 +1 @@
 #include "../../config.h"
-
-#define BACKLIGHT_BREATHING
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/maartenwut/keymap.c b/keyboards/tada68/keymaps/maartenwut/keymap.c
index 8ddd6e305..c5b9d987e 100755
--- a/keyboards/tada68/keymaps/maartenwut/keymap.c
+++ b/keyboards/tada68/keymaps/maartenwut/keymap.c
@@ -1,414 +1,82 @@
 #include "tada68.h"
-#include "action_layer.h"
-#include "timer.h"
-#include "bootloader.h"
-#include "command.h"
 
 #define _MA 0
 #define _GA 1
 #define _FL 2
 #define _AR 3
-#define _LO 4
-#define _UL 5
+#define _LE 4
+#define _LO 5
+#define _UL 6
 
 #define TRNS KC_TRNS
 #define trigger_time 400
 
-#define T1 M(1)
-#define T2 M(2)
-#define T3 M(3)
-#define T4 M(4)
-#define T5 M(5)
-#define T6 M(6)
-#define T7 M(7)
-#define T8 M(8)
-#define T9 M(9)
-#define T10 M(10)
-#define T11 M(11)
-#define T12 M(12)
-#define END_HOME M(0)
 #define LSHIFT OSM(MOD_LSFT)
 #define SPACE LT(_AR, KC_SPC)
-
-static uint16_t key_timer;
-
-enum emoticons {
-	LENNY = SAFE_RANGE,
-	DWNHRT,
-	SHRUG
-};
+#define CAPS LT(_LE, KC_CAPS)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _MA: Main Layer, Default
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |P/P |
-   * |----------------------------------------------------------------| 
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shft|End|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt|Ctrl| FN|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
+// Main Layer
 [_MA] = KEYMAP_ANSI(
-  KC_ESC,	T1, 		T2, 		T3, 		T4, 		T5, 		T6, 		T7, 		T8, 		T9, 		T10, 		T11, 		T12,		KC_BSPC,	KC_MPLY, \
-  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_DEL, \
-  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_PGUP, \
-  LSHIFT, 	END_HOME,	KC_Z, 		KC_X,   	KC_C, 		KC_V, 		KC_B, 		KC_N, 		KC_M, 		KC_COMM, 	KC_DOT,		KC_SLSH, 	KC_RSFT,    KC_UP,		KC_PGDN, \
-  KC_LCTL, 	KC_LGUI, 	KC_LALT,							SPACE,											KC_RALT,	KC_RCTRL, 	MO(_FL),	KC_LEFT, 	KC_DOWN, 	KC_RGHT),
-  
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |~` | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Reset  |Prsc|
-   * |----------------------------------------------------------------|
-   * |     |MbL|MsU|MbR|   |   |   |   |   |   |   |   |   |     |_LO |
-   * |----------------------------------------------------------------|
-   * |      |MsL|MsD|MsR|   |_GA|   |   |   |   |   |   |        |Hme |
-   * |----------------------------------------------------------------|
-   * |    |   |   |   |   |   |   |   |   |VoU|VoD|Mut|      |MwU|End |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MwL|MwD|MwR |  
-   * `----------------------------------------------------------------'
-   */
+	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_MPLY,
+	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_DEL,
+	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_PGUP,
+	LSHIFT, 				KC_Z, 		KC_X,   	KC_C, 		KC_V, 		KC_B, 		KC_N, 		KC_M, 		KC_COMM, 	KC_DOT,		KC_SLSH, 	KC_RSFT,    KC_UP,		KC_PGDN,
+	KC_LCTL, 	KC_LGUI, 	KC_LALT,							SPACE,											KC_RALT,	KC_RCTRL, 	MO(_FL),	KC_LEFT, 	KC_DOWN, 	KC_RGHT),
+
+//Function Layer
 [_FL] = KEYMAP_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,		RESET,		KC_PSCR, \
-  TRNS, 	KC_BTN1,	KC_MS_U,  	KC_BTN2, 	TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS,		TRNS,		TO(_LO), \
-  TRNS, 	KC_MS_L,	KC_MS_D, 	KC_MS_R,	TRNS,		TG(_GA),	TRNS,		TRNS,		TRNS,		TRNS,		TRNS,		TRNS,					TRNS,		KC_HOME, \
-  TRNS, 	TRNS,		TRNS,		TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS,		TRNS,		KC_VOLD,	KC_VOLU,	KC_MUTE,	TRNS,		KC_WH_U,	KC_END, \
-  TRNS, 	TRNS, 		TRNS,								TRNS,											TRNS,		TRNS,		TRNS,   	KC_WH_L,	KC_WH_D, 	KC_WH_R),
+	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,		RESET,		KC_PSCR,
+	TRNS, 		KC_BTN1,	KC_MS_U,  	KC_BTN2, 	TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS,		TRNS,		TO(_LO),
+	TRNS, 		KC_MS_L,	KC_MS_D, 	KC_MS_R,	TRNS,		TG(_GA),	TRNS,		TRNS,		TRNS,		TRNS,		TRNS,		TRNS,					TRNS,		KC_HOME,
+	TRNS, 					TRNS,		TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS,		TRNS,		KC_VOLD,	KC_VOLU,	KC_MUTE,	TRNS,		KC_WH_U,	KC_END,
+	TRNS, 		TRNS, 		TRNS,								TRNS,											TRNS,		TRNS,		TRNS,   	KC_WH_L,	KC_WH_D, 	KC_WH_R),
 
-  /* Keymap _AR: Arrow layer
-   * ,----------------------------------------------------------------.
-   * |~` | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|       |    |
-   * |----------------------------------------------------------------|
-   * |Lenny|   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |Dwnhrt|   |   |   |   |   |Lft|Dwn| Up|Rgt|   |   |        |    |
-   * |----------------------------------------------------------------|
-   * |Shrg|   |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
+//Arrow keys layer (space bar)
 [_AR] = KEYMAP_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,		TRNS,		TRNS, \
-  LENNY,	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,		TRNS,		TRNS,		TRNS, \
-  DWNHRT,	TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS, 		KC_LEFT, 	KC_DOWN, 	KC_UP,  	KC_RGHT,  	TRNS, 		TRNS, 	 				TRNS,		TRNS, \
-  SHRUG, 	TRNS,   	TRNS,		TRNS,		TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS,   	TRNS,		TRNS, \
-  TRNS, 	TRNS, 		TRNS,								TRNS,											TRNS,		TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS),
+	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,		TRNS,		TRNS,
+	TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,		TRNS,		TRNS,		TRNS,
+	TRNS,		TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS, 		KC_LEFT, 	KC_DOWN, 	KC_UP,  	KC_RGHT,  	TRNS, 		TRNS, 	 				TRNS,		TRNS,
+	TRNS,					TERM_ON,	TERM_OFF,	TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS,   	TRNS,		TRNS,
+	TRNS, 		TRNS, 		TRNS,								TRNS,											TRNS,		TRNS, 		M(0),		TRNS, 		TRNS, 		TRNS),
+//LED control layer (caps)
+[_LE] = KEYMAP_ANSI(
+	TRNS,		TRNS,		TRNS,  		TRNS,  		TRNS,  		TRNS,		TRNS,		TRNS, 		TRNS,		TRNS,		TRNS,  		TRNS,		TRNS,		TRNS,		TRNS,
+	TRNS,		BL_TOGG, 	TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,		TRNS,		TRNS,		TRNS,
+	TRNS,		BL_INC,		TRNS,   	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS, 	 				TRNS,		TRNS,
+	TRNS,					BL_DEC,		TRNS,		TRNS,		TRNS,	 	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS,   	TRNS,		TRNS,
+	TRNS, 		TRNS, 		TRNS,								TRNS,											TRNS,		TRNS, 		TRNS,		TRNS, 		TRNS, 		TRNS),
 
-  /* Keymap _GA: Game layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |P/P |
-   * |----------------------------------------------------------------| 
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shft|End|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt|Ctrl| FN|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
+//Game layer (fn + g)
 [_GA] = KEYMAP_ANSI(
-  KC_ESC,	T1, 		T2, 		T3, 		T4, 		T5, 		T6, 		T7, 		T8, 		T9, 		T10, 		T11, 		T12,		KC_BSPC,	KC_MPLY, \
-  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_DEL, \
-  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_PGUP, \
-  KC_LSFT, 	END_HOME,	KC_Z, 		KC_X,   	KC_C, 		KC_V, 		KC_B, 		KC_N, 		KC_M, 		KC_COMM, 	KC_DOT,		KC_SLSH, 	KC_RSFT,    KC_UP,		KC_PGDN, \
-  KC_LCTL, 	KC_LGUI, 	KC_LALT,							KC_SPC,											KC_RALT,	KC_RCTRL, 	MO(_FL),	KC_LEFT, 	KC_DOWN, 	KC_RGHT),
+	TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS,		TRNS,		TRNS,
+	TRNS,		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,		TRNS,		TRNS,		TRNS,
+	KC_CAPS,	TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,  		TRNS,  		TRNS, 		TRNS,  					TRNS,		TRNS,
+	KC_LSFT, 				TRNS, 		TRNS,   	TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS, 		TRNS,		TRNS, 		TRNS,		TRNS,		TRNS,
+	TRNS, 		TRNS, 		TRNS,								KC_SPC,											TRNS,		TRNS, 		MO(_FL),	TRNS, 		TRNS, 		TRNS),
 
-  /* Keymap _UL: Unlock layer
-   * ,----------------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |_MA |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |    |
-   * |----------------------------------------------------------------|
-   * |    |   |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
 [_UL] = KEYMAP_ANSI(
-  KC_NO,	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, \
-  KC_NO, 	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO,  	KC_NO, 		TO(_MA), \
-  KC_NO, 	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 					KC_NO, 		KC_NO, \
-  KC_NO, 	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, \
-  KC_NO, 	KC_NO, 		KC_NO,    							KC_NO,											KC_NO, 		KC_NO, 		TRNS, 		KC_NO, 		KC_NO, 		KC_NO),
+	KC_NO,		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,
+	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO,  	KC_NO, 		TO(_MA),
+	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 					KC_NO, 		KC_NO,
+	KC_NO, 			 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,
+	KC_NO, 		KC_NO, 		KC_NO,    							KC_NO,											KC_NO, 		KC_NO, 		TRNS, 		KC_NO, 		KC_NO, 		KC_NO),
 
-  /* Keymap _LO: Lock layer
-   * ,----------------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |    |
-   * |----------------------------------------------------------------|
-   * |    |   |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                      |   |   | _UL |   |   |    |
-   * `----------------------------------------------------------------'
-   */
 [_LO] = KEYMAP_ANSI(
-  KC_NO,	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, \
-  KC_NO, 	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO,  	KC_NO, 		KC_NO, \
-  KC_NO, 	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 					KC_NO, 		KC_NO, \
-  KC_NO, 	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, \
-  KC_NO, 	KC_NO, 		KC_NO,    							KC_NO,											KC_NO, 		KC_NO, 		MO(_UL), 	KC_NO, 		KC_NO, 		KC_NO),
-};
-
-void tap(uint16_t keycode){
-    register_code(keycode);
-    unregister_code(keycode);
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	switch (keycode) {
-		case LENNY:			// ( ͡° ͜ʖ ͡°)
-			if(record->event.pressed){
-				set_unicode_input_mode(UC_WIN);
-				register_code(KC_LSFT);
-				tap(KC_9);										// Head
-				unregister_code(KC_LSFT);
-				tap(KC_SPC);									// Space
-				process_unicode((0x0361|QK_UNICODE), record);	// Eyebrow
-				process_unicode((0x00B0|QK_UNICODE), record);	// Eye
-				tap(KC_SPC);
-				process_unicode((0x035C|QK_UNICODE), record);	// Mouth
-				process_unicode((0x0296|QK_UNICODE), record);	// Nose
-				tap(KC_SPC);
-				process_unicode((0x0361|QK_UNICODE), record);	// Eyebrow
-				process_unicode((0x00B0|QK_UNICODE), record);	// Eye
-				register_code(KC_LSFT);
-				tap(KC_0);										// Head
-				unregister_code(KC_LSFT);
-			}
-			return false;
-			break;
-		case DWNHRT:		// (´・ω・`)
-			if(record->event.pressed){
-				set_unicode_input_mode(UC_WIN);
-				register_code(KC_LSFT);
-				tap(KC_9);										// Head
-				unregister_code(KC_LSFT);
-				process_unicode((0x00B4|QK_UNICODE), record);	// Eyebrow
-				process_unicode((0x30FB|QK_UNICODE), record);	// Eye
-				process_unicode((0x03C9|QK_UNICODE), record);	// Mouth
-				process_unicode((0x30FB|QK_UNICODE), record);	// Eye
-				process_unicode((0x0060|QK_UNICODE), record);	// Eyebrow
-				register_code(KC_LSFT);
-				tap(KC_0);										// Head
-				unregister_code(KC_LSFT);
-			}
-			return false;
-			break;
-		case SHRUG:			// ¯\_(ツ)_/¯
-			if(record->event.pressed){
-				set_unicode_input_mode(UC_WIN);
-				process_unicode((0x00AF|QK_UNICODE), record);	// Hand
-				tap(KC_BSLS);									// Arm
-				register_code(KC_LSFT);
-				tap(KC_UNDS);									// Arm
-				tap(KC_LPRN);									// Head
-				unregister_code(KC_LSFT);
-				process_unicode((0x30C4|QK_UNICODE), record);	// Face
-				register_code(KC_LSFT);
-				tap(KC_RPRN);									// Head
-				tap(KC_UNDS);									// Arm
-				unregister_code(KC_LSFT);
-				tap(KC_SLSH);									// Arm
-				process_unicode((0x00AF|QK_UNICODE), record);	// Hand
-			}
-			return false;
-			break;
-	}
-	return true;
+	KC_NO,		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,
+	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,  	KC_NO, 		KC_NO,  	KC_NO, 		KC_NO,
+	KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 					KC_NO, 		KC_NO,
+	KC_NO, 			 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO, 		KC_NO,
+	KC_NO, 		KC_NO, 		KC_NO,    							KC_NO,											KC_NO, 		KC_NO, 		MO(_UL), 	KC_NO, 		KC_NO, 		KC_NO),
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
     switch (id) {
 		case 0:
 			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else {
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(END), END );
-				}
-				else {
-					return MACRO( T(HOME), END );
-				}
-			}
-			break;
-		case 1:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F1), END );
-				}
-				else {
-					return MACRO( T(1), END );
-				}
-			}
-			break;
-		case 2:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F2), END );
-				}
-				else {
-					return MACRO( T(2), END );
-				}
-			}
-			break;
-		case 3:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F3), END );
-				}
-				else {
-					return MACRO( T(3), END );
-				}
-			}
-			break;
-		case 4:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F4), END );
-				}
-				else {
-					return MACRO( T(4), END );
-				}
-			}
-			break;
-		case 5:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F5), END );
-				}
-				else {
-					return MACRO( T(5), END );
-				}
-			}
-			break;
-		case 6:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F6), END );
-				}
-				else {
-					return MACRO( T(6), END );
-				}
-			}
-			break;
-		case 7:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F7), END );
-				}
-				else {
-					return MACRO( T(7), END );
-				}
-			}
-			break;
-		case 8:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F8), END );
-				}
-				else {
-					return MACRO( T(8), END );
-				}
-			}
-			break;
-		case 9:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F9), END );
-				}
-				else {
-					return MACRO( T(9), END );
-				}
-			}
-			break;
-		case 10:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F10), END );
-				}
-				else {
-					return MACRO( T(0), END );
-				}
-			}
-			break;
-		case 11:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F11), END );
-				}
-				else {
-					return MACRO( T(MINS), END );
-				}
-			}
-			break;
-		case 12:
-			if (record->event.pressed) {
-				key_timer = timer_read();
-			}
-			else { 
-				if (timer_elapsed(key_timer) > trigger_time) {
-					return MACRO( T(F12), END );
-				}
-				else {
-					return MACRO( T(EQL), END );
-				}
+				SEND_STRING("Password");
 			}
 			break;
 	}
     return MACRO_NONE;
-};
-
-void led_set_user(uint8_t usb_led) {
-	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-        PORTB |= (1<<6);
-    } else {
-        // Turn capslock off
-        PORTB &= ~(1<<6);
-    }
-}
+};
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/maartenwut/readme.md b/keyboards/tada68/keymaps/maartenwut/readme.md
index a3c97cd26..7ff85924f 100755
--- a/keyboards/tada68/keymaps/maartenwut/readme.md
+++ b/keyboards/tada68/keymaps/maartenwut/readme.md
@@ -1,3 +1,3 @@
 # Maartenwut's layout
 
-Well, this is my keyboard layout. You can call it a Tada69 if you want.
+Well, this is Maartenwut's keyboard layout.
\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/maartenwut/rules.mk b/keyboards/tada68/keymaps/maartenwut/rules.mk
deleted file mode 100644
index f9e169906..000000000
--- a/keyboards/tada68/keymaps/maartenwut/rules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes       # 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
-NKRO_ENABLE = yes           # 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
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = yes		# Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-COMBO_ENABLE = no 			# Enable key combinations
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/maartenwut/tada68.h b/keyboards/tada68/keymaps/maartenwut/tada68.h
deleted file mode 100755
index e7e17a938..000000000
--- a/keyboards/tada68/keymaps/maartenwut/tada68.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef TADA68_H
-#define TADA68_H
-
-#include "quantum.h"
-
-// readability
-#define XXX KC_NO
-
-/* TADA68 ANSI layout
-   * ,----------------------------------------------------------------.
-   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
-   * |----------------------------------------------------------------|
-   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
-   * |----------------------------------------------------------------|
-   * | 20    | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d    | 2e |
-   * |----------------------------------------------------------------|
-   * | 30 | 31| 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
-   * |----------------------------------------------------------------|
-   * | 40 | 41 | 42 |        45             | 49| 4a|  4b| 4c| 4d| 4e |
-   * `----------------------------------------------------------------'
- */
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define KEYMAP_ANSI( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
-	k40, k41, k42,           k45,                k49, k4a, k4b, k4c, k4d, k4e  \
-) \
-{ \
-	{k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
-	{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
-	{k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
-	{k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
-	{k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e}  \
-}
-
-void matrix_init_user(void);
-void matrix_scan_user(void);
-
-#endif