move @kakunpc 's keebs into kakunpc/ (#15814)

Co-authored-by: kakunpc <15257475+kakunpc@users.noreply.github.com>

12 files changed, 0 insertions, 1328 deletions

diff --git a/keyboards/choc_taro/choc_taro.c b/keyboards/choc_taro/choc_taro.c
deleted file mode 100644
index 2a835b2bd8..0000000000
--- a/keyboards/choc_taro/choc_taro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * 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 "choc_taro.h"
diff --git a/keyboards/choc_taro/choc_taro.h b/keyboards/choc_taro/choc_taro.h
deleted file mode 100644
index cf07b80b5c..0000000000
--- a/keyboards/choc_taro/choc_taro.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * 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
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-/* LAYOUT_all
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│014│015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│114  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213     │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│312   │313│
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┴───┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_all( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, k313, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { k015, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_ansi
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│  014  │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│114  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213     │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│  312     │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───────┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_ansi( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, KC_NO, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_ansi_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│014│015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│114  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213     │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│  312     │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───────┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_ansi_split_bs( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, KC_NO, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { k015, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-
-/* LAYOUT_ansi_split_rshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│  014  │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│114  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213     │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│312   │313│
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┴───┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_ansi_split_rshift( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, k313, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-
-/* LAYOUT_iso
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│  014  │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐114 │
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213│    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│  312     │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───────┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_iso( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, KC_NO, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_iso_split_rshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│  014  │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐114 │
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213│    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│312   │313│
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┴───┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_iso_split_rshift( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, k313, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_iso_split_bs
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│014│015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐114 │
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213│    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│  312     │
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───────┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_iso_split_bs( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, KC_NO, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { k015, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
-
-/* LAYOUT_iso_split_bs_rshift
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │001│002│003│004│005│006│007│008│009│010│011│012│013│014│015│
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │101  │102│103│104│105│106│107│108│109│110│111│112│113│     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐114 │
- * │201   │202│203│204│205│206│207│208│209│210│211│212│213│    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤
- * │301 │301│302│303│304│305│306│307│308│309│310│311│312   │313│
- * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┴───┤
- * │▓▓▓▓│401 │402 │403     │404 │405       │406│407│408│▓▓▓▓▓▓▓│
- * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───────┘
-*/
-#define LAYOUT_iso_split_bs_rshift( \
-    k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015,  \
-    k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  \
-    k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,  \
-    k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313,  \
-    k401, k402, k403, k404, k405, k406, k407, k408 \
-) \
-{ \
-    { k009, k109, k209, k309, KC_NO } , \
-    { k010, k110, k210, k310, KC_NO } , \
-    { k011, k111, k211, k311, KC_NO } , \
-    { k012, k112, k212, k312, KC_NO } , \
-    { k013, k113, k213, k313, KC_NO } , \
-    { k014, k114, KC_NO, KC_NO, KC_NO } , \
-    { k015, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } ,  \
-    { k001, k101, k201, k301, k401 } , \
-    { k002, k102, k202, k302, k402 } , \
-    { k003, k103, k203, k303, k403 } , \
-    { k004, k104, k204, k304, k404 } , \
-    { k005, k105, k205, k305, k405 } , \
-    { k006, k106, k206, k306, k406 } , \
-    { k007, k107, k207, k307, k407 } , \
-    { k008, k108, k208, k308, k408 }  \
-}
diff --git a/keyboards/choc_taro/config.h b/keyboards/choc_taro/config.h
deleted file mode 100644
index 2852206b14..0000000000
--- a/keyboards/choc_taro/config.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-Copyright 2020 kakunpc
-
-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
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter
-   VID & PID are lisenced from microchip sublisence program, Don't use other project! */
-#define VENDOR_ID 0x04D8
-#define PRODUCT_ID 0xEB60
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kakunpc
-#define PRODUCT choc_taro
-
-/* key matrix size */
-#define MATRIX_ROWS 16
-#define MATRIX_COLS 5
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-#define UNUSED_PINS
-
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-
-// #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 3
-
-// #define RGB_DI_PIN E2
-// #ifdef RGB_DI_PIN
-//   #define RGBLED_NUM 16
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-// #endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-// #define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-/* Bootmagic Lite key configuration */
-// #define BOOTMAGIC_LITE_ROW 0
-// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/choc_taro/info.json b/keyboards/choc_taro/info.json
deleted file mode 100644
index 3a193ee05e..0000000000
--- a/keyboards/choc_taro/info.json
+++ /dev/null
@@ -1,556 +0,0 @@
-{
-    "keyboard_name": "choc_taro",
-    "url": "https://kakunpc.booth.pm/",
-    "maintainer": "kakunpc",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0}, 
-                {"x":14, "y":0}, 
-
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.5, "y":1, "w":1.5}, 
-
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2, "w":2.25}, 
-
-                {"x":0, "y":3, "w":2.25}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":1.75}, 
-                {"x":14, "y":3}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
-        },
-        "LAYOUT_ansi": {
-            "layout": [{"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0, "w":2}, 
-
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.5, "y":1, "w":1.5}, 
-
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2, "w":2.25}, 
-
-                {"x":0, "y":3, "w":2.25}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":2.75}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
-        },
-        "LAYOUT_ansi_split_bs": {
-            "layout": [{"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0}, 
-                {"x":14, "y":0}, 
-
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.5, "y":1, "w":1.5}, 
-
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2, "w":2.25}, 
-
-                {"x":0, "y":3, "w":2.25}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":2.75}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
-        },
-        "LAYOUT_ansi_split_rshift": {
-            "layout": [{"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0, "w":2}, 
-
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.5, "y":1, "w":1.5}, 
-
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2, "w":2.25}, 
-
-                {"x":0, "y":3, "w":2.25}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":1.75}, 
-                {"x":14, "y":3}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
-        },
-        "LAYOUT_iso": {
-            "layout": [
-                {"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0, "w":2}, 
-
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.75, "y":1, "w":1.25, "h":2}, 
-
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2}, 
-
-                {"x":0, "y":3, "w":2.25}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":2.75}, 
-
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
-        },
-        "LAYOUT_iso_split_rshift": {
-            "layout": [
-                {"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0, "w":2}, 
-
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.75, "y":1, "w":1.25, "h":2}, 
-
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2}, 
-
-                {"x":0, "y":3, "w":2.25}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":1.75}, 
-                {"x":14, "y":3}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
-        },
-        "LAYOUT_iso_split_bs": {
-            "layout": [
-                {"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0}, 
-                {"x":14, "y":0}, 
-
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.75, "y":1, "w":1.25, "h":2}, 
-
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2}, 
-
-                {"x":0, "y":3, "w":2.25}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":2.75}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
-        },
-        "LAYOUT_iso_split_bs_rshift": {
-            "layout": [
-                {"x":0, "y":0}, 
-                {"x":1, "y":0}, 
-                {"x":2, "y":0}, 
-                {"x":3, "y":0}, 
-                {"x":4, "y":0}, 
-                {"x":5, "y":0}, 
-                {"x":6, "y":0}, 
-                {"x":7, "y":0}, 
-                {"x":8, "y":0}, 
-                {"x":9, "y":0}, 
-                {"x":10, "y":0}, 
-                {"x":11, "y":0}, 
-                {"x":12, "y":0}, 
-                {"x":13, "y":0}, 
-                {"x":14, "y":0}, 
-
-                {"x":0, "y":1, "w":1.5}, 
-                {"x":1.5, "y":1}, 
-                {"x":2.5, "y":1}, 
-                {"x":3.5, "y":1}, 
-                {"x":4.5, "y":1}, 
-                {"x":5.5, "y":1}, 
-                {"x":6.5, "y":1}, 
-                {"x":7.5, "y":1}, 
-                {"x":8.5, "y":1}, 
-                {"x":9.5, "y":1}, 
-                {"x":10.5, "y":1}, 
-                {"x":11.5, "y":1}, 
-                {"x":12.5, "y":1}, 
-                {"x":13.75, "y":1, "w":1.25, "h":2}, 
-
-                {"x":0, "y":2, "w":1.75}, 
-                {"x":1.75, "y":2}, 
-                {"x":2.75, "y":2}, 
-                {"x":3.75, "y":2}, 
-                {"x":4.75, "y":2}, 
-                {"x":5.75, "y":2}, 
-                {"x":6.75, "y":2}, 
-                {"x":7.75, "y":2}, 
-                {"x":8.75, "y":2}, 
-                {"x":9.75, "y":2}, 
-                {"x":10.75, "y":2}, 
-                {"x":11.75, "y":2}, 
-                {"x":12.75, "y":2}, 
-
-                {"x":0, "y":3, "w":2.25}, 
-                {"x":2.25, "y":3}, 
-                {"x":3.25, "y":3}, 
-                {"x":4.25, "y":3}, 
-                {"x":5.25, "y":3}, 
-                {"x":6.25, "y":3}, 
-                {"x":7.25, "y":3}, 
-                {"x":8.25, "y":3}, 
-                {"x":9.25, "y":3}, 
-                {"x":10.25, "y":3}, 
-                {"x":11.25, "y":3}, 
-                {"x":12.25, "y":3, "w":1.75}, 
-                {"x":14, "y":3}, 
-                
-                {"x":1.25, "y":4, "w":1.25}, 
-                {"x":2.5, "y":4, "w":1.25}, 
-                {"x":3.75, "y":4, "w":2.25}, 
-                {"x":6, "y":4, "w":1.25}, 
-                {"x":7.25, "y":4, "w":2.75}, 
-                {"x":10, "y":4, "w":1.25}, 
-                {"x":11.25, "y":4, "w":1.25}, 
-                {"x":12.5, "y":4, "w":1.25}]
-        }
-    }
-}
diff --git a/keyboards/choc_taro/keymaps/default/keymap.c b/keyboards/choc_taro/keymaps/default/keymap.c
deleted file mode 100644
index 4de3c2d55a..0000000000
--- a/keyboards/choc_taro/keymaps/default/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * 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
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all( /* Base */
-        KC_ESC,  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_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_LCAP, 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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
-    )
-};
diff --git a/keyboards/choc_taro/keymaps/default/readme.md b/keyboards/choc_taro/keymaps/default/readme.md
deleted file mode 100644
index a2cb119040..0000000000
--- a/keyboards/choc_taro/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for choc_taro
diff --git a/keyboards/choc_taro/keymaps/via/keymap.c b/keyboards/choc_taro/keymaps/via/keymap.c
deleted file mode 100644
index a1d48eb5e9..0000000000
--- a/keyboards/choc_taro/keymaps/via/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * 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
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all( /* Base */
-        KC_ESC,  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_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_LCAP, 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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
-    ),
-    [1] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    ),
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______
-    )
-};
diff --git a/keyboards/choc_taro/keymaps/via/readme.md b/keyboards/choc_taro/keymaps/via/readme.md
deleted file mode 100644
index cb3af77dfa..0000000000
--- a/keyboards/choc_taro/keymaps/via/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The default keymap for choc_taro
-
-This is an experimental. Use at your own risk.   
diff --git a/keyboards/choc_taro/keymaps/via/rules.mk b/keyboards/choc_taro/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/choc_taro/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/choc_taro/matrix.c b/keyboards/choc_taro/matrix.c
deleted file mode 100644
index 02421551da..0000000000
--- a/keyboards/choc_taro/matrix.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
-
-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 <stdint.h>
-#include <stdbool.h>
-#include "matrix.h"
-#include "quantum.h"
-
-#if (MATRIX_COLS <= 8)
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-static void select_row(uint8_t row) {
-    setPinOutput(row_pins[row]);
-    writePinLow(row_pins[row]);
-}
-
-static void unselect_row(uint8_t row) {
-    setPinInputHigh(row_pins[row]);
-}
-
-static void unselect_rows(void) {
-    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
-        setPinInputHigh(row_pins[x]);
-    }
-}
-
-static void select_col(uint8_t col) {
-    setPinOutput(col_pins[col]);
-    writePinLow(col_pins[col]);
-}
-
-static void unselect_col(uint8_t col) {
-    setPinInputHigh(col_pins[col]);
-}
-
-static void unselect_cols(void) {
-    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
-    }
-}
-
-static void init_pins(void) {
-    unselect_rows();
-    unselect_cols();
-
-    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
-    }
-
-    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
-        setPinInputHigh(row_pins[x]);
-    }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-    // Store last value of row prior to reading
-    matrix_row_t last_row_value = current_matrix[current_row];
-
-    // Clear data in matrix row
-    current_matrix[current_row] = 0;
-
-    // Select row and wait for row selecton to stabilize
-    select_row(current_row);
-    matrix_io_delay();
-
-    // For each col...
-    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-
-        // Select the col pin to read (active low)
-        uint8_t pin_state = readPin(col_pins[col_index]);
-
-        // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |=  pin_state ? 0 : (ROW_SHIFTER << col_index);
-    }
-
-    // Unselect row
-    unselect_row(current_row);
-
-    return (last_row_value != current_matrix[current_row]);
-}
-
-static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
-    bool matrix_changed = false;
-
-    // Select col and wait for col selecton to stabilize
-    select_col(current_col);
-    matrix_io_delay();
-
-    // For each row...
-    for(uint8_t row_index = 0; row_index < MATRIX_ROWS / 2; row_index++) {
-        uint8_t tmp = row_index + MATRIX_ROWS / 2;
-        // Store last value of row prior to reading
-        matrix_row_t last_row_value = current_matrix[tmp];
-
-        // Check row pin state
-        if (readPin(row_pins[row_index]) == 0) {
-            // Pin LO, set col bit
-            current_matrix[tmp] |= (ROW_SHIFTER << current_col);
-        } else {
-            // Pin HI, clear col bit
-            current_matrix[tmp] &= ~(ROW_SHIFTER << current_col);
-        }
-
-        // Determine if the matrix changed state
-        if ((last_row_value != current_matrix[tmp]) && !(matrix_changed)) {
-            matrix_changed = true;
-        }
-    }
-
-    // Unselect col
-    unselect_col(current_col);
-
-    return matrix_changed;
-}
-
-void matrix_init_custom(void) {
-    // initialize key pins
-    init_pins();
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool changed = false;
-
-    // Set row, read cols
-    for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) {
-        changed |= read_cols_on_row(current_matrix, current_row);
-    }
-
-    // Set col, read rows
-    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
-        changed |= read_rows_on_col(current_matrix, current_col);
-    }
-
-    return changed;
-}
diff --git a/keyboards/choc_taro/readme.md b/keyboards/choc_taro/readme.md
deleted file mode 100644
index f0900c2fe4..0000000000
--- a/keyboards/choc_taro/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# choc_taro
-
-![choc_taro](https://i.gyazo.com/717ddeed13cd2f956ed01b71c6e96f87.jpg)
-
-gh60 compatible choc keyboard
-
-* Keyboard Maintainer: [kakunpc](https://github.com/kakunpc)
-* Hardware Supported: choc taro pcb
-* Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
-
-Make example for this keyboard (after setting up your build environment):
-
-    make choc_taro:default
-
-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/choc_taro/rules.mk b/keyboards/choc_taro/rules.mk
deleted file mode 100644
index b8b8a0bc35..0000000000
--- a/keyboards/choc_taro/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-CUSTOM_MATRIX = lite
-SRC += matrix.c