106 files changed, 58 insertions, 75 deletions

diff --git a/keyboards/bananasplit/README.md b/keyboards/bananasplit/README.md
deleted file mode 100644
index cd1e15d77..000000000
--- a/keyboards/bananasplit/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-BananaSplit60
-===
-
-A 60% PCB featuring a split spacebar.
-
-Keyboard Maintainer: QMK Community  
-Hardware Supported: BananaSplit60 PCB  
-Hardware Availability: https://thevankeyboards.com/products/gb-bananasplit-60-keyboard-kit?variant=42149104910
-
-Make example for this keyboard (after setting up your build environment):
-
-    make bananasplit:default
-
-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.
-
diff --git a/keyboards/roadkit/readme.md b/keyboards/roadkit/readme.md
deleted file mode 100644
index 691bd1f3e..000000000
--- a/keyboards/roadkit/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-roadkit
-=======
-
-A programmable macro pad.
-
-Keyboard Maintainer: QMK Community  
-Hardware Supported: Roadkit PCB  
-Hardware Availability: https://thevankeyboards.com/collections/catalog/products/road-kit-diy?variant=603645345806
-
-Make example for this keyboard (after setting up your build environment):
-
-    make roadkit:default
-
-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.
diff --git a/keyboards/thevankeyboards/bananasplit/README.md b/keyboards/thevankeyboards/bananasplit/README.md
new file mode 100644
index 000000000..41d0d407d
--- /dev/null
+++ b/keyboards/thevankeyboards/bananasplit/README.md
@@ -0,0 +1,14 @@
+# BananaSplit60
+
+A 60% PCB featuring a split spacebar.
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: BananaSplit60 PCB  
+Hardware Availability: https://thevankeyboards.com/products/gb-bananasplit-60-keyboard-kit?variant=42149104910
+
+Make example for this keyboard (after setting up your build environment):
+
+    make thevankeyboards/bananasplit: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/bananasplit/bananasplit.c b/keyboards/thevankeyboards/bananasplit/bananasplit.c
index 1aa8fb174..1aa8fb174 100644
--- a/keyboards/bananasplit/bananasplit.c
+++ b/keyboards/thevankeyboards/bananasplit/bananasplit.c
diff --git a/keyboards/bananasplit/bananasplit.h b/keyboards/thevankeyboards/bananasplit/bananasplit.h
index 8d545c1f9..8d545c1f9 100644
--- a/keyboards/bananasplit/bananasplit.h
+++ b/keyboards/thevankeyboards/bananasplit/bananasplit.h
diff --git a/keyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h
index 5649ab4aa..5649ab4aa 100644
--- a/keyboards/bananasplit/config.h
+++ b/keyboards/thevankeyboards/bananasplit/config.h
diff --git a/keyboards/bananasplit/info.json b/keyboards/thevankeyboards/bananasplit/info.json
index 6741c6cdb..6741c6cdb 100644
--- a/keyboards/bananasplit/info.json
+++ b/keyboards/thevankeyboards/bananasplit/info.json
diff --git a/keyboards/bananasplit/keymaps/0010/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/0010/config.h
index 060f5922f..060f5922f 100644
--- a/keyboards/bananasplit/keymaps/0010/config.h
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/0010/config.h
diff --git a/keyboards/bananasplit/keymaps/0010/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c
index 617812149..617812149 100644
--- a/keyboards/bananasplit/keymaps/0010/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/0010/keymap.c
diff --git a/keyboards/bananasplit/keymaps/0010/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk
index 7d09c322e..7d09c322e 100644
--- a/keyboards/bananasplit/keymaps/0010/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk
diff --git a/keyboards/bananasplit/keymaps/coloneljesus/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/config.h
index 92a67f647..92a67f647 100644
--- a/keyboards/bananasplit/keymaps/coloneljesus/config.h
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/config.h
diff --git a/keyboards/bananasplit/keymaps/coloneljesus/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
index 275bfe32a..275bfe32a 100644
--- a/keyboards/bananasplit/keymaps/coloneljesus/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/keymap.c
diff --git a/keyboards/bananasplit/keymaps/coloneljesus/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/readme.md
index b9ce5f44a..b9ce5f44a 100644
--- a/keyboards/bananasplit/keymaps/coloneljesus/readme.md
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/readme.md
diff --git a/keyboards/bananasplit/keymaps/coloneljesus/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk
index 7d09c322e..7d09c322e 100644
--- a/keyboards/bananasplit/keymaps/coloneljesus/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk
diff --git a/keyboards/bananasplit/keymaps/default/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/default/config.h
index 060f5922f..060f5922f 100644
--- a/keyboards/bananasplit/keymaps/default/config.h
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/default/config.h
diff --git a/keyboards/bananasplit/keymaps/default/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/default/keymap.c
index dcef38bca..dcef38bca 100644
--- a/keyboards/bananasplit/keymaps/default/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/default/keymap.c
diff --git a/keyboards/bananasplit/keymaps/default/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/default/readme.md
index aaf6daa08..aaf6daa08 100644
--- a/keyboards/bananasplit/keymaps/default/readme.md
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/default/readme.md
diff --git a/keyboards/bananasplit/keymaps/default/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/default/rules.mk
index 7d09c322e..7d09c322e 100644
--- a/keyboards/bananasplit/keymaps/default/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/default/rules.mk
diff --git a/keyboards/bananasplit/keymaps/hhkbanana/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/hhkbanana/keymap.c
index f2f829f93..f2f829f93 100644
--- a/keyboards/bananasplit/keymaps/hhkbanana/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/hhkbanana/keymap.c
diff --git a/keyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
index 89e275daf..89e275daf 100644
--- a/keyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/keymap.c
diff --git a/keyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
index 664a0a048..664a0a048 100644
--- a/keyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_ansi/readme.md
diff --git a/keyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
index 859944991..859944991 100644
--- a/keyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/keymap.c
diff --git a/keyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
index e135f73e3..e135f73e3 100644
--- a/keyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/jockyxu1122_iso/readme.md
diff --git a/keyboards/bananasplit/keymaps/kamon/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/config.h
index af6cf8ef1..af6cf8ef1 100644
--- a/keyboards/bananasplit/keymaps/kamon/config.h
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/config.h
diff --git a/keyboards/bananasplit/keymaps/kamon/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/keymap.c
index 34306e183..34306e183 100644
--- a/keyboards/bananasplit/keymaps/kamon/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/keymap.c
diff --git a/keyboards/bananasplit/keymaps/kamon/readme.md b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/readme.md
index a08bea519..a08bea519 100644
--- a/keyboards/bananasplit/keymaps/kamon/readme.md
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/readme.md
diff --git a/keyboards/bananasplit/keymaps/kamon/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
index 7d09c322e..7d09c322e 100644
--- a/keyboards/bananasplit/keymaps/kamon/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
diff --git a/keyboards/bananasplit/keymaps/nic/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c
index 5ed1c65e9..5ed1c65e9 100644
--- a/keyboards/bananasplit/keymaps/nic/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/nic/keymap.c
diff --git a/keyboards/bananasplit/keymaps/rask/README.md b/keyboards/thevankeyboards/bananasplit/keymaps/rask/README.md
index ec19d3935..ec19d3935 100644
--- a/keyboards/bananasplit/keymaps/rask/README.md
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/rask/README.md
diff --git a/keyboards/bananasplit/keymaps/rask/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c
index 6c7544cc8..6c7544cc8 100644
--- a/keyboards/bananasplit/keymaps/rask/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/rask/keymap.c
diff --git a/keyboards/bananasplit/keymaps/talljoe/config.h b/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/config.h
index bb2aadfa6..bb2aadfa6 100644
--- a/keyboards/bananasplit/keymaps/talljoe/config.h
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/config.h
diff --git a/keyboards/bananasplit/keymaps/talljoe/keymap.c b/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/keymap.c
index 7812add81..7812add81 100644
--- a/keyboards/bananasplit/keymaps/talljoe/keymap.c
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/keymap.c
diff --git a/keyboards/bananasplit/rules.mk b/keyboards/thevankeyboards/bananasplit/rules.mk
index 81570c493..81570c493 100644
--- a/keyboards/bananasplit/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/rules.mk
diff --git a/keyboards/tv44/config.h b/keyboards/thevankeyboards/minivan/config.h
index 0ae93c095..726768e0e 100644
--- a/keyboards/tv44/config.h
+++ b/keyboards/thevankeyboards/minivan/config.h
@@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x8844
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    Evan Sailer
-#define PRODUCT         TheVan 44
-#define DESCRIPTION     keyboard firmware for TV44
+#define PRODUCT         Minivan
+#define DESCRIPTION     keyboard firmware for Minivan
 
 /* key matrix size */
 #define MATRIX_ROWS 4
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
- 
+
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/tv44/info.json b/keyboards/thevankeyboards/minivan/info.json
index 355701fee..355701fee 100644
--- a/keyboards/tv44/info.json
+++ b/keyboards/thevankeyboards/minivan/info.json
diff --git a/keyboards/tv44/keymaps/belak/config.h b/keyboards/thevankeyboards/minivan/keymaps/belak/config.h
index 47d96a29d..47d96a29d 100644
--- a/keyboards/tv44/keymaps/belak/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/belak/config.h
diff --git a/keyboards/tv44/keymaps/belak/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
index 6c0ff1a1c..19051574a 100644
--- a/keyboards/tv44/keymaps/belak/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/belak/keymap.c
@@ -1,7 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "debug.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 // Layer names. We stick to 3 letters if possible so MO(NAME) fits in 7
 // characters and doesn't mess with the grid.
