73 files changed, 115 insertions, 80 deletions

diff --git a/keyboards/nckiibs/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index 14b54f43a6..6c40d46bff 100644
--- a/keyboards/nckiibs/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/config.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID 0x9906
 #define PRODUCT_ID 0x0000
 #define DEVICE_VER 0x0001
-#define MANUFACTURER nckiibs
+#define MANUFACTURER delikeeb
 #define PRODUCT Flatbread60
 
 /* key matrix size */
diff --git a/keyboards/nckiibs/flatbread60/flatbread60.c b/keyboards/delikeeb/flatbread60/flatbread60.c
index 0cbc265530..0cbc265530 100644
--- a/keyboards/nckiibs/flatbread60/flatbread60.c
+++ b/keyboards/delikeeb/flatbread60/flatbread60.c
diff --git a/keyboards/nckiibs/flatbread60/flatbread60.h b/keyboards/delikeeb/flatbread60/flatbread60.h
index 3fb8d7a6f1..3fb8d7a6f1 100644
--- a/keyboards/nckiibs/flatbread60/flatbread60.h
+++ b/keyboards/delikeeb/flatbread60/flatbread60.h
diff --git a/keyboards/nckiibs/flatbread60/info.json b/keyboards/delikeeb/flatbread60/info.json
index ed621e8175..ed621e8175 100644
--- a/keyboards/nckiibs/flatbread60/info.json
+++ b/keyboards/delikeeb/flatbread60/info.json
diff --git a/keyboards/nckiibs/flatbread60/keymaps/default/keymap.c b/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c
index ed3ed26037..ed3ed26037 100644
--- a/keyboards/nckiibs/flatbread60/keymaps/default/keymap.c
+++ b/keyboards/delikeeb/flatbread60/keymaps/default/keymap.c
diff --git a/keyboards/nckiibs/flatbread60/keymaps/default/readme.md b/keyboards/delikeeb/flatbread60/keymaps/default/readme.md
index 571cfbcd68..571cfbcd68 100644
--- a/keyboards/nckiibs/flatbread60/keymaps/default/readme.md
+++ b/keyboards/delikeeb/flatbread60/keymaps/default/readme.md
diff --git a/keyboards/nckiibs/flatbread60/keymaps/via/keymap.c b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c
index cfba3e11c0..cfba3e11c0 100644
--- a/keyboards/nckiibs/flatbread60/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/flatbread60/keymaps/via/keymap.c
diff --git a/keyboards/nckiibs/flatbread60/keymaps/via/rules.mk b/keyboards/delikeeb/flatbread60/keymaps/via/rules.mk
index bde15290ba..bde15290ba 100644
--- a/keyboards/nckiibs/flatbread60/keymaps/via/rules.mk
+++ b/keyboards/delikeeb/flatbread60/keymaps/via/rules.mk
diff --git a/keyboards/nckiibs/flatbread60/readme.md b/keyboards/delikeeb/flatbread60/readme.md
index fa932143b4..6f187833a6 100644
--- a/keyboards/nckiibs/flatbread60/readme.md
+++ b/keyboards/delikeeb/flatbread60/readme.md
@@ -10,10 +10,10 @@ This is a custom PCB made by a hobbiest, and it has an ortholinear 60 key layout
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nckiibs/flatbread60:default
+    make delikeeb/flatbread60:default
 
 Flashing example for this keyboard:
     
-    make nckiibs/flatbread60:default:flash
+    make delikeeb/flatbread60:default:flash
 
 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/nckiibs/flatbread60/rules.mk b/keyboards/delikeeb/flatbread60/rules.mk
index 4012c6ac3e..4012c6ac3e 100644
--- a/keyboards/nckiibs/flatbread60/rules.mk
+++ b/keyboards/delikeeb/flatbread60/rules.mk
diff --git a/keyboards/nckiibs/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index ef1aec49ef..ef1aec49ef 100644
--- a/keyboards/nckiibs/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/config.h
diff --git a/keyboards/nckiibs/vaguettelite/info.json b/keyboards/delikeeb/vaguettelite/info.json
index 0f3d6049a2..0f3d6049a2 100644
--- a/keyboards/nckiibs/vaguettelite/info.json
+++ b/keyboards/delikeeb/vaguettelite/info.json
diff --git a/keyboards/nckiibs/vaguettelite/keymaps/default/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c
index 90778e51ff..8593526aa3 100644
--- a/keyboards/nckiibs/vaguettelite/keymaps/default/keymap.c
+++ b/keyboards/delikeeb/vaguettelite/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
-    BASE,
+    BASE = SAFE_RANGE,
     LOWER,
     RAISE,
 };
