Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

6 files changed, 152 insertions, 150 deletions

diff --git a/keyboards/chimera_ls/chimera_ls.h b/keyboards/chimera_ls/chimera_ls.h
index b39bcf2047..bb99684e5f 100644
--- a/keyboards/chimera_ls/chimera_ls.h
+++ b/keyboards/chimera_ls/chimera_ls.h
@@ -50,32 +50,30 @@
 // The first section contains all of the arguements
 // The second converts the arguments into a two-dimensional array
 
-#define KC_KEYMAP( \
-  k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
-  k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
-  k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
-  k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
-) \
-{ \
-	{ KC_##k43, KC_##k45, KC_##k34, KC_##k11, KC_##k23, KC_##k40, KC_##k38, KC_##k25, KC_##k00, KC_##k12 }, \
-	{ KC_##k31, KC_##k44, KC_##k46, KC_##k35, KC_##k22, KC_##k28, KC_##k39, KC_##k37, KC_##k24, KC_##k13 }, \
-	{ KC_##k30, KC_##k32, KC_##k33, KC_##k47, KC_##k09, KC_##k29, KC_##k27, KC_##k26, KC_##k36, KC_##k02 }, \
-	{ KC_##k19, KC_##k20, KC_##k21, KC_##k42, KC_##k18, KC_##k16, KC_##k15, KC_##k14, KC_##k41, KC_##k17 },  \
-	{ KC_##k06, KC_##k07, KC_##k08, KC_##k10, KC_NO,    KC_##k05, KC_##k04, KC_##k03, KC_##k01, KC_NO    }, \
+#define LAYOUT_ortho_4x12( \
+    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
+    k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
+    k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
+    k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
+  ) { \
+    { k43, k45, k34, k11, k23,   k40, k38, k25, k00, k12   }, \
+    { k31, k44, k46, k35, k22,   k28, k39, k37, k24, k13   }, \
+    { k30, k32, k33, k47, k09,   k29, k27, k26, k36, k02   }, \
+    { k19, k20, k21, k42, k18,   k16, k15, k14, k41, k17   }, \
+    { k06, k07, k08, k10, KC_NO, k05, k04, k03, k01, KC_NO }  \
 }
 
-#define KEYMAP( \
-  k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
-  k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
-  k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
-  k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
-) \
-{ \
-	{ k43, k45, k34, k11, k23, k40, k38, k25, k00, k12 }, \
-	{ k31, k44, k46, k35, k22, k28, k39, k37, k24, k13 }, \
-	{ k30, k32, k33, k47, k09, k29, k27, k26, k36, k02 }, \
-	{ k19, k20, k21, k42, k18, k16, k15, k14, k41, k17 },  \
-	{ k06, k07, k08, k10, KC_NO,    k05, k04, k03, k01, KC_NO    }, \
+#define LAYOUT_kc_ortho_4x12( \
+    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k10, k11, \
+    k12, k13, k14, k15, k16, k17,           k18, k19, k20, k21, k22, k23, \
+    k24, k25, k26, k27, k28, k29,           k30, k31, k32, k33, k34, k35, \
+    k36, k37, k38, k39, k40, k41,           k42, k43, k44, k45, k46, k47  \
+  ) { \
+    { KC_##k43, KC_##k45, KC_##k34, KC_##k11, KC_##k23, KC_##k40, KC_##k38, KC_##k25, KC_##k00, KC_##k12 }, \
+    { KC_##k31, KC_##k44, KC_##k46, KC_##k35, KC_##k22, KC_##k28, KC_##k39, KC_##k37, KC_##k24, KC_##k13 }, \
+    { KC_##k30, KC_##k32, KC_##k33, KC_##k47, KC_##k09, KC_##k29, KC_##k27, KC_##k26, KC_##k36, KC_##k02 }, \
+    { KC_##k19, KC_##k20, KC_##k21, KC_##k42, KC_##k18, KC_##k16, KC_##k15, KC_##k14, KC_##k41, KC_##k17 }, \
+    { KC_##k06, KC_##k07, KC_##k08, KC_##k10, KC_NO,    KC_##k05, KC_##k04, KC_##k03, KC_##k01, KC_NO    }  \
 }
 
 
diff --git a/keyboards/chimera_ls/config.h b/keyboards/chimera_ls/config.h
index d92878026b..254dad3064 100644
--- a/keyboards/chimera_ls/config.h
+++ b/keyboards/chimera_ls/config.h
@@ -52,8 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  These options are also useful to firmware size reduction.
  */
 
-#define PREVENT_STUCK_MODIFIERS
-
 /* disable debug print */
 //#define NO_DEBUG
 
diff --git a/keyboards/chimera_ls/info.json b/keyboards/chimera_ls/info.json
new file mode 100644
index 0000000000..077a760796
--- /dev/null
+++ b/keyboards/chimera_ls/info.json
@@ -0,0 +1,13 @@
+{
+  "keyboard_name": "Chimera LS",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 13,
+  "height": 4,
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "key_count": 48,
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+    }
+  }
+}
diff --git a/keyboards/chimera_ls/keymaps/default/keymap.c b/keyboards/chimera_ls/keymaps/default/keymap.c
index 493b8eee15..0affeef389 100644
--- a/keyboards/chimera_ls/keymaps/default/keymap.c
+++ b/keyboards/chimera_ls/keymaps/default/keymap.c
@@ -1,7 +1,7 @@
 // this is the style you want to emulate.
 // This is the canonical layout file for the Quantum project. If you want to add another keyboard,
 
-#include "chimera_ls.h"
+#include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -24,168 +24,163 @@ enum chimera_lets_split_layers
 #define KC_SCTR MT(MOD_LCTL, KC_RBRC)
 #define KC_SPLT MT(MOD_LALT, KC_MINS)
 #define KC_MESC LT(_MACROS, KC_ESC)
-#define KC_INCL M(0)
-#define KC_PULL M(1)
-#define KC_PUSH M(2)
-#define KC_SCAP M(3)
-#define KC_SCOF M(4)
 #define KC_CAD LALT(LCTL(KC_DEL))
 
+enum custom_keycodes {
+  KC_INCL = SAFE_RANGE,
+  KC_PULL,
+  KC_PUSH,
+  KC_SCAP,
+  KC_SCOF
+};
+
 #define LONGPRESS_DELAY 150
 //#define LAYER_TOGGLE_DELAY 300
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-#define KC_ KC_TRNS 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_QWERTY] = KC_KEYMAP(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-     MESC, Q  , W  , E  , R  , T  ,      Y  , U  , I  , O  , P  ,BSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     TAB , A  , S  , D  , F  , G  ,      H  , J  , K  , L  ,SCLN, ENT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSPO, Z  , X  , C  , V  , B  ,      N  , M  ,COMM,DOT ,SLSH,RSPC,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     SCTL,SPFN,SPLT,AMPR,NMPD,SPC ,     SPC ,SYMB,ASTR,EXLM,LBRC,SCTR
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  [_QWERTY] = LAYOUT_ortho_4x12(
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
+     KC_MESC, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     KC_SCTL, KC_SPFN, KC_SPLT, KC_AMPR, KC_NMPD, KC_SPC,       KC_SPC,  KC_SYMB, KC_ASTR, KC_EXLM, KC_LBRC, KC_SCTR
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
-  [_CAPS] = KC_KEYMAP(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,COLN,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,UNDS,    ,    ,    ,         ,    ,    ,    ,    ,    
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  [_CAPS] = LAYOUT_ortho_4x12(
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
+     _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, KC_COLN, _______,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, KC_UNDS, _______, _______, _______,      _______, _______, _______, _______, _______, _______
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
 
-  [_NUMPAD] = KC_KEYMAP(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,         ,  7 ,  8 ,  9 ,MINS,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,  4 ,  5 ,  6 ,PLUS, ENT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     LSFT,    ,    ,    ,    ,    ,         ,  1 ,  2 ,  3 ,ASTR, EQL,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,BSPC,     SPC ,  0 ,  0 , DOT,SLSH,    
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  [_NUMPAD] = LAYOUT_ortho_4x12(
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
+     _______, _______, _______, _______, _______, _______,      _______, KC_7,    KC_8,    KC_9,    KC_MINS, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______,      _______, KC_4,    KC_5,    KC_6,    KC_PLUS, KC_ENT,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     KC_LSFT, _______, _______, _______, _______, _______,      _______, KC_1,    KC_2,    KC_3,    KC_ASTR, KC_EQL,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, KC_BSPC,      KC_SPC,  KC_0,    KC_0,    KC_DOT,  KC_SLSH, _______
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
-  [_SYMBOLS] = KC_KEYMAP(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-         ,EXLM, AT ,HASH,DLR ,PERC,     CIRC,AMPR,ASTR,LPRN,RPRN,QUOT,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      F1 , F2 , F3 , F4 , F5 , F6 ,     TILD,EQL ,UNDS,LCBR,RCBR,PIPE,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-      F7 , F8 , F9 , F10, F11, F12,     GRV ,PLUS,MINS,LBRC,RBRC,BSLS,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    , NO ,BSPC,     SPC ,    ,    ,    ,    ,    
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  [_SYMBOLS] = LAYOUT_ortho_4x12(
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
+     _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,        KC_TILD, KC_EQL,  KC_UNDS, KC_LCBR, KC_RCBR, KC_PIPE,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_GRV,  KC_PLUS, KC_MINS, KC_LBRC, KC_RBRC, KC_BSLS,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, XXXXXXX, KC_BSPC,      KC_SPC,  _______, _______, _______, _______, _______
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
-  [_NAV] = KC_KEYMAP(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-         ,    ,    ,    , DEL,BSPC,         ,HOME, UP , END, INS,PSCR,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,LSFT,LCTL, ENT,         ,LEFT,DOWN,RGHT, DEL,   ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,PGUP,PGDN,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,DEL ,         ,    ,    ,    ,    ,   
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  [_NAV] = LAYOUT_ortho_4x12(
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
+     _______, _______, _______, _______, KC_DEL,  KC_BSPC,      _______, KC_HOME, KC_UP,   KC_END,  KC_INS,  KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT,       _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  _______,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______,      _______, KC_PGUP, KC_PGDN, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, KC_DEL,       _______, _______, _______, _______, _______, _______
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
-  [_MACROS] = KC_KEYMAP(
-  //,----+----+----+----+----+----.    ,----+----+----+----+----+----.
-         ,    ,    ,    ,    ,    ,         ,    ,INCL,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,CAD ,    ,    ,         ,    ,    ,    ,    ,    ,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-     SCAP,    ,    ,    ,    ,    ,         ,    ,PULL,PUSH,    ,SCAP,
-  //|----+----+----+----+----+----|    |----+----+----+----+----+----|
-         ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,   
-  //`----+----+----+----+----+----'    `----+----+----+----+----+----'
+  [_MACROS] = LAYOUT_ortho_4x12(
+  //,--------+--------+--------+--------+--------+--------.    ,--------+--------+--------+--------+--------+--------.
+     _______, _______, _______, _______, _______, _______,      _______, _______, KC_INCL, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, KC_CAD,  _______, _______,      _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     KC_SCAP, _______, _______, _______, _______, _______,      _______, _______, KC_PULL, KC_PUSH, _______, KC_SCAP,
+  //|--------+--------+--------+--------+--------+--------|    |--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______, _______
+  //`--------+--------+--------+--------+--------+--------'    `--------+--------+--------+--------+--------+--------'
   ),
 
 };
 
 
-const uint16_t PROGMEM fn_actions[] = {
-
-};
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-  switch(id) {
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch(keycode) {
     /* include some kind of library or header */
-    case 0:
+    case KC_INCL:
       if (record->event.pressed) {
-        SEND_STRING("#include <>");
-        return MACRO( T(LEFT), END);
+        SEND_STRING("#include <>" SS_TAP(X_LEFT) );
+        return false;
       }
       break;
-    case 1:
+    case KC_PULL:
       if (record->event.pressed) {
-        SEND_STRING("git pull");
-        return MACRO( T(ENT), END );
+        SEND_STRING("git pull" SS_TAP(X_ENTER) );
+        return false;
       }
       break;
-    case 2:
+    case KC_PUSH:
       if (record->event.pressed){
-        SEND_STRING("git push");
-        return MACRO( T(ENT), END );
+        SEND_STRING("git push" SS_TAP(X_ENTER) );
+        return false;
       }
       break;
-    case 3:
+    case KC_SCAP:
       if (record->event.pressed){
         layer_on(_CAPS);
         register_code(KC_CAPSLOCK);
         unregister_code(KC_CAPSLOCK);
+        return false;
       }
       break;
-    case 4:
+    case KC_SCOF:
       if (record->event.pressed){
         layer_off(_CAPS);
         register_code(KC_CAPSLOCK);
         unregister_code(KC_CAPSLOCK);
+        return false;
       }
       break;
   }
-  return MACRO_NONE;
+  return true;
 };
- 
+
 
 void matrix_scan_user(void) {
-    uint8_t layer = biton32(layer_state);
-    
-    switch (layer) {
-    	case _QWERTY:
-    	    set_led_green;
-    	    break;
-        case _CAPS:
-	    set_led_white;
-	    break;
-        case _NUMPAD:
-            set_led_blue;
-            break;
-        case _SYMBOLS:
-            set_led_red;
-            break;
-        case _NAV:
-	    set_led_magenta;
-	    break;
-        case _MACROS:
-	    set_led_cyan;
-	    break;
-       default:
-            set_led_green;
-            break;
-    }
+  uint8_t layer = biton32(layer_state);
+
+  switch (layer) {
+    case _QWERTY:
+      set_led_green;
+      break;
+    case _CAPS:
+      set_led_white;
+      break;
+    case _NUMPAD:
+      set_led_blue;
+      break;
+    case _SYMBOLS:
+      set_led_red;
+      break;
+    case _NAV:
+      set_led_magenta;
+      break;
+    case _MACROS:
+      set_led_cyan;
+      break;
+    default:
+      set_led_green;
+      break;
+  }
 };
diff --git a/keyboards/chimera_ls/readme.md b/keyboards/chimera_ls/readme.md
index 689d9ee614..0170dd8a8f 100644
--- a/keyboards/chimera_ls/readme.md
+++ b/keyboards/chimera_ls/readme.md
@@ -2,18 +2,14 @@
 
 ![Chimera LS](https://imgur.com/FOGlO4M.jpg)
 
-A wireless version of the let's split: a split 40% ortholinear keyboard 
+A wireless version of the Let's Split: a split 40% ortholinear keyboard.
 
 Keyboard Maintainer: [William Wilson](https://github.com/GlenPickle)  
-
-
-Hardware Supported: Chimera LS PCB, WaveShare core nRF51822
-
+Hardware Supported: Chimera LS PCB, WaveShare core nRF51822  
 Hardware Availability: [Gerbers](https://github.com/GlenPickle/Chimera/tree/master/ls/gerbers)
 
 Make example for this keyboard (after setting up your build environment):
 
     make chimera_ls:default
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
-
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/chimera_ls/rules.mk b/keyboards/chimera_ls/rules.mk
index af08f7a879..497e58677e 100644
--- a/keyboards/chimera_ls/rules.mk
+++ b/keyboards/chimera_ls/rules.mk
@@ -46,7 +46,7 @@ F_USB = $(F_CPU)
 
 # Bootloader
 #     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded 
+#     different sizes, comment this out, and the correct address will be loaded
 #     automatically (+60). See bootloader.mk for all options.
 BOOTLOADER = caterina
 
@@ -80,3 +80,5 @@ UNICODE_ENABLE = YES 		# Unicode
 # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
 
 USB = /dev/ttyACM0
+
+LAYOUTS = ortho_4x12