diff --git a/Makefile.conf b/Makefile.conf
deleted file mode 100644
index 52733ff..0000000
--- a/Makefile.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
--include $(HERE)build.conf
-
-# Project Name
-TARGET?=blink
-
-# Configure for debugging
-# common configurations:
-# use DEBUG = 1 and OPT = -Og for debugging
-# or DEBUG = 0 and OPT = -O3 for performance
-DEBUG?=0
-OPT?=-O3
-
-# (optional) Includes FatFS source files within project.
-#USE_FATFS = 1
-
-# Relative to dir 'src'
-LIBDAISY_DIR?=../../heck_libDaisy
-DAISYSP_DIR?=../../heck_DaisySP
-
-CXXFLAGS+=-Wall -Wno-unused -Wno-reorder-ctor -Wno-switch
-
-ifneq (,$(findstring g++,$(CXX)))
-    CXXFLAGS+=-fdiagnostics-color=always
-else ifneq (,$(findstring clang,$(CXX)))
-    CXXFLAGS+=-fcolor-diagnostics
-endif
diff --git a/src/Makefile b/src/Makefile
index e527aa0..f251f80 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,19 +1,20 @@
-include ../Makefile.conf
+HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
+-include $(HERE)../build.conf
 
-ALL_SRC=$(wildcard *.cc)
-TARGET_SRC=main_$(TARGET).cc
-MODULES_SRC=$(filter-out main_%,$(ALL_SRC))
-CXX_SRC=$(MODULES_SRC) $(TARGET_SRC)
+TARGET ?= main_blink
+DEBUG ?= 0
+LIBDAISY_DIR ?= ../../heck_libDaisy
+DAISYSP_DIR ?= ../../heck_DaisySP
 
-$(info CXXFLAGS: $(CXXFLAGS))
-$(info SOURCES: $(ALL_SRC))
-$(info MODULES: $(MODULES_SRC))
-$(info TARGET_SRC: $(TARGET_SRC))
-$(info CXX_SRC: $(CXX_SRC))
+CXX_STANDARD ?= -std=c++17
+CXXFLAGS += -Wall -Wno-unused -Wno-reorder-ctor -Wno-switch
+CXXFLAGS += -fdiagnostics-color=always
 
-# libDaisy Makefile variables
-CPPFLAGS=$(CXXFLAGS)
-SYSTEM_FILES_DIR=$(LIBDAISY_DIR)/core
-CPP_SOURCES=$(CXX_SRC)
+ALL_SRC = $(wildcard *.cc)
+TARGET_SRC = $(TARGET).cc
+MODULES_SRC = $(filter-out main_%,$(ALL_SRC))
+CXX_SRC = $(MODULES_SRC) $(TARGET_SRC)
 
-include $(SYSTEM_FILES_DIR)/Makefile
+CXX_SOURCES = $(CXX_SRC)
+
+include $(LIBDAISY_DIR)/core/Makefile