Merge remote-tracking branch 'remotes/jackhumbert/master'

13 files changed, 0 insertions, 882 deletions

diff --git a/keyboard/quark/common_keymaps/keymap_brett.c b/keyboard/quark/common_keymaps/keymap_brett.c
deleted file mode 100644
index 97d832b47a..0000000000
--- a/keyboard/quark/common_keymaps/keymap_brett.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = KEYMAP( 
-  ESC,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-  LCTL, A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, ENT,
-  LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, RSFT,
-  TAB, LGUI,  RSFT, LALT, FN2,     SPC,     FN1,  LEFT, DOWN, UP,   RGHT),
-[1] = KEYMAP( /* RAISE */
-  GRV,  1,    2,    3,    4,    5,    6,    7,    8,    9,    0,    DEL,
-  TRNS, F1,   F2,   F3,   F4,   F5,   F6,   4,    5,    6,   QUOT, TRNS,
-  TRNS, F7,   F8,   F9,   F10,  F11,  F12,  1,    2,    3,   TRNS, PGUP,
-  MPRV, MNXT, TRNS, MUTE, TRNS,    TRNS,    FN1,  0,  0,  TRNS, PGDN),
-[2] = KEYMAP( /* LOWER */
-  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MINS,
-  TRNS, TRNS, TRNS, PAUSE, TRNS, TRNS, TRNS, TRNS, LBRC, RBRC, BSLS, EQL,
-  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
-  MPLY, MSTP, VOLU, VOLD, FN2,     TRNS,    TRNS, TRNS, TRNS, TRNS, TRNS),
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_MOMENTARY(1),  // to Fn overlay
-    [2] = ACTION_LAYER_MOMENTARY(2),  // to Fn overlay 
-
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
-    [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
-
-    [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE),
-};
diff --git a/keyboard/quark/common_keymaps/keymap_dotcom.c b/keyboard/quark/common_keymaps/keymap_dotcom.c
deleted file mode 100644
index 347f6dea91..0000000000
--- a/keyboard/quark/common_keymaps/keymap_dotcom.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = KEYMAP( 
-  ESC,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-  FN1,  A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, ENT,
-  LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, LBRC,
-  LCTL, BSLS, QUOT, LALT, FN22,    SPC,     LEFT, UP, DOWN, RGHT,  RBRC),
-[1] = KEYMAP( 
-  GRV,  1,    2,    3,    4,    5,    6,    7,    8,    9,    0,    DEL,
-  TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17,  TRNS, TRNS, TRNS,
-  TRNS, FN18,  FN19,  FN22,  EQL,  MINS,  FN20,  TRNS,  TRNS,  TRNS,  TRNS, TRNS,
-  TRNS, TRNS, TRNS, TRNS, TRNS,    TRNS,   FN1,  TRNS, VOLD, VOLU, TRNS),
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_MOMENTARY(1),  // to Fn overlay
-
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
-    [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
-};
diff --git a/keyboard/quark/common_keymaps/keymap_jack.c b/keyboard/quark/common_keymaps/keymap_jack.c
deleted file mode 100644
index c74812121f..0000000000
--- a/keyboard/quark/common_keymaps/keymap_jack.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = KEYMAP( /* Jack */
-  TAB,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-  ESC,  A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, QUOT,
-  LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, ENT,
-  RSFT, LCTL, LALT, LGUI, FN2,    SPC,     FN1, LEFT, DOWN, UP,  RGHT),
-[1] = KEYMAP( /* Jack colemak */
-  TAB,  Q,    W,    F,    P,    G,    J,    L,    U,    Y,    SCLN, BSPC,
-  ESC,  A,    R,    S,    T,    D,    H,    N,    E,    I,    O,     QUOT,
-  LSFT, Z,    X,    C,    V,    B,    K,    M,    COMM, DOT,  SLSH, ENT,
-  FN3, LCTL, LALT, LGUI, FN2,    SPC,     FN1, LEFT, DOWN, UP,  RGHT),
-[2] = KEYMAP( /* Jack RAISE */
-  GRV,  1,    2,    3,    4,    5,    6,    7,    8,    9,    0,    BSPC,
-  TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL,  LBRC, RBRC, BSLS,
-  TRNS, F11,  F12,  F13,  F14,  F15,  F16,  F17,  F18,  F19,  F20, TRNS,
-  TRNS, TRNS, TRNS, TRNS, TRNS,    TRNS,   FN1,  MNXT, VOLD, VOLU, MPLY),
-[3] = KEYMAP( /* Jack LOWER */
-  FN22, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC,
-  TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28,
-  TRNS, F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,   F10,  TRNS,
-  TRNS, TRNS, TRNS, TRNS, FN2,    TRNS,    TRNS, MNXT, VOLD, VOLU, MPLY),
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_MOMENTARY(2),  // to Fn overlay
-    [2] = ACTION_LAYER_MOMENTARY(3),  // to Fn overlay
-
-    [3] = ACTION_DEFAULT_LAYER_SET(0),  
-    [4] = ACTION_DEFAULT_LAYER_SET(1),
-
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
-    [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
-
-    [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE),
-};
diff --git a/keyboard/quark/common_keymaps/keymap_joe.c b/keyboard/quark/common_keymaps/keymap_joe.c
deleted file mode 100644
index 07122b702c..0000000000
--- a/keyboard/quark/common_keymaps/keymap_joe.c
+++ /dev/null
@@ -1,107 +0,0 @@
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = KEYMAP( /* Joe colemak */
-  ESC,  Q,    W,    F,    P,    G,    J,    L,    U,    Y,    SCLN, MINS,
-  BSPC, A,    R,    S,    T,    D,    H,    N,    E,    I,    O,    ENT,
-  TAB,  Z,    X,    C,    V,    B,    K,    M,    COMM, DOT,  SLSH, QUOT,
-  LCTL, LGUI, LALT, LSFT, FN1,    SPC,      FN0,  LEFT, DOWN, UP,  RGHT),
-[1] = KEYMAP( /* Joe qwerty */
-  ESC,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    MINS,
-  BSPC, A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, ENT,
-  TAB,  Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, QUOT,
-  LCTL, LGUI, LALT, LSFT, FN1,    SPC,      FN0,  LEFT, DOWN, UP,  RGHT),
-[2] = KEYMAP( /* Joe RAISE */
-  F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,   F10,  F11,  F12,
-  DEL,  FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, TRNS,
-  BSLS, FN5,  FN6,  TRNS, TRNS, MENU, CAPS, INS,  PSCR, LBRC, RBRC, FN21,
-  TRNS, TRNS, TRNS, TRNS, FN2,     TRNS,    FN0,  FN26, FN27, FN28, FN29),
-[3] = KEYMAP( /* Joe LOWER */
-  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN7, FN8, FN9, FN30, FN31,
-  DEL,  1,    2,    3,    4,    5,    6,    7,    8,    9,    0,    TRNS,
-  FN25, FN3,  FN4,  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN23, FN24, EQL,
-  TRNS, TRNS, TRNS, TRNS, FN1,    TRNS,     FN2,  HOME, PGDN, PGUP, END),
-[4] = KEYMAP( /* Joe LOWER + RAISE */
-  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, MNXT, VOLD, VOLU, MPLY),
-};
-
-enum macro_id {
-    M_Q0,
-    M_Q1,
-    M_Q2,
-    M_Q3,
-    M_Q4
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-    [0] = ACTION_LAYER_MOMENTARY(2),  // to Fn overlay
-    [1] = ACTION_LAYER_MOMENTARY(3),  // to Fn overlay
-    [2] = ACTION_LAYER_MOMENTARY(4),  // to Fn overlay
-
-    [3] = ACTION_DEFAULT_LAYER_SET(0), 
-    [4] = ACTION_DEFAULT_LAYER_SET(1),
-
-    [5] = ACTION_MODS_KEY(MOD_LCTL, KC_PGDN),
-    [6] = ACTION_MODS_KEY(MOD_LCTL, KC_PGUP),
-
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
-    [25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
-
-    [7] = ACTION_MACRO(M_Q0),
-    [8] = ACTION_MACRO(M_Q1),
-    [9] = ACTION_MACRO(M_Q2),
-    [30] = ACTION_MACRO(M_Q3),
-    [31] = ACTION_MACRO(M_Q4),
-
-    [26] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_LEFT),
-    [27] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_DOWN),
-    [28] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_UP),
-    [29] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT, KC_RGHT),
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{ 
-    keyevent_t event = record->event;
-    switch (id) {
-        case M_Q0:
-            return event.pressed ?
-                MACRO( D(LSFT), T(SCLN), U(LSFT), T(SLSH), END ) :
-                MACRO_NONE;
-        case M_Q1:
-            return event.pressed ?
-                MACRO( D(LSFT), T(SCLN), T(9), U(LSFT), END ) :
-                MACRO_NONE;
-        case M_Q2:
-            return event.pressed ?
-                MACRO( D(LSFT), T(0), T(SCLN), U(LSFT), END ) :
-                MACRO_NONE;
-        case M_Q3:
-            return event.pressed ?
-                MACRO( D(LSFT), T(9), T(SCLN), U(LSFT), END ) :
-                MACRO_NONE;
-        case M_Q4:
-            return event.pressed ?
-                MACRO( D(LSFT), T(SCLN), T(0), U(LSFT), END ) :
-                MACRO_NONE;
-
-    }
-    return MACRO_NONE;
-}
\ No newline at end of file
diff --git a/keyboard/quark/common_keymaps/keymap_matthew.c b/keyboard/quark/common_keymaps/keymap_matthew.c
deleted file mode 100644
index 56e7003a97..0000000000
--- a/keyboard/quark/common_keymaps/keymap_matthew.c
+++ /dev/null
@@ -1,70 +0,0 @@
-// by Matthew Pepers - https://github.com/pepers
-
-/* grid planck layout - modified programmer dvorak
-,-----------------------------------------------------------------------------------------------.
-| pause |   @   |   |   |   ^   |       |       |       |       |   *   |   #   |   $   |  del  |
-|  esc  |  ; :  |  , <  |  . >  |   P   |   Y   |   F   |   G   |   G   |   C   |   R   | bkspc |
-|  F1   |  F2   |  F3   |  F4   |  F5   |  F6   |  F7   |  F8   |  F9   |  F10  |  F11  |  F12  |
-|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
-|   &   |   /   |   {   |   (   |   [   |   =   |   !   |   ]   |   )   |   }   |   \   |   +   |
-|  ` ~  |   A   |   O   |   E   |   U   |   I   |   D   |   H   |   T   |   N   |   S   |  - _  |
-|   %   |   7   |   5   |   3   |   1   |   9   |   0   |   2   |   4   |   6   |   8   |   ?   |
-|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
-|       |       |       |       |       |       |       |       |       |       |       | prtsc |
-|  tab  |  ' "  |   Q   |   J   |   K   |   X   |   B   |   M   |   W   |   V   |   Z   | retrn |
-|       |       |       |       |       |       |       |       |       |       |       | insrt |
-|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
-|       |       |       |       |       |       |       |       |       |       |       |       |
-| lctrl | lgui  | lalt  | ralt  | lower | shift | space | raise | left  | down  |  up   | right |
-|       |       |       |       |       |       |       |       | home  | pgdn  | pgup  |  end  |
-`-----------------------------------------------------------------------------------------------'
-*/
-
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* 0: dvorak */
-  [0] = KEYMAP_GRID( ESC, SCLN, COMM,  DOT,    P,    Y,    F,    G,    C,    R,    L, BSPC,   \
-                     GRV,    A,    O,    E,    U,    I,    D,    H,    T,    N,    S, MINS,   \
-                     TAB, QUOT,    Q,    J,    K,    X,    B,    M,    W,    V,    Z,  ENT,   \
-                    LCTL, LGUI, LALT, RALT,  FN1, LSFT,  SPC,  FN2, LEFT, DOWN,   UP, RGHT),
-
-  /* 1: lower (FN1) */
-  [1] = KEYMAP_GRID( F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,  F10,  F11,  F12,   \
-                   FN17,    7,    5,    3,    1,    9,    0,    2,    4,    6,    8, FN18,   \
-                   TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,  INS,   \
-                   TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, HOME, PGDN, PGUP,  END),
-
-  /* 2: raise (FN2) */
-  [2] = KEYMAP_GRID(PAUS, FN19, FN20, FN21, TRNS, TRNS, TRNS, TRNS, FN22, FN23, FN24,  DEL,   \
-                    FN10, SLSH, FN11, FN12, LBRC,  EQL, FN13, RBRC, FN14, FN15, BSLS, FN16,   \
-                    TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, PSCR,   \
-                    TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS),
-
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_MOMENTARY(1),               // lower Fn layer
-    [2] = ACTION_LAYER_MOMENTARY(2),               // raise Fn layer
-
-    // lower row1
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_5),        // %
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_SLASH),    // ?
-    
-    // raise row0
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_2),        // @
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLASH),   // |
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_6),        // ^
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_8),        // *
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_3),        // #
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_4),        // $
-    
-    // raise row1
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_7),        // &
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRACKET), // {
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_9),        // (
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_1),        // !
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_0),        // )
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRACKET), // }
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_EQUAL),    // +
-};
diff --git a/keyboard/quark/common_keymaps/keymap_nathan.c b/keyboard/quark/common_keymaps/keymap_nathan.c
deleted file mode 100644
index 5a0900b66d..0000000000
--- a/keyboard/quark/common_keymaps/keymap_nathan.c
+++ /dev/null
@@ -1,153 +0,0 @@
-// Author: Nathan Ross Powell <nathanrospowell@gmail.com>
-// https://github.com/nathanrosspowell/tmk_keyboard/blob/planck-jack/keyboard/planck/keymap_nathan.c
-
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   /* 0: main layer
-    * ,-----------------------------------------------------------------------.
-    * |Tab  | q   | w   | e   | r   | t   | y   | u   | i   | o   | p   | BS  |
-    * |-----------------------------------------------------------------------|
-    * |Ctrl | a   | s   | d   | f   | g   | h   | j   | k   | l   | ;   | Ret |
-    * |-----------------------------------------------------------------------|
-    * |Shift| z   | x   | c   | v   | b   | n   | m   | [   | (   | {   | <   |
-    * |-----------------------------------------------------------------------|
-    * |Meta | \   | /   | Alt |Lower|Space|Space|Upper|Left |Down | Up  |Right|
-    * `-----------------------------------------------------------------------'
-    */
-  [0] = KEYMAP_GRID(
-       TAB,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-       LCTL, A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, ENT,
-       RSFT, Z,    X,    C,    V,    B,    N,    M,    LBRC, FN10, FN11, FN12,
-       LGUI, BSLS, SLSH, LALT, FN0,  SPC,  SPC,  FN1,  LEFT, DOWN, UP,   RGHT),
-
-   /* 1: fn left/lower layer
-    * The top row are Visual Studio combos:
-    *   'Run', 'Breakpoint', 'Step over', 'Step into', 'Set cursor to line'
-    * 2nd row are key combos:
-    *   'ctrl-alt-delete', 'ctrl-shift-escape'
-    * 3rd row are macros keys:
-    *   'P0' - 'P5' execute a script on Windows machines
-    * ,-----------------------------------------------------------------------.
-    * | ESC | F5   | F9 | F10 | F11 |S+F11|CSF10|NLock|Num7 |Num8 |Num9 | Del |
-    * |-----------------------------------------------------------------------|
-    * |     |C/A/D|C/S/E| Ins |Print|Pause|SLock|Num0 |Num4 |Num5 |Num6 |Num= |
-    * |-----------------------------------------------------------------------|
-    * |     | P0  | P1  | P2  | P3  | P4  | P5  |Num. |Num1 |Num2 |Num3 |Num/ |
-    * |-----------------------------------------------------------------------|
-    * |     |User |     |     |     |     |     |     |Home |PgDn |PgUp | End |
-    * `-----------------------------------------------------------------------'
-    */
-  [1] = KEYMAP_GRID(
-       ESC,  F5,   F9,   F10,  F11,  FN30, FN31, NLCK, P7,   P8,   P9,   DEL,
-       TRNS, FN16, FN17, INS,  PSCR, PAUS, SLCK, P0,   P4,   P5,   P6,   PEQL,
-       TRNS, FN2,  FN3,  FN4,  FN5,  FN6,  FN7,  PDOT, P1,   P2,   P3,   PSLS,
-       TRNS, FN8,  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, HOME, PGDN, PGUP, END ),
-
-  /* 2: fn right/raise layer
-    * ,-----------------------------------------------------------------------.
-    * | F1  | F2  | F3  | F4  |F5   | F6  | F7  | F8  | F9  | F10 | F11 | F12 |
-    * |-----------------------------------------------------------------------|
-    * |     | !   | @   | #   | $   | %   | ^   | &   | *   | -   | +   | =   |
-    * |-----------------------------------------------------------------------|
-    * |     | _   | '   | "   | `   | ~   | ,   | .   | ]   | )   | }   | >   |
-    * |-----------------------------------------------------------------------|
-    * |     |NextT|PrevT|     |     |     | Esc |     |Mute |Vol- |Vol+ | P/P |
-    * `-----------------------------------------------------------------------'
-    */
-  [2] = KEYMAP_GRID(
-       F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,   F10,  F11,  F12,
-       TRNS, FN18, FN19, FN20, FN21, FN22, FN23, FN24, FN25, MINS, FN26, PAST,
-       TRNS, FN27, QUOT, FN28, GRV,  FN29, COMM, DOT,  RBRC, FN13, FN14, FN15,
-       TRNS, MNXT, MPRV, TRNS, TRNS, TRNS, ESC,  TRNS, MUTE, VOLD, VOLU, MPLY ),
-};
-
-enum macro_id {
-    M_P0,
-    M_P1,
-    M_P2,
-    M_P3,
-    M_P4,
-    M_P5,
-    M_USERNAME
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-  [0] = ACTION_LAYER_MOMENTARY(1), // left/lower layer
-  [1] = ACTION_LAYER_MOMENTARY(2), // right/raise layer
-  // Program macros
-  [2] = ACTION_MACRO(M_P0),
-  [3] = ACTION_MACRO(M_P1),
-  [4] = ACTION_MACRO(M_P2),
-  [5] = ACTION_MACRO(M_P3),
-  [6] = ACTION_MACRO(M_P4),
-  [7] = ACTION_MACRO(M_P5),
-  [8] = ACTION_MACRO(M_USERNAME),
-  // Braces
-  [10] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // (
-  [11] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // {
-  [12] = ACTION_MODS_KEY(MOD_LSFT, KC_COMMA), // <
-  [13] = ACTION_MODS_KEY(MOD_LSFT, KC_0),  // )
-  [14] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // }
-  [15] = ACTION_MODS_KEY(MOD_LSFT, KC_DOT), // >
-  // Combo
-  [16] = ACTION_MODS_KEY(MOD_LALT | MOD_LCTL, KC_DEL), // Ctrl+Alt+Delete
-  [17] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_ESC), // Ctrl+Shft+Escape
-  // Symbols
-  [18] = ACTION_MODS_KEY(MOD_LSFT, KC_1), // !
-  [19] = ACTION_MODS_KEY(MOD_LSFT, KC_2), // @
-  [20] = ACTION_MODS_KEY(MOD_LSFT, KC_3), // #
-  [21] = ACTION_MODS_KEY(MOD_LSFT, KC_4), // $
-  [22] = ACTION_MODS_KEY(MOD_LSFT, KC_5), // %
-  [23] = ACTION_MODS_KEY(MOD_LSFT, KC_6), // ^
-  [24] = ACTION_MODS_KEY(MOD_LSFT, KC_7), // &
-  [25] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // *
-  [26] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // +
-  [27] = ACTION_MODS_KEY(MOD_LSFT, KC_MINUS), // _
-  [28] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOTE), // "
-  [29] = ACTION_MODS_KEY(MOD_LSFT, KC_GRAVE), // ~
-  // Debugging
-  [30] = ACTION_MODS_KEY(MOD_LSFT, KC_F11), // Step into
-  [31] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_F10), // Set cursor to line
- };
-
-// Run a script and pass a key number to it. This is Windows specific and the script needs to be on your path.
-// *open run dialog* keypress.py [PRG_NUM]
-#define ADD_PYTHON_PROGRAM_ON_WIN( PRG_NUM )  MACRO( D(LGUI), T(R), U(LGUI), W(100), T(K), T(E), T(Y), T(P), T(R), T(E), T(S), T(S), T(DOT), T(P), T(Y), T(SPC), T(PRG_NUM), END )
-// *return*
-#define RUN_PYTHON_PROGRAM_ON_WIN MACRO( T(ENT), END )
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    keyevent_t event = record->event;
-    switch (id) {
-        case M_P0:
-            return event.pressed ?
-                ADD_PYTHON_PROGRAM_ON_WIN( 0 ) :
-                RUN_PYTHON_PROGRAM_ON_WIN;
-        case M_P1:
-            return event.pressed ?
-                ADD_PYTHON_PROGRAM_ON_WIN( 1 ) :
-                RUN_PYTHON_PROGRAM_ON_WIN;
-        case M_P2:
-            return event.pressed ?
-                ADD_PYTHON_PROGRAM_ON_WIN( 2 ) :
-                RUN_PYTHON_PROGRAM_ON_WIN;
-        case M_P3:
-            return event.pressed ?
-                ADD_PYTHON_PROGRAM_ON_WIN( 3 ) :
-                RUN_PYTHON_PROGRAM_ON_WIN;
-        case M_P4:
-            return event.pressed ?
-                ADD_PYTHON_PROGRAM_ON_WIN( 4 ) :
-                RUN_PYTHON_PROGRAM_ON_WIN;
-        case M_P5:
-            return event.pressed ?
-                ADD_PYTHON_PROGRAM_ON_WIN( 5 ) :
-                RUN_PYTHON_PROGRAM_ON_WIN;
-        case M_USERNAME:
-            return event.pressed ?
-                MACRO( T(N), T(A), T(T), T(H), T(A), T(N), T(R), T(O), T(S), T(S), T(P), T(O), T(W), T(E), T(L), T(L), END ) :
-                MACRO_NONE;
-    }
-    return MACRO_NONE;
-}
diff --git a/keyboard/quark/common_keymaps/keymap_peasant.c b/keyboard/quark/common_keymaps/keymap_peasant.c
deleted file mode 100644
index ddacb614e6..0000000000
--- a/keyboard/quark/common_keymaps/keymap_peasant.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = KEYMAP( /* Native */
-      ESC,     Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    FN2, 
-      BSPC,    A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, QUOT,
-      TAB,     Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, ENT,
-      DEL,     LCTL, NO,   LSFT, LALT, SPC,        NO,   LEFT, DOWN, UP,  RGHT), 
-    [1] = KEYMAP( /* QWERTY->PHOTOSHOP */
-      DELETE,  0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    FN1,
-      O,       G,    S,    U,    T,    FN27,  F21,  F10,  F11,  F7,   F8,   F9,
-      TAB,     FN4, FN5,  FN6,  F1,   FN7,  F18,  F19,  F23,  F20,  F22,  FN9,
-      COMM,    DOT,  FN10, FN11, FN3,  SPC,        FN12, F2,   FN8,  F3,   F14),
-    [2] = KEYMAP( /* 2: FN3 PHOTOSHOP */
-      ESC,    FN25, FN26,   NO,   NO,   NO,   NO,   NO,   NO,   NO,   NO,   NO,
-      NO,      NO,   NO,   NO,   NO,   NO,   NO,   NO,   NO,   FN19, FN20, FN21, 
-      C,       NO,  FN22,  FN5,   NO,   FN23, NO,   NO,   NO,   NO,   FN13, NO,
-      FN14,    FN15, FN16, FN17, FN3,   SPC,        FN18, NO,   NO,   F24,  NO),
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_DEFAULT_LAYER_SET(0),                             // set Qwerty layout
-    [2] = ACTION_DEFAULT_LAYER_SET(1),                             // set Photoshop presets
-    [3] = ACTION_LAYER_ON_OFF(2),                                  // Photoshop function layer
- 
-    [4] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F9),   // photo folder AHK
-    [5] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_I),              // select inverse
-    [6] = ACTION_MODS_KEY(MOD_LSFT, KC_M),                         // marquee select
-    [7] = ACTION_MODS_KEY(MOD_LALT, KC_BSPC),                      // fill 
-    [8] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_X),    // warp
-    [9] = ACTION_MODS_KEY(MOD_LCTL | MOD_LALT | MOD_LSFT, KC_F12),  // merge all new layer
-    [10] = ACTION_MODS_KEY(MOD_LCTL, KC_MINS),                     // zoom out
-    [11] = ACTION_MODS_KEY(MOD_LCTL, KC_H),                        // RBG sliders
-    [12] = ACTION_MODS_KEY(MOD_LCTL, KC_S),                        // save
-    [13] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_F5),           // layer mask from transparancy 
-    [14] = ACTION_MODS_KEY(MOD_LALT, KC_LBRC),                     // prev layer
-    [15] = ACTION_MODS_KEY(MOD_LALT, KC_RBRC),                     // next layer
-    [16] = ACTION_MODS_KEY(MOD_LCTL, KC_EQL),                      // zoom in
-    [17] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_H),             // HSV sliders
-    [18] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F11), // save as PNG
-    [19] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F7),  // gaussian blur
-    [20] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL | MOD_LALT, KC_F8),  // motion blur
-    [21] = ACTION_MODS_KEY(MOD_LSFT | MOD_LCTL, KC_X),            // liquify filter
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),                     // prev layer blending
-    [23] = ACTION_MODS_KEY(MOD_LSFT | MOD_LALT, KC_N),             // normal layer blending
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),                      // next layer blending
-    [25] = ACTION_MODS_KEY(MOD_LCTL, KC_Z),                        // step back
-    [26] = ACTION_MODS_KEY(MOD_LCTL, KC_Y),                        // step forward
-    [27] = ACTION_MODS_KEY(MOD_LCTL, KC_R),                        // rasterize
-     
-};
diff --git a/keyboard/quark/common_keymaps/keymap_reed.c b/keyboard/quark/common_keymaps/keymap_reed.c
deleted file mode 100644
index 1aa24e10de..0000000000
--- a/keyboard/quark/common_keymaps/keymap_reed.c
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "keymap_common.h"
-
-/*
- * BUILD:
- * Simply run the command below in the keyboard/planck directory
- * to build against this keymap
- *
- *    make KEYMAP=reed COMMON_KEYMAP=true
- *
- *
- * DETAILS:
- *
- * This layout works off of Jack's layout, making some changes that I
- * feel significantly improve the function of the keyboard. Major changes
- * include adding a "gaming mode" that will allow users to still access
- * the number keys 1 through 4 easily for games that require it. Also
- * included is the ability to use the tap/hold function for easy use of
- * right shift and thumb shift with their tapped companions.
- *
- */
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = KEYMAP_GRID( /* Reed */
-  ESC,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-  TAB,  A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, QUOT,
-  LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, FN5,
-  LCTL, CAPS, LALT, LGUI, FN2, FN7,  SPC,  FN1,   LEFT, DOWN, UP,  RGHT),
-
-[1] = KEYMAP_GRID( /* Reed EXTREME GAMING */
-  ESC,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-  TAB,  A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, QUOT,
-  LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, FN5,
-  LCTL, 1,    2,    3,    4,   SPC,  FN2,  FN1,   LEFT, DOWN, UP,  RGHT),
-
-[2] = KEYMAP_GRID( /* Reed RAISE */
-  GRV,  1,    2,    3,    4,    5,    6,    7,    8,    9,    0,    BSPC,
-  TRNS, FN3, FN4, PAUSE, TRNS, TRNS, TRNS, MINS, EQL,  LBRC, RBRC,  BSLS,
-  TRNS, F1,   F2,    F3,   F4,   F5,   F6,   F7,  F8,    F9,  F10,  TRNS,
-  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN1, MNXT, VOLD, VOLU, MPLY),
-
-[3] = KEYMAP_GRID( /* Reed LOWER */
-  TRNS,  FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, DEL,
-  TRNS,  TRNS, INS, HOME, PGUP, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28,
-  TRNS,  TRNS, DEL,  END, PGDN,  F11,  F12,  F13,  TRNS, VOLD, VOLU, TRNS,
-  TRNS,  TRNS, TRNS, TRNS, FN2,  TRNS, TRNS, TRNS, MPRV, MUTE, MPLY, MNXT),
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_MOMENTARY(2),  // to Fn overlay - RAISE
-    [2] = ACTION_LAYER_MOMENTARY(3),  // to Fn overlay - LOWER
-
-    [3] = ACTION_DEFAULT_LAYER_SET(0),
-    [4] = ACTION_DEFAULT_LAYER_SET(1),
-	// Actions for the tap/hold modifiers listed above
-    [5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ENT),
-    [7] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPC),
-	
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
-    [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
-
-    [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE),
-};
diff --git a/keyboard/quark/common_keymaps/keymap_sean.c b/keyboard/quark/common_keymaps/keymap_sean.c
deleted file mode 100644
index 4fe07f701a..0000000000
--- a/keyboard/quark/common_keymaps/keymap_sean.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = KEYMAP( /* Matrix Dvorak */
-      QUOT, COMM,  DOT,    P,    Y, SLSH,  EQL,    F,    G,    C,    R,    L,
-         A,    O,    E,    U,    I,  ESC, BSPC,    D,    H,    T,    N,    S,
-      SCLN,    Q,    J,    K,    X,  TAB,  ENT,    B,    M,    W,    V,    Z,
-      LSFT, LCTL, LALT, LGUI,  FN1,  SPC,        FN2, LEFT, DOWN,   UP, RGHT),
-
-    [1] = KEYMAP( /* Matrix Qwerty */
-         Q,    W,    E,    R,    T, QUOT,  EQL,    Y,    U,    I,    O,    P,
-         A,    S,    D,    F,    G,  ESC, BSPC,    H,    J,    K,    L, SCLN,
-         Z,    X,    C,    V,    B,  TAB,  ENT,    N,    M, COMM,  DOT, SLSH,
-      LSFT, LCTL, LALT, LGUI,  FN1,  SPC,        FN2, LEFT, DOWN,   UP, RGHT),
-      
-    [2] = KEYMAP( /* fn1 lower */
-        F1,   F2,   F3,   F4,   F5, TRNS, TRNS,   F6,   F7,   F8,   F9,  F10,
-         1,    2,    3,    4,    5,  F18,  DEL,    6,    7,    8,    9,    0,
-       FN3,  FN4, TRNS,  GRV, MINS, TRNS, TRNS, BSLS, LBRC, RBRC, TRNS, TRNS,
-      TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,        FN5, HOME, PGDN, PGUP,  END),
-
-    [3] = KEYMAP( /* fn2 raise */
-        F1,   F2,   F3,   F4,   F5, TRNS, TRNS,   F6,   F7,   F8,   F9,  F10,
-       F11,  F12,  F13,  F14,  F15,  F18,  DEL,  F16,  F17,  F18,  F19,  F20,
-       FN3,  FN4, TRNS, TRNS, TRNS, TRNS, TRNS, EJCT,  PWR, LSFT,PAUSE, RSFT,
-      LEFT, DOWN,   UP, RGHT,  FN5, TRNS,       TRNS, MNXT, VOLD, VOLU, MUTE),
-
-    [4] = KEYMAP( /* lower + raise */
-      LEFT, DOWN,   UP, RGHT, TRNS, TRNS, TRNS, TRNS, LEFT, DOWN,   UP, RGHT,
-      HOME, PGDN, PGUP,  END, TRNS,  F18,  DEL, TRNS, HOME, PGDN, PGUP,  END,
-      FN3,  FN4,  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, EJCT,  PWR, MPLY, RSFT,
-      TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       TRNS, MNXT, VOLD, VOLU, MUTE),
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_MOMENTARY(2),  // to Fn overlay LOWER
-    [2] = ACTION_LAYER_MOMENTARY(3),  // to Fn overlay RAISE
-    [3] = ACTION_DEFAULT_LAYER_SET(0), 
-    [4] = ACTION_DEFAULT_LAYER_SET(1),  
-    [5] = ACTION_LAYER_MOMENTARY(4),  // to Fn overlay LOWER + RAISE
-
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
-    [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
-};
diff --git a/keyboard/quark/common_keymaps/keymap_shane.c b/keyboard/quark/common_keymaps/keymap_shane.c
deleted file mode 100644
index d4e40fe63a..0000000000
--- a/keyboard/quark/common_keymaps/keymap_shane.c
+++ /dev/null
@@ -1,100 +0,0 @@
-// https://github.com/shanecelis/tmk_keyboard/blob/master/keyboard/planck/keymap_shane.c
-
-#include "keymap_common.h"
-#include "action_layer.h"
-#include "action.h"
-#include "action_util.h"
-
-/*
-  Shane's Planck Layout
-  http://www.keyboard-layout-editor.com/#/layouts/015d9011102619d7695c86ffe57cf441
-*/
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = KEYMAP_AND_SWAP( /* Base */
-    TAB,	Q,	W,	E,	R,	T,	Y,	U,	I,	O,	P,	MINS,
-    LCTL,	A,	S,	D,	F,	G,	H,	J,	K,	L,	SCLN,	BSPC,
-    LSFT,	Z,	X,	C,	V,	B,	N,	M,	COMM,	DOT,	SLSH,	FN5,
-    /*ALPHA*/FN3,	/*HYPER*/	/*SUPER*/LGUI, /*META*/LALT, LCTL,	FN2,	FN6,	FN1,	LEFT,	DOWN,	UP,	RGHT),
-  [2] = KEYMAP_AND_SWAP( /* More modifiers */
-    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, RCTL, RALT, RGUI,	TRNS),
-  [4] = KEYMAP_AND_SWAP( /* WASD */
-    TRNS,	TRNS,	UP,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,
-    TRNS,	LEFT,	DOWN,	RIGHT,	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),
-  [6] = KEYMAP_AND_SWAP( /* Raise/FN1 */
-    FN23,	1,	2,	3,	4,	5,	6,	7,	8,	9,	0,	EQL,
-    TRNS,	F1,	F2,	F3,	F4,	F5,	F6,	F7,	F8,	F9,	F10,	ENT,
-    TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	BSLS,	TRNS,
-    PAUS,	TRNS,	TRNS,	TRNS,	TRNS,	BSPC,	TRNS,	MUTE,	PGUP,	PGDN,	MNXT),
-  [8] = KEYMAP_AND_SWAP( /* Lower/FN2 */
-    ESC,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	FN19,	FN20,	TRNS,
-    TRNS,	TRNS,	TRNS,	TRNS,	CAPS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	QUOT,
-    TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	TRNS,	FN24,	FN25,	LBRC,	RBRC,	TRNS,	TRNS,
-    FN4,	TRNS,	TRNS,	TRNS,	TRNS,	ENT,	TRNS,	MPLY,	VOLD,	VOLU,	MPRV),
-};
-
-enum function_id {
-  SPACE_FN,
-};
-
-void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch (id) {
-  case SPACE_FN:
-    if (record->event.pressed) {
-      // Change the keyboard maps.
-      // Whatever even layer's are on, turn on the odd one's too.
-      for (uint8_t i = 0; i < 9; i += 2) {
-        if (layer_state & (1UL << i))
-          layer_on(i + 1);
-      }
-      layer_on(1);
-    } else {
-      // turn off all the even layers.
-      for (uint8_t i = 0; i < 9; i += 2)
-        layer_off(i + 1);
-
-      if (record->tap.count != 0) {
-        // Space was tapped rather than used like a modifier.
-        // So send a space up and down event.
-        add_key(KC_SPC);
-        send_keyboard_report();
-        del_key(KC_SPC);
-        send_keyboard_report();
-      }
-    }
-    break;
-  }
-}
-
-
-
-const uint16_t PROGMEM fn_actions[] = {
-  [1] = ACTION_LAYER_MOMENTARY(6),  // to fist Fn overlay
-  [2] = ACTION_LAYER_MOMENTARY(8),  // to second Fn overlay
-  [3] = ACTION_LAYER_TOGGLE(2), // toggle more modifiers
-  [4] = ACTION_LAYER_TOGGLE(4), // toggle wasd
-  [5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_ENT),
-  [6] = ACTION_FUNCTION_TAP(SPACE_FN),
-
-  [11] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
-  [12] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
-  [13] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
-  [14] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
-  [15] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
-  [16] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
-  [17] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
-  [18] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
-  [19] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
-  [20] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
-  [21] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
-  [22] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
-  [23] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
-  [24] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
-  [25] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
-  [26] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
-};
diff --git a/keyboard/quark/common_keymaps/keymap_simon.c b/keyboard/quark/common_keymaps/keymap_simon.c
deleted file mode 100644
index 37951364be..0000000000
--- a/keyboard/quark/common_keymaps/keymap_simon.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = KEYMAP( /* Jack */
-  ESC,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-  TAB,  A,    S,    D,    F,    G,    H,    J,    K,    L,    DOT,  ENT,
-  LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SCLN, DEL,
-  LCTL, ENT,  LALT, CAPS, FN2,    SPC,      FN1,  LEFT, DOWN, UP,   RGHT),
-[1] = KEYMAP( /* Jack RAISE */
-  TRNS, F1,   F2,   F3,   F4,   NO,   FN11, FN9,  FN12, NO,   FN14, TRNS,
-  TRNS, F5,   F6,   F7,   F8,   FN16, SLSH, MINS, EQL,  LBRC, FN8,  TRNS,
-  TRNS, F9,   F10,  F11,  F12,  F15,  F16,  FN22, SCLN, MINS, QUOT, TRNS,
-  TRNS, TRNS, TRNS, TRNS, TRNS,    TRNS,    TRNS, TRNS, TRNS, TRNS, TRNS),
-[2] = KEYMAP( /* Jack LOWER */
-  FN22, 1,    2,    3,   FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC,
-  TRNS, 4,    5,    6,   TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28,
-  TRNS, 7,    8,    9,   0,    FN28, FN15,   F7,   F8,   F9,   F10,  TRNS,
-  TRNS, TRNS, TRNS, TRNS, TRNS,    TRNS,    TRNS, TRNS, TRNS, TRNS, TRNS),
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_MOMENTARY(1),  // to Fn overlay
-    [2] = ACTION_LAYER_MOMENTARY(2),  // to Fn overlay
-
-    [8]  = ACTION_MODS_KEY(MOD_LSFT, KC_SLSH),
-    [9]  = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT),
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
-    [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
-
-    [29] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE),
-};
diff --git a/keyboard/quark/common_keymaps/keymap_tim.c b/keyboard/quark/common_keymaps/keymap_tim.c
deleted file mode 100644
index 7444f3877b..0000000000
--- a/keyboard/quark/common_keymaps/keymap_tim.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = KEYMAP(
-  ESC,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-  TAB,  A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, ENT,
-  LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, RSFT,
-  LCTL, LALT, DEL,  LGUI, FN2,    SPC,     FN1,   F2,   F5,   F9,   F12),
-[2] = KEYMAP( /* RAISE */
-  TRNS,  1,    2,    3,    4,    5,    6,    7,    8,    9,    0,   BSPC,
-  GRV,  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, MINS, EQL,  LBRC, RBRC, BSLS,
-  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, QUOT, FN29, TRNS, TRNS,
-  TRNS, TRNS, TRNS, TRNS, TRNS,    TRNS,    FN1,  TRNS, TRNS, TRNS, TRNS),
-[3] = KEYMAP( /* LOWER */
-  TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, BSPC,
-  FN22, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, FN20, FN21, FN23, FN24, FN28,
-  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, QUOT, FN29, TRNS, TRNS,
-  TRNS, TRNS, TRNS, TRNS, FN2,    TRNS,     TRNS, TRNS, TRNS, TRNS, TRNS),
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_MOMENTARY(2),  // to Fn overlay
-    [2] = ACTION_LAYER_MOMENTARY(3),  // to Fn overlay
-
-    [3] = ACTION_DEFAULT_LAYER_SET(0),  
-    [4] = ACTION_DEFAULT_LAYER_SET(1),
-
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1),
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2),
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3),
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4),
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5),
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6),
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7),
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8),
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9),
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0),
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS),
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL),
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV),
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC),
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC),
-    [28] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS),
-    [29] = ACTION_MODS_KEY(MOD_LSFT, KC_QUOT),
-};
diff --git a/keyboard/quark/common_keymaps/keymap_wilba.c b/keyboard/quark/common_keymaps/keymap_wilba.c
deleted file mode 100644
index 9781f8fcd8..0000000000
--- a/keyboard/quark/common_keymaps/keymap_wilba.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "keymap_common.h"
-
-const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = KEYMAP( /* Wilba */
-  FN27, FN28, FN29, E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-  TAB,  A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, QUOT,
-  LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, ENT,
-  LCTL, LGUI, LALT, RSFT, FN1,  SPC,        FN2,  LEFT, DOWN, UP,   RGHT),
-[1] = KEYMAP( /* Wilba Alternate */
-  ESC,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,    P,    BSPC,
-  TAB,  A,    S,    D,    F,    G,    H,    J,    K,    L,    SCLN, QUOT,
-  LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT,  SLSH, ENT,
-  LCTL, LGUI, LALT, RSFT, FN1,  SPC,        FN2,  LEFT, DOWN, UP,   RGHT),
-[2] = KEYMAP( /* Wilba LOWER */
-  TRNS, 1,    2,    3,    4,    5,    6,    7,    8,    9,    0,    TRNS,
-  TRNS, F11,  F12,  LBRC, RBRC, FN20, EQL,  FN23, FN24, MINS, FN21, TRNS,
-  TRNS, BSLS, GRV,  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
-  TRNS, TRNS, TRNS, TRNS, FN1,  TRNS,       TRNS, MNXT, VOLD, VOLU, MPLY),
-[3] = KEYMAP( /* Wilba RAISE */
-  TRNS, FN10, FN11, FN12, FN13, FN14, FN15, FN16, FN17, FN18, FN19, TRNS,
-  TRNS, F1,   F2,   F3,   F4,   F5,   F6,   F7,   F8,   F9,   F10,  TRNS,  
-  TRNS, FN25, FN22, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,
-  TRNS, TRNS, TRNS, TRNS, TRNS, TRNS,       FN2,  TRNS, TRNS, TRNS, TRNS),
-};
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_MOMENTARY(2),  // LOWER
-    [2] = ACTION_LAYER_MOMENTARY(3),  // RAISE
-
-    [3] = ACTION_DEFAULT_LAYER_SET(0),  
-    [4] = ACTION_DEFAULT_LAYER_SET(1),
-
-    [10] = ACTION_MODS_KEY(MOD_LSFT, KC_1), // !
-    [11] = ACTION_MODS_KEY(MOD_LSFT, KC_2), // @
-    [12] = ACTION_MODS_KEY(MOD_LSFT, KC_3), // #
-    [13] = ACTION_MODS_KEY(MOD_LSFT, KC_4), // $
-    [14] = ACTION_MODS_KEY(MOD_LSFT, KC_5), // %
-    [15] = ACTION_MODS_KEY(MOD_LSFT, KC_6), // ^
-    [16] = ACTION_MODS_KEY(MOD_LSFT, KC_7), // &
-    [17] = ACTION_MODS_KEY(MOD_LSFT, KC_8), // *
-    [18] = ACTION_MODS_KEY(MOD_LSFT, KC_9), // (
-    [19] = ACTION_MODS_KEY(MOD_LSFT, KC_0), // )
-    
-    [20] = ACTION_MODS_KEY(MOD_LSFT, KC_MINS), // _
-    [21] = ACTION_MODS_KEY(MOD_LSFT, KC_EQL), // +
-    [22] = ACTION_MODS_KEY(MOD_LSFT, KC_GRV), // ~
-    [23] = ACTION_MODS_KEY(MOD_LSFT, KC_LBRC), // {
-    [24] = ACTION_MODS_KEY(MOD_LSFT, KC_RBRC), // }
-    [25] = ACTION_MODS_KEY(MOD_LSFT, KC_BSLS), // |
-
-    [26] = ACTION_MODS_KEY(MOD_LSFT | MOD_RSFT, KC_PAUSE),
-    
-    [27] = ACTION_BACKLIGHT_TOGGLE(),
-    [28] = ACTION_BACKLIGHT_INCREASE(),
-    [29] = ACTION_BACKLIGHT_DECREASE()
-    
-};