diff --git a/keyboards/tv44/keymaps/belak/readme.md b/keyboards/thevankeyboards/minivan/keymaps/belak/readme.md
index b0a505c4a..b0a505c4a 100644
--- a/keyboards/tv44/keymaps/belak/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/belak/readme.md
diff --git a/keyboards/tv44/keymaps/belak/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk
index 611241124..611241124 100644
--- a/keyboards/tv44/keymaps/belak/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk
diff --git a/keyboards/tv44/keymaps/budi/config.h b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
index 67bcf3546..67bcf3546 100644
--- a/keyboards/tv44/keymaps/budi/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
diff --git a/keyboards/tv44/keymaps/budi/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
index baa266e63..baa266e63 100644
--- a/keyboards/tv44/keymaps/budi/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/budi/keymap.c
diff --git a/keyboards/tv44/keymaps/budi/readme.md b/keyboards/thevankeyboards/minivan/keymaps/budi/readme.md
index e5de86ef8..e5de86ef8 100644
--- a/keyboards/tv44/keymaps/budi/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/budi/readme.md
diff --git a/keyboards/tv44/keymaps/core/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/core/keymap.c
index d24049696..cf1e0d3f5 100644
--- a/keyboards/tv44/keymaps/core/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/core/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 #define _QW 0
 #define _L1 1
