diff --git a/00-build-cache-debug-x64 b/00-generate-cmake-cache-x64
old mode 100755
new mode 100644
similarity index 69%
rename from 00-build-cache-debug-x64
rename to 00-generate-cmake-cache-x64
index 14d7ec1..696f7ad
--- a/00-build-cache-debug-x64
+++ b/00-generate-cmake-cache-x64
@@ -1,5 +1,11 @@
 #!/usr/bin/env sh
 
+if [ "$BUILD_TYPE" = "" ]
+then
+  echo "No build type specified. Try Debug or Release."
+  exit
+fi
+
 cmake \
   -DCMAKE_SIZEOF_VOID_P=8 \
   -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
diff --git a/00-build-cache-debug-x64.bat b/00-generate-cmake-cache-x64.bat
similarity index 73%
rename from 00-build-cache-debug-x64.bat
rename to 00-generate-cmake-cache-x64.bat
index 5b5b4e0..934c7b3 100644
--- a/00-build-cache-debug-x64.bat
+++ b/00-generate-cmake-cache-x64.bat
@@ -1,10 +1,10 @@
 cmake^
   -DCMAKE_SIZEOF_VOID_P=8^
   "-DCMAKE_MT=%CMAKE_MT%"^
-  -DCMAKE_BUILD_TYPE=Debug^
+  -DCMAKE_BUILD_TYPE=%BUILD_TYPE%^
   -DCMAKE_MAKE_PROGRAM=ninja^
   -DCMAKE_C_COMPILER=clang-cl^
   -DCMAKE_C_FLAGS=-m64^
   -G Ninja^
   -S .^
-  -B ./build/Debug
+  -B ./build/%BUILD_TYPE%
diff --git a/01-build-executable.bat b/01-build-executable.bat
new file mode 100644
index 0000000..a044ecf
--- /dev/null
+++ b/01-build-executable.bat
@@ -0,0 +1 @@
+cmake --build "./build/%BUILD_TYPE%" -t "%EXECUTABLE%"
diff --git a/01-build-game.bat b/01-build-game.bat
deleted file mode 100644
index 5fbc708..0000000
--- a/01-build-game.bat
+++ /dev/null
@@ -1 +0,0 @@
-cmake --build build/Debug -t game
diff --git a/02-build-server.bat b/02-build-server.bat
deleted file mode 100644
index 1b678e5..0000000
--- a/02-build-server.bat
+++ /dev/null
@@ -1 +0,0 @@
-cmake --build build/Debug -t server
diff --git a/03-run-tests b/03-run-tests
deleted file mode 100644
index b8c2b5b..0000000
--- a/03-run-tests
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-if [ "$BUILD_TYPE" = "" ]
-then
-  return 1
-fi
-cmake --build "./build/$BUILD_TYPE" -t server
diff --git a/subprojects/midi-utils b/subprojects/midi-utils
index 04b34ae..dc3396c 160000
--- a/subprojects/midi-utils
+++ b/subprojects/midi-utils
@@ -1 +1 @@
-Subproject commit 04b34ae8ffd6527c0d9f87a09e96e09d0fc59f7f
+Subproject commit dc3396c806d500802cb8a8dad15d3e46a9621954