Merge remote-tracking branch 'upstream/master'

14 files changed, 210 insertions, 59 deletions

diff --git a/keyboards/keebio/quefrency/keymaps/bcat/config.h b/keyboards/keebio/quefrency/keymaps/bcat/config.h
index c9e836597..071856f10 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bcat/config.h
@@ -1,16 +1,10 @@
 #pragma once
 
 /*
- * I2C seems to randomly drop keystrokes. Not sure why. It seems a bit like
- * https://github.com/qmk/qmk_firmware/issues/5037, but that issue is closed,
- * and our problems happen even with underglow disabled.
- *
- * This issue occurs with multiple TRRS cables of different lengths from
- * different companies, so it's most likely not a cable issue.  It may be that
- * we are running into issues with long I2C runs, in which case stronger
- * pull-up resistors might help:
- * https://hackaday.com/2017/02/08/taking-the-leap-off-board-an-introduction-to-i2c-over-long-wires/.
- * For now, just don't use I2C.
+ * Quefrency lacks I2C resistors on the right PCB, so the right half doesn't
+ * work independently. (Presumably the floating I2C lines cause a problem.)
+ * Using serial seems sufficiently fast in practice and allows both halves to
+ * be used independently.
  */
 #define USE_SERIAL
 
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
index 9dc98f5a1..d74a55b4b 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
@@ -5,25 +5,24 @@ enum layer {
     LAYER_FUNCTION,
 };
 
-/* Switch to function layer when held. */
 #define LY_FUNC MO(LAYER_FUNCTION)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Default layer: http://www.keyboard-layout-editor.com/#/gists/60a262432bb340b37d364a4424f3037b */
     [LAYER_DEFAULT] = LAYOUT_65(
         KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_GRV,   KC_HOME,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,  KC_PGUP,
-        KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,   KC_PGDN,
-        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_END,
-        KC_LCTL,  KC_LGUI,  KC_LALT,  LY_FUNC,  KC_SPC,   KC_SPC,   XXXXXXX,  KC_RALT,  LY_FUNC,  KC_APP,   KC_LEFT,  KC_DOWN,  KC_RGHT
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSPC,            KC_PGUP,
+        KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_PGDN,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,    KC_END,
+        KC_LCTL,  KC_LGUI,  KC_LALT,  LY_FUNC,  KC_SPC,                       KC_SPC,   XXXXXXX,  KC_RALT,  LY_FUNC,  KC_APP,             KC_LEFT,  KC_DOWN,  KC_RGHT
     ),
 
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */
     [LAYER_FUNCTION] = LAYOUT_65(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_DEL,   RGB_HUI,
-        _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,  RGB_SAI,
-        KC_CAPS,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,  RGB_SAD,
-        _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_VAI,  RGB_HUD,
-        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_MOD
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
+        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_TOG,            RGB_SAD,
+        _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      RGB_VAI,  RGB_HUD,
+        _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,            RGB_RMOD, RGB_VAD,  RGB_MOD
     ),
 };
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/readme.md b/keyboards/keebio/quefrency/keymaps/bcat/readme.md
index 793e8833a..0436e1d2c 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/readme.md
+++ b/keyboards/keebio/quefrency/keymaps/bcat/readme.md
@@ -1,13 +1,17 @@
 # bcat's Quefrency 65% layout
 
 This is pretty much a stock 65% split keyboard layout, with an HHKB-style