diff --git a/keyboards/tv44/keymaps/core/readme.md b/keyboards/thevankeyboards/minivan/keymaps/core/readme.md
index 3ec503b21..3ec503b21 100644
--- a/keyboards/tv44/keymaps/core/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/core/readme.md
diff --git a/keyboards/tv44/keymaps/core/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk
index 457a3d01d..457a3d01d 100644
--- a/keyboards/tv44/keymaps/core/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk
diff --git a/keyboards/roadkit/keymaps/default/config.h b/keyboards/thevankeyboards/minivan/keymaps/default/config.h
index df06a2620..df06a2620 100644
--- a/keyboards/roadkit/keymaps/default/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/default/config.h
diff --git a/keyboards/tv44/keymaps/default/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c
index 6055cd74e..90b188b55 100644
--- a/keyboards/tv44/keymaps/default/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/default/readme.md b/keyboards/thevankeyboards/minivan/keymaps/default/readme.md
index ac84c08cf..ac84c08cf 100644
--- a/keyboards/tv44/keymaps/default/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/default/readme.md
diff --git a/keyboards/roadkit/keymaps/default/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/default/rules.mk
index f4671a9d1..f4671a9d1 100644
--- a/keyboards/roadkit/keymaps/default/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/default/rules.mk
diff --git a/keyboards/tv44/keymaps/jeebak/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
index 5503e1f9e..0ec9485c7 100644
--- a/keyboards/tv44/keymaps/jeebak/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/jeebak/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/jeebak/readme.md b/keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md
index f781d5555..f781d5555 100644
--- a/keyboards/tv44/keymaps/jeebak/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/jeebak/readme.md
diff --git a/keyboards/roadkit/keymaps/flipphone/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
index f4671a9d1..f4671a9d1 100644
--- a/keyboards/roadkit/keymaps/flipphone/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
diff --git a/keyboards/tv44/keymaps/jetpacktuxedo/config.h b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h
index 5f5872bec..5f5872bec 100644
--- a/keyboards/tv44/keymaps/jetpacktuxedo/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/config.h
diff --git a/keyboards/tv44/keymaps/jetpacktuxedo/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
index 45bedaa97..02ba68421 100644
--- a/keyboards/tv44/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/keymap.c
@@ -1,4 +1,4 @@
-#include "tv44.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/jetpacktuxedo/readme.md b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/readme.md
index fd95b56ab..fd95b56ab 100644
--- a/keyboards/tv44/keymaps/jetpacktuxedo/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/readme.md
diff --git a/keyboards/tv44/keymaps/jetpacktuxedo/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk
index ebc9f810f..ebc9f810f 100644
--- a/keyboards/tv44/keymaps/jetpacktuxedo/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/jetpacktuxedo/rules.mk
diff --git a/keyboards/tv44/keymaps/mjt/config.h b/keyboards/thevankeyboards/minivan/keymaps/mjt/config.h
index e89a3ea12..e89a3ea12 100644
--- a/keyboards/tv44/keymaps/mjt/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/config.h
diff --git a/keyboards/tv44/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
index 25f8cfc52..8f0fba11d 100644
--- a/keyboards/tv44/keymaps/mjt/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
@@ -1,8 +1,6 @@
 //Author: mike terhar
