3 files changed, 4 insertions, 49 deletions
diff --git a/quantum/template/Makefile b/quantum/template/Makefile
index f101eb7a6..8772b0920 100644
--- a/quantum/template/Makefile
+++ b/quantum/template/Makefile
@@ -38,28 +38,6 @@
 # To rebuild project do "make clean" then "make all".
 #----------------------------------------------------------------------------
 
-# Target file name (without extension).
-TARGET = %KEYBOARD%
-
-
-# Directory common source filess exist
-TOP_DIR = ../..
-TMK_DIR = ../../tmk_core
-
-# Directory keyboard dependent files exist
-TARGET_DIR = .
-
-# # project specific files
-SRC = %KEYBOARD%.c
-
-ifdef KEYMAP
-    SRC := keymaps/$(KEYMAP).c $(SRC)
-else
-    SRC := keymaps/default.c $(SRC)
-endif
-
-CONFIG_H = config.h
-
 # MCU name
 #MCU = at90usb1287
 MCU = atmega32u4
@@ -113,12 +91,11 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
 COMMAND_ENABLE = yes        # Commands for debug and configuration
-KEYBOARD_LOCK_ENABLE = yes  # Allow locking of keyboard via magic key
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
@@ -129,30 +106,8 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 
-
-ifdef KEYMAP
-
-ifeq ("$(wildcard keymaps/$(KEYMAP).c)","")
-ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","")
-    include keymaps/$(KEYMAP)/makefile.mk
-endif 
-endif
-
-else
-
-ifneq ("$(wildcard keymaps/default/makefile.mk)","")
-    include keymaps/default/makefile.mk
+ifndef QUANTUM_DIR
+	include ../../Makefile
 endif
 
-endif
-
-# Optimize size but this may cause error "relocation truncated to fit"
-#EXTRALDFLAGS = -Wl,--relax
-
-# Search Path
-VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
-VPATH += $(TMK_DIR)
-
-include $(TOP_DIR)/quantum/quantum.mk
 
diff --git a/quantum/template/README.md b/quantum/template/README.md
index 39f9f59d1..baaeef473 100644
--- a/quantum/template/README.md
+++ b/quantum/template/README.md
@@ -3,7 +3,7 @@
 
 ## Quantum MK Firmware
 
-For the full Quantum feature list, see [the parent README.md](/README.md).
+For the full Quantum feature list, see [the parent README.md](/doc/README.md).
 
 ## Building
 
diff --git a/quantum/template/keymaps/default.c b/quantum/template/keymaps/default/keymap.c
index 4121fd860..4121fd860 100644
--- a/quantum/template/keymaps/default.c
+++ b/quantum/template/keymaps/default/keymap.c