diff --git a/Make/FeatureList b/Make/FeatureList
index c6913ef..ac81de6 100644
--- a/Make/FeatureList
+++ b/Make/FeatureList
@@ -197,12 +197,13 @@ Set	AvailableFeatures  "hasROMGibbly			
 						useROMFonts				"
 
 
-	If	"` ParseFeatures -a "{AvailableFeatures}" -f ": ROM {1}" `" =~ /': ROM '(Å)¨1/
-		Set Defines "{¨1}"
-	Else
-		Exit 1
+	For Feature in {AvailableFeatures}
+		Set Defines "{Defines} -d {Feature}=`Evaluate " {1} " =~ /Å {Feature} Å/`"
 	End
 
+	# Ugh!
+	Set Defines "`Echo {Defines} | StreamEdit -e '¥,° Replace /=1/ "=TRUE" -c °' -e '¥,° Replace /=0/ "=FALSE" -c °'`"
+
 	For Override in {2}
 
 		If "{Override}" =~ /(Å)¨1=(Å)¨2/
diff --git a/Make/MainCode.Make b/Make/MainCode.Make
index a7fc664..5fe44fb 100644
--- a/Make/MainCode.Make
+++ b/Make/MainCode.Make
@@ -40,7 +40,7 @@ IfSrcDir	=	{Sources}Libs:InterfaceSrcs:
 LibraryDir	=	{Sources}Libs:Libraries:
 
 #include {OSDir}OS.make
-#include {ToolBoxDir}Toolbox.make
+##include {ToolBoxDir}Toolbox.make
 #include {ColorQDDir}ColorQD.make
 #include {IfSrcDir}Interface.make
 
diff --git a/Make/RISC.make b/Make/RISC.make
index 31b0c0f..410e3a6 100644
--- a/Make/RISC.make
+++ b/Make/RISC.make
@@ -379,12 +379,12 @@ Clean							
 .cp.o							Ä	.c
 	{CPlus} {StdCPOpts} -o {Targ} {DepDir}{Default}.cp
 
-#include {ToolSrcDir}Tools.make
+##include {ToolSrcDir}Tools.make
+
+#include {DriverDir}Drivers.make
 
 #include {MakeDir}MainCode.make
 
 #include {DeclDir}DeclData.make
 
-#include {DriverDir}Drivers.make
-
 #include {ResourceDir}Resources.make
diff --git a/OS/MemoryMgr/MemoryMgr.make b/OS/MemoryMgr/MemoryMgr.make
index 1701bbd..42cbc77 100644
--- a/OS/MemoryMgr/MemoryMgr.make
+++ b/OS/MemoryMgr/MemoryMgr.make
@@ -17,9 +17,6 @@
 
 FigmentDir = {MemoryMgrDir}FigmentSources:
 
-#include {FigmentDir}Figment.Make
-
-
 MemoryMgrObjs 					=	"{ObjDir}MemoryMgr.a.o"							¶
 									"{ObjDir}MemoryMgrExtensions.a.o"				¶
 									"{ObjDir}MemoryMgrInternal.a.o"					¶
@@ -66,3 +63,4 @@ MemoryMgrObjs 					=	"{ObjDir}MemoryMgr.a.o"							
 	Asm {StdAOpts} -o "{Targ}" "{MemoryMgrDir}MemoryMgrInternal.a"
 
 
+#include {FigmentDir}Figment.Make
diff --git a/OS/OS.make b/OS/OS.make
index 567c4d6..108dfb8 100644
--- a/OS/OS.make
+++ b/OS/OS.make
@@ -67,14 +67,14 @@ RealTimeDir		=	{OSDir}RealTime:
 #include {ADBDir}ADBMgr.make
 #include {TimeMgrDir}TimeMgr.make
 #include {MemoryMgrDir}MemoryMgr.make
-#include {BeepDir}Beep.make
+##include {BeepDir}Beep.make
 #include {FPEmulationDir}FPEmulation.make
 #include {GestaltDir}Gestalt.make
 #include {KeyboardDir}Keyboard.make
 #include {NetBootDir}NetBoot.make
 #include {VDigDir}VDig.make
 #include {I2CDir}I2C.make
-#include {RealTimeDir}RealTime.make
+##include {RealTimeDir}RealTime.make
 
 
 OSObjs	= 							"{ObjDir}clock.a.o"								¶
diff --git a/OS/StartMgr/StartMgr.make b/OS/StartMgr/StartMgr.make
index 2b8f9b3..d12b9c5 100644
--- a/OS/StartMgr/StartMgr.make
+++ b/OS/StartMgr/StartMgr.make
@@ -49,7 +49,7 @@ Boot3Objects			=	"{ObjDir}Boot3.a.o"									
 	Rez {StdROpts} -a -o "{targ}" -d ROMBuildTime="{ROMBuildTime}" "{StartDir}Gibbly.r" || Exit 1
 
 "{RsrcDir}Gibbly.rsrc"		ÄÄ	{Boot3Objects}
-	Link {StdLOpts} {StdAlign} -o "{Targ}" {Boot3Objects} -rt 'boot=3' -ra =resSysHeap,resLocked || Exit 1
+	Link {StdLOpts}  -o "{Targ}" {Boot3Objects} -rt 'boot=3' -ra =resSysHeap,resLocked || Exit 1
 
 "{LibDir}StartMgr.lib"		Ä	{StartMgrObjs}
 	Lib {StdLibOpts}	{StartMgrObjs} -o "{Targ}"