+#include QMK_KEYBOARD_H
 
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
 #ifdef BACKLIGHT_ENABLE
   #include "backlight.h"
 #endif
diff --git a/keyboards/tv44/keymaps/mjt/readme.md b/keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md
index c86985f6c..c86985f6c 100644
--- a/keyboards/tv44/keymaps/mjt/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/readme.md
diff --git a/keyboards/tv44/keymaps/mjt/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
index 41afd9a55..41afd9a55 100644
--- a/keyboards/tv44/keymaps/mjt/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
diff --git a/keyboards/tv44/keymaps/smt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
index 0e1484e82..ee117e47b 100644
--- a/keyboards/tv44/keymaps/smt/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/smt/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/smt/readme.md b/keyboards/thevankeyboards/minivan/keymaps/smt/readme.md
index 059fd1bbd..059fd1bbd 100644
--- a/keyboards/tv44/keymaps/smt/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/smt/readme.md
diff --git a/keyboards/roadkit/keymaps/mjt/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk
index f4671a9d1..f4671a9d1 100644
--- a/keyboards/roadkit/keymaps/mjt/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk
diff --git a/keyboards/tv44/keymaps/tong92/config.h b/keyboards/thevankeyboards/minivan/keymaps/tong92/config.h
index be959a823..be959a823 100644
--- a/keyboards/tv44/keymaps/tong92/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/config.h
diff --git a/keyboards/tv44/keymaps/tong92/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
index 758c3bb15..220cc8c61 100644
--- a/keyboards/tv44/keymaps/tong92/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
@@ -1,8 +1,6 @@
 //Author: tong92 <tong92power@gmail.com>
