5 files changed, 7 insertions, 10 deletions

diff --git a/keyboards/minidox/minidox.h b/keyboards/minidox/minidox.h
index 479c7aec7..6e8add206 100644
--- a/keyboards/minidox/minidox.h
+++ b/keyboards/minidox/minidox.h
@@ -1,7 +1,7 @@
 #ifndef MINIDOX_H
 #define MINIDOX_H
 
-#ifdef SUBPROJECT_rev1
+#ifdef KEYBOARD_minidox_rev1
     #include "rev1.h"
 #endif
 
diff --git a/keyboards/minidox/readme.md b/keyboards/minidox/readme.md
index c15fd244a..b44d66660 100644
--- a/keyboards/minidox/readme.md
+++ b/keyboards/minidox/readme.md
@@ -10,7 +10,7 @@ Hardware Supported: MiniDox PCB rev1 Pro Micro
 
 Make example for this keyboard (after setting up your build environment):
 
-    make minidox-rev1-default
+    make minidox/rev1: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.
 
@@ -22,8 +22,8 @@ Flashing
 -------
 Note: Most of this is copied from the Let's Split readme, because it is awesome
 
-From the `minidox` directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing.
-Example: `make rev1-default-avrdude`
+From the root directory run `make PROJECT:KEYMAP:avrdude` for automatic serial port resolution and flashing.
+Example: `make minidox/rev1:default:avrdude`
 
 Choosing which board to plug the USB cable into (choosing Master)
 --------
diff --git a/keyboards/minidox/rev1/rules.mk b/keyboards/minidox/rev1/rules.mk
index a0825b4ef..f84561674 100644
--- a/keyboards/minidox/rev1/rules.mk
+++ b/keyboards/minidox/rev1/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-        include ../../../Makefile
-endif
\ No newline at end of file
+BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/minidox/rules.mk b/keyboards/minidox/rules.mk
index 539456ae0..0f9d30310 100644
--- a/keyboards/minidox/rules.mk
+++ b/keyboards/minidox/rules.mk
@@ -72,3 +72,5 @@ USE_I2C ?= no
 SLEEP_LED_ENABLE ?= no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
+
+DEFAULT_FOLDER = minidox/rev1
\ No newline at end of file
diff --git a/keyboards/minidox/subproject.mk b/keyboards/minidox/subproject.mk
deleted file mode 100644
index 928b1edd0..000000000
--- a/keyboards/minidox/subproject.mk
+++ /dev/null
@@ -1 +0,0 @@
-SUBPROJECT_DEFAULT = rev1