@@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *----------------------------------------------------------------------------------------------------------
      * |   Esc      |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Enter |  N/A |  '  |
      *----------------------------------------------------------------------------------------------------------
-     * |  N/A  |  Shift |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  Shift   | DEL |
+     * |  N/A  |  Shift |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  Shift   | Del |
      *----------------------------------------------------------------------------------------------------------
      * | Ctrl |  GUI |  Alt  | Lower |  Space  |  Space  |  Space  | Raise |  Alt | Left | Down |  Up  | Right |
      *----------------------------------------------------------------------------------------------------------
@@ -56,9 +56,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LOWER] = LAYOUT_all(
     _______,                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_F12 ,    _______,
-    KC_BSPC,                KC_EQL ,    KC_7   ,    KC_8   ,    KC_9   ,    KC_SLSH,    KC_CIRC,    KC_LBRC,    KC_RBRC,    KC_AT  ,    KC_EXLM,        KC_BSLS,            _______,    _______,
-    KC_ENT ,                KC_0   ,    KC_4   ,    KC_5   ,    KC_6   ,    KC_MINS,    KC_UNDS,    KC_LPRN,    KC_RPRN,    KC_HASH,    KC_DQUO ,       _______,            _______,    _______,
-    KC_DLR ,    KC_DLR ,    KC_PAST,    KC_1   ,    KC_2   ,    KC_3   ,    KC_PPLS,    KC_PIPE,    KC_LCBR,    KC_RCBR,    KC_PERC,    KC_AMPR,                _______,                _______,
+    KC_BSPC,                KC_SLSH,    KC_7   ,    KC_8   ,    KC_9   ,    KC_PPLS,    KC_CIRC,    KC_LBRC,    KC_RBRC,    KC_AT  ,    KC_EXLM,        KC_BSLS,            _______,    _______,
+    KC_EQL ,                KC_0   ,    KC_4   ,    KC_5   ,    KC_6   ,    KC_MINS,    KC_PIPE,    KC_LPRN,    KC_RPRN,    KC_HASH,    KC_DQUO,        _______,            _______,    _______,
+    KC_ENT ,    _______,    KC_PAST,    KC_1   ,    KC_2   ,    KC_3   ,    KC_UNDS,    KC_DLR ,    KC_LCBR,    KC_RCBR,    KC_AMPR,    KC_PERC,                _______,                _______,
     _______,    _______,    _______,    _______,    _______,            _______,        _______,                _______,    _______,                _______,    _______,    _______,    _______
     ),
 
diff --git a/keyboards/nckiibs/vaguettelite/keymaps/default/readme.md b/keyboards/delikeeb/vaguettelite/keymaps/default/readme.md
index 1dc3967344..1dc3967344 100644
--- a/keyboards/nckiibs/vaguettelite/keymaps/default/readme.md
+++ b/keyboards/delikeeb/vaguettelite/keymaps/default/readme.md
diff --git a/keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/keymap.c
index ea95ce7be5..a1af844bb3 100644
--- a/keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/keymap.c
+++ b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/keymap.c
@@ -25,7 +25,7 @@ enum layer_names {
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
-    BASE,
+    BASE = SAFE_RANGE,
     LOWER,
     RAISE,
 };
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* BASE
      * ---------------------------------------------------------------------------------------------------------
-     * |  `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -  |   =   | BSpc | Mute |
+     * |  `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -  |      BSP     | Mute |
      * ---------------------------------------------------------------------------------------------------------
      * | Tab     |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |    \    |   [  |  ]   |
      *----------------------------------------------------------------------------------------------------------