+#include QMK_KEYBOARD_H
 
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
 #ifdef BACKLIGHT_ENABLE
   #include "backlight.h"
 #endif
diff --git a/keyboards/tv44/keymaps/tong92/readme.md b/keyboards/thevankeyboards/minivan/keymaps/tong92/readme.md
index 820857256..820857256 100644
--- a/keyboards/tv44/keymaps/tong92/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/readme.md
diff --git a/keyboards/tv44/keymaps/tong92/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk
index e60e3c5c5..e60e3c5c5 100644
--- a/keyboards/tv44/keymaps/tong92/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk
diff --git a/keyboards/roadkit/keymaps/flipphone/config.h b/keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h
index df06a2620..df06a2620 100644
--- a/keyboards/roadkit/keymaps/flipphone/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/xyverz/config.h
diff --git a/keyboards/tv44/keymaps/xyverz/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
index bbdb9093e..ec0d27007 100644
--- a/keyboards/tv44/keymaps/xyverz/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/xyverz/keymap.c
@@ -1,6 +1,4 @@
-#include "tv44.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
diff --git a/keyboards/tv44/keymaps/xyverz/readme.md b/keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md
index ac84c08cf..ac84c08cf 100644
--- a/keyboards/tv44/keymaps/xyverz/readme.md
+++ b/keyboards/thevankeyboards/minivan/keymaps/xyverz/readme.md
diff --git a/keyboards/roadkit/keymaps/singles/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
index f4671a9d1..f4671a9d1 100644
--- a/keyboards/roadkit/keymaps/singles/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
diff --git a/keyboards/tv44/tv44.c b/keyboards/thevankeyboards/minivan/minivan.c
index 6dc0efd28..b260195ce 100644
--- a/keyboards/tv44/tv44.c
+++ b/keyboards/thevankeyboards/minivan/minivan.c
@@ -1,4 +1,4 @@
-#include "tv44.h"
+#include "minivan.h"
 
 void matrix_init_kb(void) {
         // put your keyboard start-up code here
diff --git a/keyboards/tv44/tv44.h b/keyboards/thevankeyboards/minivan/minivan.h
index aea6179d9..27a358365 100644
--- a/keyboards/tv44/tv44.h
+++ b/keyboards/thevankeyboards/minivan/minivan.h
@@ -1,5 +1,5 @@
-#ifndef TV44_H
-#define TV44_H
+#ifndef MINIVAN_H
+#define MINIVAN_H
 
 #include "quantum.h"
 
diff --git a/keyboards/thevankeyboards/minivan/readme.md b/keyboards/thevankeyboards/minivan/readme.md
new file mode 100644
index 000000000..03a868a16
--- /dev/null
+++ b/keyboards/thevankeyboards/minivan/readme.md
@@ -0,0 +1,13 @@
+# Minivan (tv44)
+
+A compact 44% keyboard.
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Minivan PCB  
+Hardware Availability: https://thevankeyboards.com/collections/catalog/products/minivan-diy?variant=609138376718
+
+Make example for this keyboard (after setting up your build environment):
+
+    make thevankeyboards/minivan: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/tv44/rules.mk b/keyboards/thevankeyboards/minivan/rules.mk
index 786c9dc3e..786c9dc3e 100644
--- a/keyboards/tv44/rules.mk
+++ b/keyboards/thevankeyboards/minivan/rules.mk
diff --git a/keyboards/thevankeyboards/readme.md b/keyboards/thevankeyboards/readme.md
new file mode 100644
index 000000000..5dfd74e57
--- /dev/null
+++ b/keyboards/thevankeyboards/readme.md
@@ -0,0 +1,3 @@
+# TheVan Keyboards
+
+[TheVan Keyboards](https://thevankeyboards.com/) is based in the United States and is responsible for boards such as the minivan. 
\ No newline at end of file
diff --git a/keyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h
index 9596f7f3b..9596f7f3b 100644
--- a/keyboards/roadkit/config.h
+++ b/keyboards/thevankeyboards/roadkit/config.h
diff --git a/keyboards/roadkit/info.json b/keyboards/thevankeyboards/roadkit/info.json
index 839ac73fb..839ac73fb 100644
--- a/keyboards/roadkit/info.json
+++ b/keyboards/thevankeyboards/roadkit/info.json
diff --git a/keyboards/roadkit/keymaps/mjt/config.h b/keyboards/thevankeyboards/roadkit/keymaps/default/config.h
index df06a2620..df06a2620 100644
--- a/keyboards/roadkit/keymaps/mjt/config.h
+++ b/keyboards/thevankeyboards/roadkit/keymaps/default/config.h
diff --git a/keyboards/roadkit/keymaps/default/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c
index 4ec0f6cfd..4ec0f6cfd 100644
--- a/keyboards/roadkit/keymaps/default/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c
diff --git a/keyboards/roadkit/keymaps/default/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/default/readme.md
index 5984a71d1..5984a71d1 100644
--- a/keyboards/roadkit/keymaps/default/readme.md
+++ b/keyboards/thevankeyboards/roadkit/keymaps/default/readme.md
diff --git a/keyboards/tv44/keymaps/default/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/default/rules.mk
index f4671a9d1..f4671a9d1 100644
--- a/keyboards/tv44/keymaps/default/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/default/rules.mk
diff --git a/keyboards/roadkit/keymaps/singles/config.h b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/config.h
index df06a2620..df06a2620 100644
--- a/keyboards/roadkit/keymaps/singles/config.h
+++ b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/config.h
diff --git a/keyboards/roadkit/keymaps/flipphone/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
index fed9d0270..fed9d0270 100644
--- a/keyboards/roadkit/keymaps/flipphone/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/keymap.c
diff --git a/keyboards/roadkit/keymaps/flipphone/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/readme.md
index ad630be19..ad630be19 100644
--- a/keyboards/roadkit/keymaps/flipphone/readme.md
+++ b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/readme.md
diff --git a/keyboards/tv44/keymaps/jeebak/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk
index f4671a9d1..f4671a9d1 100644
--- a/keyboards/tv44/keymaps/jeebak/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk
diff --git a/keyboards/roadkit/keymaps/khord/config.h b/keyboards/thevankeyboards/roadkit/keymaps/khord/config.h
index da6ed7189..da6ed7189 100644
--- a/keyboards/roadkit/keymaps/khord/config.h
+++ b/keyboards/thevankeyboards/roadkit/keymaps/khord/config.h
diff --git a/keyboards/roadkit/keymaps/khord/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
index 9111f4f89..9111f4f89 100644
--- a/keyboards/roadkit/keymaps/khord/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/khord/keymap.c
diff --git a/keyboards/roadkit/keymaps/khord/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
index 9f3c958bd..9f3c958bd 100644
--- a/keyboards/roadkit/keymaps/khord/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
diff --git a/keyboards/tv44/keymaps/default/config.h b/keyboards/thevankeyboards/roadkit/keymaps/mjt/config.h
index df06a2620..df06a2620 100644
--- a/keyboards/tv44/keymaps/default/config.h
+++ b/keyboards/thevankeyboards/roadkit/keymaps/mjt/config.h
diff --git a/keyboards/roadkit/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
index a1af5b1f2..a1af5b1f2 100644
--- a/keyboards/roadkit/keymaps/mjt/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/mjt/keymap.c
diff --git a/keyboards/roadkit/keymaps/mjt/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/mjt/readme.md
index 80c0e5240..80c0e5240 100644
--- a/keyboards/roadkit/keymaps/mjt/readme.md
+++ b/keyboards/thevankeyboards/roadkit/keymaps/mjt/readme.md
diff --git a/keyboards/tv44/keymaps/smt/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk
index f4671a9d1..f4671a9d1 100644
--- a/keyboards/tv44/keymaps/smt/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk
diff --git a/keyboards/tv44/keymaps/xyverz/config.h b/keyboards/thevankeyboards/roadkit/keymaps/singles/config.h
index df06a2620..df06a2620 100644
--- a/keyboards/tv44/keymaps/xyverz/config.h
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singles/config.h
diff --git a/keyboards/roadkit/keymaps/singles/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
index 4c246f513..4c246f513 100644
--- a/keyboards/roadkit/keymaps/singles/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singles/keymap.c
diff --git a/keyboards/roadkit/keymaps/singles/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/singles/readme.md
index 48ea4a8b3..48ea4a8b3 100644
--- a/keyboards/roadkit/keymaps/singles/readme.md
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singles/readme.md
diff --git a/keyboards/tv44/keymaps/xyverz/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
index f4671a9d1..f4671a9d1 100644
--- a/keyboards/tv44/keymaps/xyverz/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
diff --git a/keyboards/roadkit/keymaps/singlesBrent/config.h b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/config.h
index 57468e122..57468e122 100644
--- a/keyboards/roadkit/keymaps/singlesBrent/config.h
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/config.h
diff --git a/keyboards/roadkit/keymaps/singlesBrent/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/keymap.c
index b4da80e28..b4da80e28 100644
--- a/keyboards/roadkit/keymaps/singlesBrent/keymap.c
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/keymap.c
diff --git a/keyboards/roadkit/keymaps/singlesBrent/readme.md b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/readme.md
index 48ea4a8b3..48ea4a8b3 100644
--- a/keyboards/roadkit/keymaps/singlesBrent/readme.md
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/readme.md
diff --git a/keyboards/roadkit/keymaps/singlesBrent/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
index b61d6cca2..b61d6cca2 100644
--- a/keyboards/roadkit/keymaps/singlesBrent/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
diff --git a/keyboards/thevankeyboards/roadkit/readme.md b/keyboards/thevankeyboards/roadkit/readme.md
new file mode 100644
index 000000000..e4af2dcc0
--- /dev/null
+++ b/keyboards/thevankeyboards/roadkit/readme.md
@@ -0,0 +1,13 @@
+# Roadkit
+
+A programmable macro pad.
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Roadkit PCB  
+Hardware Availability: https://thevankeyboards.com/collections/catalog/products/road-kit-diy?variant=603645345806
+
+Make example for this keyboard (after setting up your build environment):
+
+    make thevankeyboards/roadkit: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/roadkit/roadkit.c b/keyboards/thevankeyboards/roadkit/roadkit.c
index 26e0c51ec..26e0c51ec 100644
--- a/keyboards/roadkit/roadkit.c
+++ b/keyboards/thevankeyboards/roadkit/roadkit.c
diff --git a/keyboards/roadkit/roadkit.h b/keyboards/thevankeyboards/roadkit/roadkit.h
index 62cfabc5e..62cfabc5e 100644
--- a/keyboards/roadkit/roadkit.h
+++ b/keyboards/thevankeyboards/roadkit/roadkit.h
diff --git a/keyboards/roadkit/rules.mk b/keyboards/thevankeyboards/roadkit/rules.mk
index d15a5541b..d15a5541b 100644
--- a/keyboards/roadkit/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/rules.mk
diff --git a/keyboards/tv44/readme.md b/keyboards/tv44/readme.md
deleted file mode 100644
index 28185f455..000000000
--- a/keyboards/tv44/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-The Van 44
-==========
-
-A compact 44% keyboard.
-
-Keyboard Maintainer: QMK Community  
-Hardware Supported: The Van PCB  
-Hardware Availability: https://thevankeyboards.com/collections/catalog/products/minivan-diy?variant=609138376718
-
-Make example for this keyboard (after setting up your build environment):
-
-    make tv44:default
-
-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.