diff --git a/skel/scripts/build.c++.app/build.monolithic b/skel/scripts/build.c++.app/build.monolithic
index 602682f..c311844 100644
--- a/skel/scripts/build.c++.app/build.monolithic
+++ b/skel/scripts/build.c++.app/build.monolithic
@@ -2,11 +2,11 @@
 #  @NAME@_MONOLITHIC
 #
 
+SRC="obj/@NAME@.cpp"
+MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
+
 if [ -z "${@NAME@_MONOLITHIC}" ]
 then
-    SRC="obj/@NAME@.cpp"
-
-    MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
     MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.cpp)"
     make_monolithic ${SRC} C || return 1
 
diff --git a/skel/scripts/build.c++.lib/build.monolithic b/skel/scripts/build.c++.lib/build.monolithic
index d956417..9337e77 100644
--- a/skel/scripts/build.c++.lib/build.monolithic
+++ b/skel/scripts/build.c++.lib/build.monolithic
@@ -1,12 +1,13 @@
 # These are external variables, and shouldn't clash with anything else
 #  @CNAME@_MONOLITHIC
 
+SRC="obj/@NAME@.cpp"
+HDR="obj/@HEADER_NAME@"
+
+MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
+
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    SRC="obj/@NAME@.cpp"
-    HDR="obj/@HEADER_NAME@"
-
-    MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
     MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
     make_monolithic ${HDR} C || return 1
 
diff --git a/skel/scripts/build.c.app/build.monolithic b/skel/scripts/build.c.app/build.monolithic
index c0255d7..cb1160c 100644
--- a/skel/scripts/build.c.app/build.monolithic
+++ b/skel/scripts/build.c.app/build.monolithic
@@ -2,11 +2,11 @@
 #  @NAME@_MONOLITHIC
 #
 
+SRC="obj/@NAME@.c"
+MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
+
 if [ -z "${@NAME@_MONOLITHIC}" ]
 then
-    SRC="obj/@NAME@.c"
-
-    MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
     MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)"
     make_monolithic ${SRC} C || return 1
 
diff --git a/skel/scripts/build.c.lib/build.monolithic b/skel/scripts/build.c.lib/build.monolithic
index 895a44c..680b456 100644
--- a/skel/scripts/build.c.lib/build.monolithic
+++ b/skel/scripts/build.c.lib/build.monolithic
@@ -1,12 +1,13 @@
 # These are external variables, and shouldn't clash with anything else
 #  @CNAME@_MONOLITHIC
 
+SRC="obj/@NAME@.c"
+HDR="obj/@HEADER_NAME@"
+
+MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
+
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    SRC="obj/@NAME@.c"
-    HDR="obj/@HEADER_NAME@"
-
-    MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"
     MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
     make_monolithic ${HDR} C || return 1
 
diff --git a/skel/scripts/build.sdcc.firmware/build.monolithic b/skel/scripts/build.sdcc.firmware/build.monolithic
index 0ca50f2..6691075 100644
--- a/skel/scripts/build.sdcc.firmware/build.monolithic
+++ b/skel/scripts/build.sdcc.firmware/build.monolithic
@@ -2,11 +2,11 @@
 #  @NAME@_MONOLITHIC
 #
 
+SRC="obj/@NAME@.c"
+MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
+
 if [ -z "${@NAME@_MONOLITHIC}" ]
 then
-    SRC="obj/@NAME@.c"
-
-    MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"
     MONOLITHIC_SOURCE="$(echo src/@NAME@/TopHeader.h) $(echo src/@NAME@/TopSource.c)"
     make_monolithic ${SRC} C || return 1