diff --git a/keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/readme.md b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/readme.md
index fc537215ee..fc537215ee 100644
--- a/keyboards/nckiibs/vaguettelite/keymaps/default_625u_universal/readme.md
+++ b/keyboards/delikeeb/vaguettelite/keymaps/default_625u_universal/readme.md
diff --git a/keyboards/nckiibs/vaguettelite/keymaps/noclew/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
index b82a893cd0..d8f470288a 100644
--- a/keyboards/nckiibs/vaguettelite/keymaps/noclew/keymap.c
+++ b/keyboards/delikeeb/vaguettelite/keymaps/noclew/keymap.c
@@ -27,7 +27,7 @@ enum layer_names {
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
-    BASE,
+    BASE = SAFE_RANGE,
     LOWER,
     RAISE,
     MAC,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
 
     [_BASE] = LAYOUT_all(
-    KC_GRV ,                KC_1   ,    KC_2   ,    KC_3   ,    KC_4   ,    KC_5   ,    KC_6   ,    KC_7   ,    KC_8   ,    KC_9   ,    KC_0   ,    KC_MINS,    KC_MINS,    KC_BSPC,    KC_AUDIO_MUTE,
+    KC_GRV ,                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_AUDIO_MUTE,
     KC_TAB ,                KC_Q   ,    KC_W   ,    KC_E   ,    KC_R   ,    KC_T   ,    KC_Y   ,    KC_U   ,    KC_I   ,    KC_O   ,    KC_P   ,        KC_BSLS,            KC_LBRC,    KC_RBRC,
     KC_ESC ,                KC_A   ,    KC_S   ,    KC_D   ,    KC_F   ,    KC_G   ,    KC_H   ,    KC_J   ,    KC_K   ,    KC_L   ,    KC_SCLN,        KC_ENT ,            KC_NO,      KC_QUOT,
     KC_NO  ,    KC_LSFT,    KC_Z   ,    KC_X   ,    KC_C   ,    KC_V   ,    KC_B   ,    KC_N   ,    KC_M   ,    KC_COMM,    KC_DOT ,    KC_SLSH,            RSFT_T(KC_QUOT),            KC_DEL,
@@ -76,9 +76,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LOWER] = LAYOUT_all(
     _______,                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_F12 ,    _______,
-    KC_BSPC,                KC_EQL ,    KC_7   ,    KC_8   ,    KC_9   ,    KC_SLSH,    KC_CIRC,    KC_LBRC,    KC_RBRC,    KC_AT  ,    KC_EXLM,        KC_BSLS,            _______,    _______,
-    KC_ENT ,                KC_0   ,    KC_4   ,    KC_5   ,    KC_6   ,    KC_MINS,    KC_UNDS,    KC_LPRN,    KC_RPRN,    KC_HASH,    KC_DQUO ,       _______,            _______,    _______,
-    KC_DLR ,    KC_DLR ,    KC_PAST,    KC_1   ,    KC_2   ,    KC_3   ,    KC_PPLS,    KC_PIPE,    KC_LCBR,    KC_RCBR,    KC_PERC,    KC_AMPR,                _______,                _______,
+    KC_BSPC,                KC_SLSH,    KC_7   ,    KC_8   ,    KC_9   ,    KC_PPLS,    KC_CIRC,    KC_LBRC,    KC_RBRC,    KC_AT  ,    KC_EXLM,        KC_BSLS,            _______,    _______,
+    KC_EQL ,                KC_0   ,    KC_4   ,    KC_5   ,    KC_6   ,    KC_MINS,    KC_PIPE,    KC_LPRN,    KC_RPRN,    KC_HASH,    KC_DQUO,        _______,            _______,    _______,
+    KC_ENT ,    _______,    KC_PAST,    KC_1   ,    KC_2   ,    KC_3   ,    KC_UNDS,    KC_DLR ,    KC_LCBR,    KC_RCBR,    KC_AMPR,    KC_PERC,                _______,                _______,
     _______,    _______,    _______,    _______,    _______,            _______,        _______,                _______,    _______,                _______,    _______,    _______,    _______
     ),
 
diff --git a/keyboards/nckiibs/vaguettelite/keymaps/noclew/readme.md b/keyboards/delikeeb/vaguettelite/keymaps/noclew/readme.md
index bc2bbecb7c..bc2bbecb7c 100644
--- a/keyboards/nckiibs/vaguettelite/keymaps/noclew/readme.md
+++ b/keyboards/delikeeb/vaguettelite/keymaps/noclew/readme.md
diff --git a/keyboards/nckiibs/vaguettelite/keymaps/via/keymap.c b/keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c
index 4a98fc80ae..2993728ea0 100644
--- a/keyboards/nckiibs/vaguettelite/keymaps/via/keymap.c
+++ b/keyboards/delikeeb/vaguettelite/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum layer_names {
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
-    BASE,
+    BASE = SAFE_RANGE,
     LOWER,
     RAISE,
 };
@@ -35,31 +35,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* BASE
      * ---------------------------------------------------------------------------------------------------------
-     * |  `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | BSpc |  Del |  Del | Mute |
+     * |  `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  -  |   =  |  BSpc | Mute |
      * ---------------------------------------------------------------------------------------------------------
      * | Tab     |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |    \    |   [  |  ]   |
      *----------------------------------------------------------------------------------------------------------
      * |   Esc      |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Enter |  N/A |  '  |
      *----------------------------------------------------------------------------------------------------------
-     * |  N/A  |  Shift |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  Shift   |  /  |
+     * |  N/A  |  Shift |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |