4 files changed, 4 insertions, 8 deletions

diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h
index 66713731f..94e913ebd 100644
--- a/keyboards/kinesis/kinesis.h
+++ b/keyboards/kinesis/kinesis.h
@@ -1,10 +1,10 @@
 #ifndef KINESIS_H
 #define KINESIS_H
 
-#ifdef SUBPROJECT_alvicstep
+#ifdef KEYBOARD_kinesis_alvicstep
         #include "alvicstep.h"
 #endif
-#ifdef SUBPROJECT_stapelberg
+#ifdef KEYBOARD_kinesis_stapelberg
         #include "stapelberg.h"
 #endif
 
diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk
index a7ff8da8b..c8646449b 100644
--- a/keyboards/kinesis/rules.mk
+++ b/keyboards/kinesis/rules.mk
@@ -71,3 +71,5 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no # Audio output should be port E6, current quantum library hardcodes C6, which we use for programming
 CUSTOM_MATRIX=yes # need to do our own thing with the matrix
+
+DEFAULT_FOLDER = kinesis/alvicstep
\ No newline at end of file
diff --git a/keyboards/kinesis/stapelberg/rules.mk b/keyboards/kinesis/stapelberg/rules.mk
index fb421a34f..3f2ff2d6c 100644
--- a/keyboards/kinesis/stapelberg/rules.mk
+++ b/keyboards/kinesis/stapelberg/rules.mk
@@ -1,9 +1,4 @@
-ifndef QUANTUM_DIR
-        include ../../../Makefile
-endif
 
-# just silently stop, since we need to upload with teensy uploader
-upload: build
 
 
 
diff --git a/keyboards/kinesis/subproject.mk b/keyboards/kinesis/subproject.mk
deleted file mode 100644
index 63ee4cafb..000000000
--- a/keyboards/kinesis/subproject.mk
+++ /dev/null
@@ -1 +0,0 @@
-SUBPROJECT_DEFAULT = alvicstep