-(split) backspace, media keys in the function layer centered around the WASD
+(split) backspace, media keys in the function layer centered around the ESDF
 cluster, and RGB controls in the function layer on the arrow/nav keys.
 
 ## Default layer
 
 ![Default layer layout](https://i.imgur.com/CU2fxDg.png)
 
+([KLE](http://www.keyboard-layout-editor.com/#/gists/60a262432bb340b37d364a4424f3037b))
+
 ## Function layer
 
-![Function layer layout](https://i.imgur.com/4R1F72M.png)
+![Function layer layout](https://i.imgur.com/xE4CuH0.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d))
diff --git a/keyboards/keebio/quefrency/keymaps/default/keymap.c b/keyboards/keebio/quefrency/keymaps/default/keymap.c
index 744a8d32a..8b30a1174 100644
--- a/keyboards/keebio/quefrency/keymaps/default/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default/keymap.c
@@ -1,6 +1,5 @@
 #include QMK_KEYBOARD_H
 
-extern keymap_config_t keymap_config;
 
 // 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.
diff --git a/keyboards/keebio/quefrency/keymaps/default/rules.mk b/keyboards/keebio/quefrency/keymaps/default/rules.mk
deleted file mode 100644
index e69de29bb..000000000
--- a/keyboards/keebio/quefrency/keymaps/default/rules.mk
+++ /dev/null
diff --git a/keyboards/keebio/quefrency/keymaps/default65/rules.mk b/keyboards/keebio/quefrency/keymaps/default65/rules.mk
deleted file mode 100644
index e69de29bb..000000000
--- a/keyboards/keebio/quefrency/keymaps/default65/rules.mk
+++ /dev/null
diff --git a/keyboards/keebio/quefrency/keymaps/drashna_ms/config.h b/keyboards/keebio/quefrency/keymaps/drashna_ms/config.h
new file mode 100644
index 000000000..ec2a2ea16
--- /dev/null
+++ b/keyboards/keebio/quefrency/keymaps/drashna_ms/config.h
@@ -0,0 +1,39 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2018 Danny Nguyen <danny@keeb.io>
+
+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_I2C
+#define EE_HANDS
+
+
+#ifdef RGBLIGHT_ENABLE
+    #define RGBLIGHT_SPLIT
+    #undef  RGBLED_NUM
+    #define RGBLED_NUM 17
+    #define RGBLED_SPLIT { 9, 8 }
+    #define RGBLIGHT_SLEEP
+#endif
+
+#ifdef AUDIO_ENABLE
+    #define B7_AUDIO
+    #define AUDIO_CLICKY
+#endif
diff --git a/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c b/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
new file mode 100644
index 000000000..445709bc3
--- /dev/null
+++ b/keyboards/keebio/quefrency/keymaps/drashna_ms/keymap.c
@@ -0,0 +1,43 @@
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+enum layers {
+    _BASE,
+    _FN1,
+};
+
+enum custom_keycodes {
+    KC_MAKE = SAFE_RANGE,
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_65_with_macro(
+    KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL, XXXXXXX, KC_BSPC, KC_HOME, \
+    KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,     KC_BSLS,     KC_END, \
+    KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,             KC_PGUP, \
+    KC_F7,   KC_F8,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,     KC_RSFT,              KC_UP,   KC_PGDN, \
+    KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,    KC_SPC,  MO(_FN1),     KC_SPC,   XXXXXXX,       KC_RALT, KC_RGUI, KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [_FN1] = LAYOUT_65_with_macro(
+    _______, _______, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, RESET, \
+    _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, KC_TILD, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
+  )
+};
+
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
+            if (!record->event.pressed)
+                send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP ":dfu" SS_TAP(X_ENTER)), 10);
+
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/keebio/quefrency/keymaps/drashna_ms/rules.mk b/keyboards/keebio/quefrency/keymaps/drashna_ms/rules.mk
new file mode 100644
index 000000000..1b8b582ab
--- /dev/null
+++ b/keyboards/keebio/quefrency/keymaps/drashna_ms/rules.mk
@@ -0,0 +1,5 @@
+LINK_TIME_OPTIMIZATION_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+AUDIO_ENABLE = yes
+BOOTLOADER = qmk-dfu
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/config.h b/keyboards/keebio/quefrency/keymaps/georgepetri/config.h
index d72d7760e..c3063d6da 100644
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/config.h
+++ b/keyboards/keebio/quefrency/keymaps/georgepetri/config.h
@@ -21,4 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_I2C
\ No newline at end of file
+#undef RGBLIGHT_ANIMATIONS
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c b/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c
index f08ab4f83..9ee3eb810 100644
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/georgepetri/keymap.c
@@ -2,43 +2,90 @@
 
 extern keymap_config_t keymap_config;
 
-// 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.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
 #define _BASE 0
-#define _FN1 1
+#define _L 1
+#define _R 2
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
 };
 
+#define KC_TL LCTL(KC_PGUP)
+#define KC_TR LCTL(KC_PGDN)
+#define KC_TC LCTL(KC_W)
+#define KC_TRO LCTL(LSFT(KC_T))
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_65(
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,             KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,\
+    KC_GRV  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_6    ,         KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_BSPC ,KC_DEL  ,KC_MINS ,KC_EQL  ,KC_HOME,
 // ├────────┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┘    ┌───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────────┼────────┤
-    KC_TAB,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_END, \
+    KC_TAB       ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,         KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_LBRC ,KC_RBRC ,KC_BSLS     ,KC_END  , 
 // ├─────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┐      └─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┼────────┤
-    KC_CAPS,        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,             KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,             KC_PGUP,\
+    KC_ESC         ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,         KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_QUOT ,KC_ENT             ,KC_PGUP ,
 // ├───────────────┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┐  └─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴───────────────────┼────────┤
-    KC_LSFT,              KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, _______,      KC_PGDN,\
+    KC_LSFT              ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,         KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT, _______      ,KC_PGDN ,
 // ├──────────┬──────────┴┬───────┴──┬─────┴─────┬──┴────────┴────────┤        ├────────┴────────┴────┬───┴────┬───┴────┬───┴────┬────────┬────────┼────────┤
-    KC_LCTL,   KC_LGUI,    KC_LALT,   MO(_FN1),   KC_SPC,                       KC_SPC  ,_______,      KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    KC_CAPS   ,KC_LCTL    ,KC_LALT   ,MO(_L)   ,KC_SPC                ,         KC_SPC  ,_______      ,KC_LGUI ,TG(_R)  ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
 // └──────────┴───────────┴──────────┴───────────┴────────────────────┘        └──────────────────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   ),
 
-  [_FN1] = LAYOUT_65(
+  [_L] = LAYOUT_65(
 // ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSPC, KC_DEL,  KC_INS, \
+    _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F6   ,         KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,_______ ,_______ ,_______ ,_______ ,KC_INS  , 
 // ├────────┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┘    ┌───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────────┼────────┤
-    _______,      _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______,     KC_PAUS,\
+    _______      ,KC_F11  ,KC_F12  ,_______ ,_______ ,_______ ,         _______ ,KC_MINS ,KC_EQL  ,_______ ,_______ ,_______ ,_______ ,_______,     KC_PAUS ,
 // ├─────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┐      └─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┼────────┤
-    _______,        _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,            _______,\
+    _______        ,_______ ,_______ ,_______ ,_______ ,_______ ,         KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,_______ ,_______ ,_______            ,_______ ,
 // ├───────────────┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┐  └─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴───────────────────┼────────┤
-    _______,              _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,      _______,\
+    _______              ,_______ ,_______ ,_______ ,_______ ,_______ ,         _______ ,KC_PGDN ,KC_PGUP ,KC_HOME ,KC_END  ,_______ ,_______      ,_______ ,
 // ├──────────┬──────────┴┬───────┴──┬─────┴─────┬──┴────────┴────────┤        ├────────┴────────┴────┬───┴────┬───┴────┬───┴────┬────────┬────────┼────────┤
-    _______,   _______,    _______,   _______,    _______,                      _______, _______,      _______, _______, _______, _______, _______, _______
+    _______   ,_______    ,_______   ,_______    ,_______             ,         _______ ,_______      ,_______ ,_______ ,_______ ,_______ ,_______ ,_______
+// └──────────┴───────────┴──────────┴───────────┴────────────────────┘        └──────────────────────┴────────┴────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [_R] = LAYOUT_65(
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐        ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,         _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ , 
+// ├────────┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┘    ┌───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────┬───┴────────┼────────┤
+    _______      ,KC_TL   ,KC_TR   ,KC_TC   ,KC_TRO  ,_______ ,         _______ ,KC_TL  , KC_TR  , KC_TC  , KC_TRO  ,_______ ,_______ ,_______,     _______ ,
+// ├─────────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┐      └─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────────┼────────┤
+    _______        ,KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,_______ ,         KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT ,_______ ,_______ ,_______            ,_______ ,
+// ├───────────────┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┐  └─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴─────┬──┴───────────────────┼────────┤
+    _______              ,KC_PGDN ,KC_PGUP ,KC_HOME ,KC_END  ,_______ ,         _______ ,KC_PGDN ,KC_PGUP ,KC_HOME ,KC_END  ,_______ ,_______      ,_______ ,
+// ├──────────┬──────────┴┬───────┴──┬─────┴─────┬──┴────────┴────────┤        ├────────┴────────┴────┬───┴────┬───┴────┬───┴────┬────────┬────────┼────────┤
+    _______   ,_______    ,_______   ,_______    ,_______             ,         _______ ,_______      ,_______ ,_______ ,_______ ,_______ ,_______ ,_______
 // └──────────┴───────────┴──────────┴───────────┴────────────────────┘        └──────────────────────┴────────┴────────┴────────┴────────┴────────┴────────┘
   )
 };
+
+void keyboard_post_init_user(void) {
+  rgblight_sethsv_noeeprom(HSV_BLUE);
+}
+
+void update_led(void) {
+    switch (biton32(layer_state)) {
+      case _BASE:
+      rgblight_sethsv_noeeprom(HSV_BLUE);
+      break;
+    case _L:
+      rgblight_sethsv_noeeprom(HSV_CORAL);
+      break;
+    case _R:
+      rgblight_sethsv_noeeprom(HSV_MAGENTA);
+      break;
+    }
+  if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+    rgblight_sethsv_range(HSV_WHITE,0,4);
+    rgblight_sethsv_range(HSV_WHITE,12,16);
+  }
+}
+
+uint32_t layer_state_set_user(uint32_t state) {
+  update_led();
+  return state;
+}
+
+void led_set_user(uint8_t usb_led) {
+  update_led();
+}
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/readme.md b/keyboards/keebio/quefrency/keymaps/georgepetri/readme.md
index 425190d19..bb4e75c27 100644
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/readme.md
+++ b/keyboards/keebio/quefrency/keymaps/georgepetri/readme.md
@@ -1,48 +1,64 @@
 # George Petri's Quefrency 65 layout
 
 ```
-make keebio/quefrency:georgepetri
+make keebio/quefrency/rev1:georgepetri
 ```
 
-Based on the default querty layout with minor tweaks.  
-The position of the arrow keys in a line in the bottom right.  
-The backspace key is 1u and to the left of the delete key.  
-Grave, pause and insert are on the function layer.  
+Querty layout with minor changes and dedicated navigation layer.
 
 ### Base Layer
 ```
 ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
-│  ESC ││  1   ││  2   ││  3   ││  4   ││  5   ││  6   │        │  7   ││  8   ││  9   ││  0   ││  MINS││  EQL ││  BSPC││  DEL ││  HOME│
+│  GRV ││  1   ││  2   ││  3   ││  4   ││  5   ││  6   │        │  7   ││  8   ││  9   ││  0   ││  BSPC││  DEL ││  MINS││  EQL ││  HOME│
 └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
 ┌──────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────────┐┌──────┐
 │  TAB     ││  Q   ││  W   ││  E   ││  R   ││  T   │        │  Y   ││  U   ││  I   ││  O   ││  P   ││  LBRC││  RBRC││  BSLS    ││  END │
 └──────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────────┘└──────┘
 ┌────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────┐┌──────┐
-│  CAPS      ││  A   ││  S   ││  D   ││  F   ││  G   │        │  H   ││  J   ││  K   ││  L   ││  SCLN││  QUOT││  ENT           ││  PGUP│
+│  ESC       ││  A   ││  S   ││  D   ││  F   ││  G   │        │  H   ││  J   ││  K   ││  L   ││  SCLN││  QUOT││  ENT           ││  PGUP│
 └────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└────────────────┘└──────┘
 ┌────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────────┐┌──────┐
 │  LSFT          ││  Z   ││  X   ││  C   ││  V   ││  B   │        │  N   ││  M   ││  COMM││  DOT ││  SLSH││  RSFT              ││  PGDN│
 └────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└────────────────────┘└──────┘
 ┌────────┐┌────────┐┌────────┐┌────────┐┌────────────────┐        ┌────────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
-│  LCTL  ││  LGUI  ││  LALT  ││MO(_FN1)││  SPC           │        │  SPC               ││  RALT││  RCTL││  LEFT││  DOWN││  UP  ││  RGHT│
+│  CAPS  ││  LCTL  ││  LALT  ││MO(_L)  ││  SPC           │        │  SPC               ││  LGUI││TG(_R)││  LEFT││  DOWN││  UP  ││  RGHT│
 └────────┘└────────┘└────────┘└────────┘└────────────────┘        └────────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
 ```
 
-### Function
+### Raise
 ```
 ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
-│  GRV ││  F1  ││  F2  ││  F3  ││  F4  ││  F5  ││  F6  │        │  F7  ││  F8  ││  F9  ││  F10 ││  F11 ││  F12 ││  BSPC││  DEL ││  INS │
+│      ││  F1  ││  F2  ││  F3  ││  F4  ││  F5  ││  F6  │        │  F7  ││  F8  ││  F9  ││  F10 ││  F11 ││  F12 ││  BSPC││  DEL ││  INS │
 └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
 ┌──────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────────┐┌──────┐
-│          ││      ││      ││      ││      ││      │        │      ││      ││      ││      ││      ││      ││      ││          ││  PAUS│
+│          ││  F1  ││  F12 ││      ││      ││      │        │      ││  MINS││  EQL ││      ││      ││      ││      ││          ││  PAUS│
 └──────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────────┘└──────┘
 ┌────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────┐┌──────┐
-│            ││      ││      ││      ││      ││      │        │      ││      ││      ││      ││      ││      ││                ││      │
+│            ││      ││      ││      ││      ││      │        │  LEFT││  DOWN││  UP  ││  RGHT││      ││      ││                ││      │
 └────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└────────────────┘└──────┘
 ┌────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────────┐┌──────┐
-│                ││      ││      ││      ││      ││      │        │      ││      ││      ││      ││      ││                    ││      │
+│                ││      ││      ││      ││      ││      │        │      ││  PGDN││  PGUP││  HOME││  END ││                    ││      │
 └────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└────────────────────┘└──────┘
 ┌────────┐┌────────┐┌────────┐┌────────┐┌────────────────┐        ┌────────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
 │        ││        ││        ││        ││                │        │                    ││      ││      ││      ││      ││      ││      │
 └────────┘└────────┘└────────┘└────────┘└────────────────┘        └────────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
-```
\ No newline at end of file
+```
+
+### Lower
+```
+┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
+│      ││      ││      ││      ││      ││      ││      │        │      ││      ││      ││      ││      ││      ││      ││      ││      │
+└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
+┌──────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────────┐┌──────┐
+│          ││ TAB_L││ TAB_R││ TAB_C││ TAB_R││      │        │      ││ TAB_L││ TAB_R││ TAB_C││ TAB_R││      ││      ││          ││      │
+└──────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────────┘└──────┘
+┌────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────┐┌──────┐
+│            ││  LEFT││  DOWN││  UP  ││  RGHT││      │        │  LEFT││  DOWN││  UP  ││  RGHT││      ││      ││                ││      │
+└────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└──────┘└────────────────┘└──────┘
+┌────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐        ┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌────────────────────┐┌──────┐
+│                ││  PGDN││  PGUP││  HOME││  END ││      │        │      ││  PGDN││  PGUP││  HOME││  END ││                    ││      │
+└────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘        └──────┘└──────┘└──────┘└──────┘└──────┘└────────────────────┘└──────┘
+┌────────┐┌────────┐┌────────┐┌────────┐┌────────────────┐        ┌────────────────────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐┌──────┐
+│        ││        ││        ││        ││                │        │                    ││      ││      ││      ││      ││      ││      │
+└────────┘└────────┘└────────┘└────────┘└────────────────┘        └────────────────────┘└──────┘└──────┘└──────┘└──────┘└──────┘└──────┘
+```
diff --git a/keyboards/keebio/quefrency/keymaps/georgepetri/rules.mk b/keyboards/keebio/quefrency/keymaps/georgepetri/rules.mk
index e69de29bb..5bc0b7045 100644
--- a/keyboards/keebio/quefrency/keymaps/georgepetri/rules.mk
+++ b/keyboards/keebio/quefrency/keymaps/georgepetri/rules.mk
@@ -0,0 +1 @@
+EXTRAKEY_ENABLE = no
diff --git a/keyboards/keebio/quefrency/rules.mk b/keyboards/keebio/quefrency/rules.mk
index c28696c08..284a0def3 100644
--- a/keyboards/keebio/quefrency/rules.mk
+++ b/keyboards/keebio/quefrency/rules.mk
@@ -1,11 +1,15 @@
+# MCU name
 MCU = atmega32u4
-F_CPU = 16000000
-ARCH = AVR8
-F_USB = $(F_CPU)
-BOOTLOADER = caterina
 
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
 
 # Build Options
 #   change to "no" to disable the options, or define them in the Makefile in