Merge remote-tracking branch 'origin/master' into develop

7 files changed, 658 insertions, 134 deletions

diff --git a/keyboards/crkbd/keymaps/rjhilgefort/config.h b/keyboards/crkbd/keymaps/rjhilgefort/config.h
new file mode 100644
index 0000000000..cbc7eb03d8
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rjhilgefort/config.h
@@ -0,0 +1,47 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+//#define USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+#define USE_SERIAL_PD2
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 200 // 200 is default
+
+#ifdef RGBLIGHT_ENABLE
+    #undef RGBLED_NUM
+    #define RGBLIGHT_ANIMATIONS
+    #define RGBLED_NUM 27
+    #define RGBLIGHT_LIMIT_VAL 120
+    #define RGBLIGHT_HUE_STEP 10
+    #define RGBLIGHT_SAT_STEP 17
+    #define RGBLIGHT_VAL_STEP 17
+#endif
+
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
+
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/keymap.c b/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
new file mode 100644
index 0000000000..a9dbe7657a
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rjhilgefort/keymap.c
@@ -0,0 +1,220 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@drashna>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#define ALT_ESC ALT_T(KC_ESC)
+#define CTL_ESC CTL_T(KC_ESC)
+#define GUI_ESC GUI_T(KC_ESC)
+#define HYPER LGUI(LSFT(KC_LALT))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  // 0 - Base Mac
+  [0] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      CTL_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                            MO(3), ALT_ESC, KC_LGUI,     KC_SPC,   MO(2),   HYPER
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  // 1 - Base Linux
+  [1] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      ALT_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                            MO(4), GUI_ESC, KC_LCTL,     KC_SPC,   MO(2),   HYPER
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  // 2 - Symbols
+  [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD,                      KC_PIPE,  KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN,  KC_GRV,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                            MO(5), _______, _______,    _______, KC_TRNS, _______
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  // 3 - MAN Mac
+  [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      _______, _______, KC_BRMD, KC_VOLU, KC_BRMU, _______,                      _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, KC_MUTE, KC_MRWD, KC_MPLY, KC_MFFD, _______,                      _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, KC_VOLD, _______, _______,                      _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_TRNS, _______, _______,       KC_0,   MO(5), _______
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  // 4 - MAN Linux
+  [4] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      _______, _______, KC_BRID, KC_VOLU, KC_BRIU, _______,                      _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______,                      _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, KC_VOLD, _______, _______,                      _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_TRNS, _______, _______,       KC_0,   MO(5), _______
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  // 5 - Extra
+  [5] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      _______,   DF(0),   DF(1), _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,                      KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_TRNS, _______, _______,    _______, KC_TRNS, _______
+                                      //`--------------------------'  `--------------------------'
+  )
+};
+
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (!is_master) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  }
+  return rotation;
+}
+
+#define L_BASE_MAC 0
+#define L_BASE_LINUX 2
+#define L_SYMBOLS 4
+#define L_MAN_MAC 8
+#define L_MAN_LINUX 16
+#define L_EXTRA 32
+
+void oled_render_layer_state(void) {
+    oled_write_P(PSTR("L: "), false);
+
+    switch (layer_state) {
+        case L_BASE_MAC:
+        case L_BASE_LINUX:
+            oled_write_ln_P(PSTR("Base"), false);
+            break;
+        case L_SYMBOLS:
+            oled_write_ln_P(PSTR("Symbols"), false);
+            break;
+        case L_MAN_MAC:
+            oled_write_ln_P(PSTR("Media/Num (Mac)"), false);
+            break;
+        case L_MAN_LINUX:
+            oled_write_ln_P(PSTR("Media/Num (Linux)"), false);
+            break;
+        case L_EXTRA:
+        case L_EXTRA|L_SYMBOLS:
+        case L_EXTRA|L_MAN_MAC:
+        case L_EXTRA|L_MAN_LINUX:
+        case L_EXTRA|L_SYMBOLS|L_MAN_MAC:
+        case L_EXTRA|L_SYMBOLS|L_MAN_LINUX:
+            oled_write_ln_P(PSTR("Extra"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Unhandled!"), false);
+            break;
+    }
+}
+
+
+char keylog_str[24] = {};
+
+const char code_to_name[60] = {
+    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+  char name = ' ';
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
+  if (keycode < 60) {
+    name = code_to_name[keycode];
+  }
+
+  // update keylog
+  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
+           record->event.key.row, record->event.key.col,
+           keycode, name);
+}
+
+void oled_render_keylog(void) {
+    oled_write(keylog_str, false);
+}
+
+void render_bootmagic_status(bool status) {
+    /* Show Ctrl-Gui Swap options */
+    static const char PROGMEM logo[][2][3] = {
+        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+    };
+    if (status) {
+        oled_write_ln_P(logo[0][0], false);
+        oled_write_ln_P(logo[0][1], false);
+    } else {
+        oled_write_ln_P(logo[1][0], false);
+        oled_write_ln_P(logo[1][1], false);
+    }
+}
+
+void oled_render_logo(void) {
+    static const char PROGMEM crkbd_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+        0};
+    oled_write_P(crkbd_logo, false);
+}
+
+void oled_task_user(void) {
+    if (is_master) {
+        oled_render_layer_state();
+        oled_render_keylog();
+    } else {
+        oled_render_logo();
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    set_keylog(keycode, record);
+  }
+  return true;
+}
+#endif // OLED_DRIVER_ENABLE
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/readme.md b/keyboards/crkbd/keymaps/rjhilgefort/readme.md
new file mode 100644
index 0000000000..6c8fd9c224
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rjhilgefort/readme.md
@@ -0,0 +1,117 @@
+# [🐦 @rjhilgefort](https://twitter.com/rjhilgefort)'s Corne KBD (CRKBD) Layout
+
+My Corne KBD layout is inspired by [my Planck Layout](../../../planck/keymaps/rjhilgefort/readme.md), but with some additional features. Namely, this layout has Linux support.
+
+![](https://imgur.com/wp9ksTIh.jpg)
+![](https://imgur.com/fnyiCnEh.jpg)
+
+## Features
+
+Here's some highlights/features of the layout.
+
+-   Ergonomic symbols layer.
+-   Media and Numpad layer.
+-   Planck-like extra tri-layer when holding the other two layers.
+-   Supports Mac and Linux as 1st class citizens giving each a dedicated base layer and a media layer for each that matches media keys for each OS. The Linux default layer focuses on `Ctrl` instead of `Super` and vice versa for Mac. (When you set Linux as your base layer, the Linux media layer is what you shift into. Same for the Mac layer when that's the base)
+
+## Layers
+
+#### Keymap 0: Base (Mac)
+
+```
+  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
+     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    CTL_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          MO(3), ALT_ESC, KC_LGUI,     KC_SPC,   MO(2),   HYPER
+                                    //`--------------------------'  `--------------------------'
+```
+
+#### Keymap 1: Base (Linux)
+
+```
+  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
+     KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    ALT_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          MO(4), GUI_ESC, KC_LCTL,     KC_SPC,   MO(2),   HYPER
+                                    //`--------------------------'  `--------------------------'
+```
+
+#### Keymap 2: Symbol Layer
+
+```
+  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
+    _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD,                      KC_PIPE,  KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, _______,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN,  KC_GRV,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          MO(5), _______, _______,    _______, KC_TRNS, _______
+                                    //`--------------------------'  `--------------------------'
+```
+
+#### Keymap 3: Media & Numbers (MAC)
+
+```
+  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
+    _______, _______, KC_BRMD, KC_VOLU, KC_BRMU, _______,                      _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    _______, KC_MUTE, KC_MRWD, KC_MPLY, KC_MFFD, _______,                      _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    _______, _______, _______, KC_VOLD, _______, _______,                      _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
+  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                        KC_TRNS, _______, _______,       KC_0,   MO(5), _______
+                                    //`--------------------------'  `--------------------------'
+```
+
+#### Keymap 4: Media & Numbers (Linux)
+
+```
+  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
+    _______, _______, KC_BRID, KC_VOLU, KC_BRIU, _______,                      _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______,                      _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    _______, _______, _______, KC_VOLD, _______, _______,                      _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
+  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                        KC_TRNS, _______, _______,       KC_0,   MO(5), _______
+                                    //`--------------------------'  `--------------------------'
+```
+
+#### Keymap 5: Extra
+
+```
+  ,-----------------------------------------------------.                    ,-----------------------------------------------------.
+    _______,   DF(0),   DF(1), _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    _______, _______, _______, _______, _______, _______,                      KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______, _______,
+  |--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+    _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+  |--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                        KC_TRNS, _______, _______,    _______, KC_TRNS, _______
+                                    //`--------------------------'  `--------------------------'
+```
+
+## Building And Flashing
+
+Note, you'll see that most `crkbd`'s recommend a target of `avrdude` because most kits come with a Pro Micro. I put a Elite-C on mine and thus the target is `dfu`. You can see this in the [rules.mk](./rules.mk) as the `BOOTLOADER` configuration.
+
+#### CLI
+
+```
+make crkbd:rjhilgefort:flash
+```
+
+#### Docker
+
+```
+util/docker_build.sh crkbd:rjhilgefort:flash
+```
diff --git a/keyboards/crkbd/keymaps/rjhilgefort/rules.mk b/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
new file mode 100644
index 0000000000..a1b6e79e7e
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rjhilgefort/rules.mk
@@ -0,0 +1,7 @@
+# For Elite-C
+BOOTLOADER = atmel-dfu
+
+# https://www.reddit.com/r/olkb/comments/9pyc0u/qmk_media_keys_are_not_working/
+EXTRAKEY_ENABLE = yes
+
+OLED_DRIVER_ENABLE  = yes
diff --git a/keyboards/planck/keymaps/rjhilgefort/config.h b/keyboards/planck/keymaps/rjhilgefort/config.h
index e8c13caac5..6fa31cc8a7 100644
--- a/keyboards/planck/keymaps/rjhilgefort/config.h
+++ b/keyboards/planck/keymaps/rjhilgefort/config.h
@@ -36,3 +36,4 @@
 
 // Most tactile encoders have detents every 4 stages
 #define ENCODER_RESOLUTION 4
+
diff --git a/keyboards/planck/keymaps/rjhilgefort/keymap.c b/keyboards/planck/keymaps/rjhilgefort/keymap.c
index 3331915311..57f966e74e 100644
--- a/keyboards/planck/keymaps/rjhilgefort/keymap.c
+++ b/keyboards/planck/keymaps/rjhilgefort/keymap.c
@@ -17,99 +17,89 @@
 #include QMK_KEYBOARD_H
 #include "muse.h"
 
-extern keymap_config_t keymap_config;
 
 enum planck_layers {
-  _QWERTY,
+  _MAC,
+  _LINUX,
   _LOWER,
   _RAISE,
   _ADJUST
 };
 
 enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
+  MAC = SAFE_RANGE,
+  LINUX,
   BACKLIT,
-  EXT_PLV
 };
 
+#define ALT_ESC ALT_T(KC_ESC)
+#define CTL_ESC CTL_T(KC_ESC)
+#define GUI_ESC GUI_T(KC_ESC)
+#define HYPER LGUI(LSFT(KC_LALT))
+
 #define LOWER MO(_LOWER)
 #define RAISE MO(_RAISE)
 
-#define CTRL_ESC MT(MOD_LCTL, KC_ESC)
-#define HYPER LCTL(LALT(QK_LGUI))
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* Qwerty
-* ,-------------------------------------------------------------------------------------------------------.
-* | Tab    |    Q   |    W   |    E   |    R   |   T   |   Y   |   U  |    I   |    O   |   P    | Bksp   |
-* |--------+--------+--------+--------+--------+-------+-------+------+--------+--------+--------+--------|
-* | Ct/Esc |    A   |    S   |    D   |    F   |   G   |   H   |   J  |    K   |    L   |   ;    |  "     |
-* |--------+--------+--------+--------+--------+-------+-------+------+--------+--------+--------+--------|
-* | Shift  |    Z   |    X   |    C   |    V   |   B   |   N   |   M  |    ,   |    .   |   /    | Enter  |
-* |--------+--------+--------+--------+--------+-------+-------+------+--------+--------+--------+--------|
-* |        |  Ctrl  | Raise  |   Alt  |   GUI  |     Space     | Lowr | Hyper  |        |        | Raise  |
-* `-------------------------------------------------------------------------------------------------------'
-*/
-[_QWERTY] = LAYOUT_planck_grid(
-  KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
-  CTRL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-  KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
-  _______,  KC_LCTL, RAISE,   KC_LALT, KC_LGUI, KC_SPC, KC_SPC, LOWER, HYPER,   _______, _______, RAISE
+[_MAC] = LAYOUT_planck_grid(
+// ,-----------------------------------------------------------------------------------------------------------.
+      KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     CTL_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, _______,   RAISE, ALT_ESC, KC_LGUI,  KC_SPC,  KC_SPC,   LOWER,   HYPER, _______, _______, _______
+// ,-----------------------------------------------------------------------------------------------------------.
+),
+
+[_LINUX] = LAYOUT_planck_grid(
+// ,-----------------------------------------------------------------------------------------------------------.
+      KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     ALT_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, _______,   RAISE, GUI_ESC, KC_LCTL,  KC_SPC,  KC_SPC,   LOWER,   HYPER, _______, _______, _______
+// ,-----------------------------------------------------------------------------------------------------------.
 ),
 
-/* Lower
-* ,-----------------------------------------------------------------------------------------------------------.
-* |       |   \    |   /    |   [    |   ]    |   ~    |   |    |   =    |   +    |    -    |    _   |        |
-* |-------+--------+--------+--------+--------+--------+--------+--------+--------+---------+--------+--------|
-* |       |   {    |   }    |   (    |   )    |   `    |   ←    |   ↓    |   ↑    |    →    |  Alt   |        |
-* |-------+--------+--------+--------+--------+--------+--------+--------+--------+---------+--------+--------|
-* |       |   !    |   @    |   #    |   $    |   %    |   ^    |   &    |   *    |    (    |    )   |        |
-* |-------+--------+--------+--------+--------+--------+--------+--------+--------+---------+--------+--------|
-* |       |        |        |        |        |                 |        |        |         |        |        |
-* `-----------------------------------------------------------------------------------------------------------'
-*/
 [_LOWER] = LAYOUT_planck_grid(
-  _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD, KC_PIPE, KC_EQL,  KC_PLUS, KC_MINS,  KC_UNDS, _______,
-  _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_GRV,  KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_LALT, _______,
-  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN,  KC_RPRN, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
+// ,-----------------------------------------------------------------------------------------------------------.
+     _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD, KC_PIPE,  KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, _______,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN,  KC_GRV, KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+// ,-----------------------------------------------------------------------------------------------------------.
 ),
 
-/* Raise
-* ,----------------------------------------------------------------------------------------------------------.
-* |       |        |        |        |        |        |        |   7    |   8    |   9    |        |        |
-* |-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-* |       | VolMte | Vol -  | Vol +  | Ply/Pse|        |        |   4    |   5    |   6    |        |        |
-* |-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-* |       | Trak ← | Trak → | Scrn - | Scrn + |        |        |   1    |   2    |   3    |        |        |
-* |-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-* |       |        |        |        |        |                 |        |   0    |   .    |        |        |
-* `----------------------------------------------------------------------------------------------------------'
-*/
 [_RAISE] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9,    _______, _______,
-  _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, KC_4,    KC_5,    KC_6,    _______, _______,
-  _______, KC_MRWD, KC_MFFD, KC_SLCK, KC_PAUS, _______, _______, KC_1,    KC_2,    KC_3,    _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, KC_0,    KC_0,    KC_DOT,  _______, _______
+// ,-----------------------------------------------------------------------------------------------------------.
+     _______, _______, KC_BRID, KC_VOLU, KC_BRIU, _______, _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, KC_VOLD, _______, _______, _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______, _______, _______,    KC_0,  KC_DOT, _______, _______
+// ,-----------------------------------------------------------------------------------------------------------.
 ),
 
-/* Adjust (Lower + Raise)
- * ,----------------------------------------------------------------------------------------------------------.
- * |       | Reset  |        |        |        |        |        |        |        |        |        | Del    |
- * |-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |       |        | MuMod  | AudOn  | AudOff |        |        | Qwerty |        |        |        |        |
- * |-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |       | Voice- | Voice+ | MusOn  | Musoff | MIDIon | MIDIof | TermOn | TermOff|        |        |        |
- * |-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |       |        |        |        |        |                 |        |        |        |        |        |
- * `----------------------------------------------------------------------------------------------------------'
- */
 [_ADJUST] = LAYOUT_planck_grid(
-  _______, RESET,   _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_DEL,
-  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  _______, _______, QWERTY,  _______,  _______, _______, _______,
-  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+// ,-----------------------------------------------------------------------------------------------------------.
+     _______,     MAC,   LINUX, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______, _______,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+// |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+// ,-----------------------------------------------------------------------------------------------------------.
 )
 
 };
@@ -119,10 +109,135 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
 #endif
 
-uint32_t layer_state_set_user(uint32_t state) {
+layer_state_t layer_state_set_user(layer_state_t state) {
   return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 }
 
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case MAC:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_MAC);
+      }
+      return false;
+      break;
+    case LINUX:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_LINUX);
+      }
+      return false;
+      break;
+    case BACKLIT:
+      if (record->event.pressed) {
+        register_code(KC_RSFT);
+        #ifdef BACKLIGHT_ENABLE
+          backlight_step();
+        #endif
+        #ifdef KEYBOARD_planck_rev5
+          writePinLow(E6);
+        #endif
+      } else {
+        unregister_code(KC_RSFT);
+        #ifdef KEYBOARD_planck_rev5
+          writePinHigh(E6);
+        #endif
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+bool muse_mode = false;
+uint8_t last_muse_note = 0;
+uint16_t muse_counter = 0;
+uint8_t muse_offset = 70;
+uint16_t muse_tempo = 50;
+
+void encoder_update(bool clockwise) {
+  if (muse_mode) {
+    if (IS_LAYER_ON(_RAISE)) {
+      if (clockwise) {
+        muse_offset++;
+      } else {
+        muse_offset--;
+      }
+    } else {
+      if (clockwise) {
+        muse_tempo+=1;
+      } else {
+        muse_tempo-=1;
+      }
+    }
+  } else {
+    if (clockwise) {
+      #ifdef MOUSEKEY_ENABLE
+        tap_code(KC_MS_WH_DOWN);
+      #else
+        tap_code(KC_PGDN);
+      #endif
+    } else {
+      #ifdef MOUSEKEY_ENABLE
+        tap_code(KC_MS_WH_UP);
+      #else
+        tap_code(KC_PGUP);
+      #endif
+    }
+  }
+}
+
+void dip_switch_update_user(uint8_t index, bool active) {
+    switch (index) {
+        case 0: {
+#ifdef AUDIO_ENABLE
+            static bool play_sound = false;
+#endif
+            if (active) {
+#ifdef AUDIO_ENABLE
+                if (play_sound) { PLAY_SONG(plover_song); }
+#endif
+                layer_on(_ADJUST);
+            } else {
+#ifdef AUDIO_ENABLE
+                if (play_sound) { PLAY_SONG(plover_gb_song); }
+#endif
+                layer_off(_ADJUST);
+            }
+#ifdef AUDIO_ENABLE
+            play_sound = true;
+#endif
+            break;
+        }
+        case 1:
+            if (active) {
+                muse_mode = true;
+            } else {
+                muse_mode = false;
+            }
+    }
+}
+
+void matrix_scan_user(void) {
+#ifdef AUDIO_ENABLE
+    if (muse_mode) {
+        if (muse_counter == 0) {
+            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+            if (muse_note != last_muse_note) {
+                stop_note(compute_freq_for_midi_note(last_muse_note));
+                play_note(compute_freq_for_midi_note(muse_note), 0xF);
+                last_muse_note = muse_note;
+            }
+        }
+        muse_counter = (muse_counter + 1) % muse_tempo;
+    } else {
+        if (muse_counter) {
+            stop_all_notes();
+            muse_counter = 0;
+        }
+    }
+#endif
+}
+
 bool music_mask_user(uint16_t keycode) {
   switch (keycode) {
     case RAISE:
@@ -132,23 +247,3 @@ bool music_mask_user(uint16_t keycode) {
       return true;
   }
 }
-
-/*
-* Example
-* ,----------------------------------------------------------------------------------------------------------.
-* |       |        |        |        |        |        |        |        |        |        |        |        |
-* |-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-* |       |        |        |        |        |        |        |        |        |        |        |        |
-* |-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-* |       |        |        |        |        |        |        |        |        |        |        |        |
-* |-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
-* |       |        |        |        |        |                 |        |        |        |        |        |
-* `----------------------------------------------------------------------------------------------------------'
-*
-[_EXAMPLE] = LAYOUT_planck_grid(
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-),
-*/
diff --git a/keyboards/planck/keymaps/rjhilgefort/readme.md b/keyboards/planck/keymaps/rjhilgefort/readme.md
index f446a76194..08c0731785 100644
--- a/keyboards/planck/keymaps/rjhilgefort/readme.md
+++ b/keyboards/planck/keymaps/rjhilgefort/readme.md
@@ -1,63 +1,100 @@
 # [🐦 @rjhilgefort](https://twitter.com/rjhilgefort) Planck Layout
 
-A simple and practical layout featuring:
-
-- Hyper Key === CTRL + ALT + GUI 
-- Ctrl/Esc key that is CTRL when held and ESC when tapped
-- Symbols layer that focuses on coding
-- Numpad + media layer
+Fairly straight forward Planck layout, but arranges the symbols more toward coding and features a Mac and Linux base layer instead of multiple Alpha layouts.
 
 ![Imgur](https://i.imgur.com/elygxAb.jpg)
 
+## Features
+
+Here's some highlights/features of the layout.
+
+-   Ergonomic symbols layer.
+-   Media and Numpad layer.
+-   Supports Mac and Linux as 1st class citizens giving each a dedicated base layer and a media layer for each that matches media keys for each OS. The Linux default layer focuses on `Ctrl` instead of `Super` and vice versa for Mac. (When you set Linux as your base layer, the Linux media layer is what you shift into. Same for the Mac layer when that's the base)
+
+## Layers
+
+#### Base (Mac)
+
+```
+,-----------------------------------------------------------------------------------------------------------.
+   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  CTL_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, _______,   RAISE, ALT_ESC, KC_LGUI,  KC_SPC,  KC_SPC,   LOWER,   HYPER, _______, _______, _______
+,-----------------------------------------------------------------------------------------------------------.
+```
+
+#### Base (Linux)
+
+```
+,-----------------------------------------------------------------------------------------------------------.
+   KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSPC,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  ALT_ESC,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ENT,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, _______,   RAISE, GUI_ESC, KC_LCTL,  KC_SPC,  KC_SPC,   LOWER,   HYPER, _______, _______, _______
+,-----------------------------------------------------------------------------------------------------------.
+```
+
+#### Lower: Symbol Layer
 
-## Main
 ```
-,-------------------------------------------------------------------------------------------------------.
-| Tab    |    Q   |    W   |    E   |    R   |   T   |   Y   |   U  |    I   |    O   |   P    | Bksp   |
-|--------|--------|--------|--------|--------|-------|-------|------|--------|--------|--------|--------|
-| Ct/Esc |    A   |    S   |    D   |    F   |   G   |   H   |   J  |    K   |    L   |   ;    |  "     |
-|--------|--------|--------|--------|--------|-------|-------|------|--------|--------|--------|--------|
-| Shift  |    Z   |    X   |    C   |    V   |   B   |   N   |   M  |    ,   |    .   |   /    | Enter  |
-|--------|--------|--------|--------|--------|-------|-------|------|--------|--------|--------|--------|
-|        |  Ctrl  | Raise  |   Alt  |   GUI  |     Space     | Lowr | Hyper  |        |        | Raise  |
-`-------------------------------------------------------------------------------------------------------'
+,-----------------------------------------------------------------------------------------------------------.
+  _______, KC_BSLS, KC_SLSH, KC_LBRC, KC_RBRC, KC_TILD, KC_PIPE,  KC_EQL, KC_PLUS, KC_MINS, KC_UNDS, _______,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN,  KC_GRV, KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, _______, _______,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+,-----------------------------------------------------------------------------------------------------------.
 ```
 
-## Lower
+#### Raise: Media & Numbers
+
 ```
 ,-----------------------------------------------------------------------------------------------------------.
-|       |   \    |   /    |   [    |   ]    |   ~    |   |    |   =    |   +    |    -    |    _   |        |
-|-------|--------|--------|--------|--------|--------|--------|--------|--------|---------|--------|--------|
-|       |   {    |   }    |   (    |   )    |   `    |   ←    |   ↓    |   ↑    |    →    |  Alt   |        |
-|-------|--------|--------|--------|--------|--------|--------|--------|--------|---------|--------|--------|
-|       |   !    |   @    |   #    |   $    |   %    |   ^    |   &    |   *    |    (    |    )   |        |
-|-------|--------|--------|--------|--------|--------|--------|--------|--------|---------|--------|--------|
-|       |        |        |        |        |                 |        |        |         |        |        |
-`-----------------------------------------------------------------------------------------------------------'
+  _______, _______, KC_BRID, KC_VOLU, KC_BRIU, _______, _______,    KC_7,    KC_8,    KC_9, KC_ASTR, _______,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, KC_MUTE, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,    KC_4,    KC_5,    KC_6, KC_PLUS, _______,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, _______, _______, KC_VOLD, _______, _______, _______,    KC_1,    KC_2,    KC_3, KC_BSLS, _______,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, _______, _______, _______, _______, _______, _______, _______,    KC_0,  KC_DOT, _______, _______
+,-----------------------------------------------------------------------------------------------------------.
 ```
 
-## Raise
+#### Adjust
+
 ```
-,----------------------------------------------------------------------------------------------------------.
-|       |        |        |        |        |        |        |   7    |   8    |   9    |        |        |
-|-------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|
-|       | VolMte | Vol -  | Vol +  | Ply/Pse|        |        |   4    |   5    |   6    |        |        |
-|-------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|
-|       | Trak ← | Trak → | Scrn - | Scrn + |        |        |   1    |   2    |   3    |        |        |
-|-------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|
-|       |        |        |        |        |                 |        |   0    |   .    |        |        |
-`----------------------------------------------------------------------------------------------------------'
+,-----------------------------------------------------------------------------------------------------------.
+  _______,     MAC,   LINUX, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, _______, _______,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+,-----------------------------------------------------------------------------------------------------------.
+)
 ```
 
-## Adjust (Lower + Raise)
+## Building And Flashing
+
+#### CLI
+
+```
+sudo make planck/rev6:rjhilgefort-dualos:flash
+```
+
+#### Docker
+
 ```
-,----------------------------------------------------------------------------------------------------------.
-|       | Reset  |        |        |        |        |        |        |        |        |        | Del    |
-|-------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|
-|       |        | MuMod  | AudOn  | AudOff |        |        | Qwerty |        |        |        |        |
-|-------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|
-|       | Voice- | Voice+ | MusOn  | Musoff | MIDIon | MIDIof | TermOn | TermOff|        |        |        |
-|-------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|
-|       |        |        |        |        |                 |        |        |        |        |        |
-`----------------------------------------------------------------------------------------------------------'
+util/docker_build.sh planck/rev6:rjhilgefort-dualos:flash
 ```