78 files changed, 121 insertions, 28 deletions

diff --git a/keyboards/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
index 2c73f10743..2c73f10743 100644
--- a/keyboards/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
diff --git a/keyboards/frosty_flake/frosty_flake.c b/keyboards/bpiphany/frosty_flake/frosty_flake.c
index 1cd4760389..1cd4760389 100644
--- a/keyboards/frosty_flake/frosty_flake.c
+++ b/keyboards/bpiphany/frosty_flake/frosty_flake.c
diff --git a/keyboards/frosty_flake/frosty_flake.h b/keyboards/bpiphany/frosty_flake/frosty_flake.h
index 953172a8b0..953172a8b0 100644
--- a/keyboards/frosty_flake/frosty_flake.h
+++ b/keyboards/bpiphany/frosty_flake/frosty_flake.h
diff --git a/keyboards/frosty_flake/keymaps/QFR_JM/config.h b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h
index b25194014b..b25194014b 100644
--- a/keyboards/frosty_flake/keymaps/QFR_JM/config.h
+++ b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/config.h
diff --git a/keyboards/frosty_flake/keymaps/QFR_JM/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
index 81899396af..81899396af 100644
--- a/keyboards/frosty_flake/keymaps/QFR_JM/keymap.c
+++ b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c
diff --git a/keyboards/frosty_flake/keymaps/QFR_JM/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/readme.md
index f12a0ffba1..f12a0ffba1 100644
--- a/keyboards/frosty_flake/keymaps/QFR_JM/readme.md
+++ b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/readme.md
diff --git a/keyboards/frosty_flake/keymaps/QFR_JM/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/rules.mk
index 0ae0b96462..0ae0b96462 100644
--- a/keyboards/frosty_flake/keymaps/QFR_JM/rules.mk
+++ b/keyboards/bpiphany/frosty_flake/keymaps/QFR_JM/rules.mk
diff --git a/keyboards/frosty_flake/keymaps/default/config.h b/keyboards/bpiphany/frosty_flake/keymaps/default/config.h
index 8893d122e0..8893d122e0 100644
--- a/keyboards/frosty_flake/keymaps/default/config.h
+++ b/keyboards/bpiphany/frosty_flake/keymaps/default/config.h
diff --git a/keyboards/frosty_flake/keymaps/default/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c
index 4dc7ed655f..4dc7ed655f 100644
--- a/keyboards/frosty_flake/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/frosty_flake/keymaps/default/keymap.c
diff --git a/keyboards/frosty_flake/keymaps/default/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/default/readme.md
index 11bf4825ff..11bf4825ff 100644
--- a/keyboards/frosty_flake/keymaps/default/readme.md
+++ b/keyboards/bpiphany/frosty_flake/keymaps/default/readme.md
diff --git a/keyboards/frosty_flake/keymaps/default/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk
index 9d3df5964f..9d3df5964f 100644
--- a/keyboards/frosty_flake/keymaps/default/rules.mk
+++ b/keyboards/bpiphany/frosty_flake/keymaps/default/rules.mk
diff --git a/keyboards/frosty_flake/keymaps/nikchi/config.h b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
index 3f78526437..3f78526437 100644
--- a/keyboards/frosty_flake/keymaps/nikchi/config.h
+++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/config.h
diff --git a/keyboards/frosty_flake/keymaps/nikchi/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
index bf7c5e5883..bf7c5e5883 100644
--- a/keyboards/frosty_flake/keymaps/nikchi/keymap.c
+++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/keymap.c
diff --git a/keyboards/frosty_flake/keymaps/nikchi/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/readme.md
index 0b01f9dbf8..0b01f9dbf8 100644
--- a/keyboards/frosty_flake/keymaps/nikchi/readme.md
+++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/readme.md
diff --git a/keyboards/frosty_flake/keymaps/nikchi/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk
index b21eb64044..b21eb64044 100644
--- a/keyboards/frosty_flake/keymaps/nikchi/rules.mk
+++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/rules.mk
diff --git a/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
index b2e5041393..b2e5041393 100644
--- a/keyboards/frosty_flake/keymaps/nikchi/variableTapDance.md
+++ b/keyboards/bpiphany/frosty_flake/keymaps/nikchi/variableTapDance.md
diff --git a/keyboards/frosty_flake/keymaps/tkl/config.h b/keyboards/bpiphany/frosty_flake/keymaps/tkl/config.h
index 8893d122e0..8893d122e0 100644
--- a/keyboards/frosty_flake/keymaps/tkl/config.h
+++ b/keyboards/bpiphany/frosty_flake/keymaps/tkl/config.h
diff --git a/keyboards/frosty_flake/keymaps/tkl/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c
index 99dc95627e..99dc95627e 100644
--- a/keyboards/frosty_flake/keymaps/tkl/keymap.c
+++ b/keyboards/bpiphany/frosty_flake/keymaps/tkl/keymap.c
diff --git a/keyboards/frosty_flake/keymaps/tkl/readme.md b/keyboards/bpiphany/frosty_flake/keymaps/tkl/readme.md
index a076a65de9..a076a65de9 100644
--- a/keyboards/frosty_flake/keymaps/tkl/readme.md
+++ b/keyboards/bpiphany/frosty_flake/keymaps/tkl/readme.md
diff --git a/keyboards/frosty_flake/keymaps/tkl/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/tkl/rules.mk
index f29756f223..f29756f223 100644
--- a/keyboards/frosty_flake/keymaps/tkl/rules.mk
+++ b/keyboards/bpiphany/frosty_flake/keymaps/tkl/rules.mk
diff --git a/keyboards/frosty_flake/matrix.c b/keyboards/bpiphany/frosty_flake/matrix.c
index cde7f63b95..480e3455ba 100644
--- a/keyboards/frosty_flake/matrix.c
+++ b/keyboards/bpiphany/frosty_flake/matrix.c
@@ -32,6 +32,24 @@ static uint8_t debouncing = DEBOUNCING_DELAY;
 static matrix_row_t matrix[MATRIX_ROWS];
 static matrix_row_t matrix_debouncing[MATRIX_ROWS];
 
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+    matrix_init_user();
+}
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
 static matrix_row_t scan_col(void) {
     return (
         (PINC&(1<<7) ? 0 : ((matrix_row_t)1<<0)) |
diff --git a/keyboards/frosty_flake/readme.md b/keyboards/bpiphany/frosty_flake/readme.md
index 822377a719..0d6a4779f6 100644
--- a/keyboards/frosty_flake/readme.md
+++ b/keyboards/bpiphany/frosty_flake/readme.md
@@ -25,22 +25,19 @@ Make example for this keyboard (after setting up your build environment):
 104 key default layout:
 
 ```
-make frosty_flake:default
+make bpiphany/frosty_flake:default
 ```
 
 To directly flash the frosty_flake after compiling use
 
 ```
-make frosty_flake:default:dfu
+make bpiphany/frosty_flake:default:dfu
 ```
 
 87 key tkl layout:
 
 ```
-make frosty_flake:tkl:dfu
+make bpiphany/frosty_flake:tkl:dfu
 ```
 
-See [build environment
-setup](https://docs.qmk.fm/build_environment_setup.html) then the
-[make instructions](https://docs.qmk.fm/make_instructions.html) for
-more information.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/frosty_flake/rules.mk b/keyboards/bpiphany/frosty_flake/rules.mk
index 94619e03d1..94619e03d1 100644
--- a/keyboards/frosty_flake/rules.mk
+++ b/keyboards/bpiphany/frosty_flake/rules.mk
diff --git a/keyboards/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index d7089734aa..d7089734aa 100644
--- a/keyboards/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
diff --git a/keyboards/kitten_paw/info.json b/keyboards/bpiphany/kitten_paw/info.json
index 7d2574710a..7d2574710a 100644
--- a/keyboards/kitten_paw/info.json
+++ b/keyboards/bpiphany/kitten_paw/info.json
diff --git a/keyboards/kitten_paw/keymaps/default/keymap.c b/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c
index 6767f04145..6767f04145 100644
--- a/keyboards/kitten_paw/keymaps/default/keymap.c
+++ b/keyboards/bpiphany/kitten_paw/keymaps/default/keymap.c<