diff --git a/Keyboards/cmake.bash b/Keyboards/cmake.bash
index 61995b0..9142526 100644
--- a/Keyboards/cmake.bash
+++ b/Keyboards/cmake.bash
@@ -85,4 +85,5 @@ cmake -DCHIP="${Chip}" -DCOMPILER="${Compiler}" -DScanModule="${ScanModule}" -DM
 make
 
 echo "Firmware has been compiled into: '${BuildPath}'"
+cd -
 
diff --git a/Keyboards/ergodox.bash b/Keyboards/ergodox.bash
index 0fe0f29..b07eb16 100755
--- a/Keyboards/ergodox.bash
+++ b/Keyboards/ergodox.bash
@@ -9,9 +9,11 @@
 # Configuration #
 #################
 
+######## Left Side ########
+
 # Feel free to change the variables in this section to configure your keyboard
 
-BuildPath="ICED"
+BuildPath="ICED-L"
 
 ## KLL Configuration ##
 
@@ -21,7 +23,7 @@ BaseMap="defaultMap leftHand slave1 rightHand"
 # This is the default layer of the keyboard
 # NOTE: To combine kll files into a single layout, separate them by spaces
 # e.g.  DefaultMap="mylayout mylayoutmod"
-DefaultMap="stdFuncMap"
+DefaultMap="mdergo1Overlay lcdFuncMap"
 
 # This is where you set the additional layers
 # NOTE: Indexing starts at 1
@@ -29,7 +31,8 @@ DefaultMap="stdFuncMap"
 # e.g.  PartialMaps[1]="layer1 layer1mod"
 #       PartialMaps[2]="layer2"
 #       PartialMaps[3]="layer3"
-PartialMaps[1]="hhkbpro2"
+PartialMaps[1]="iced_func"
+PartialMaps[2]="iced_numpad"
 
 
 
@@ -70,3 +73,25 @@ fi
 # Load the library
 source cmake.bash
 
+
+
+#########################
+# Re-run for right side #
+#########################
+
+######## Right Side ########
+
+# Feel free to change the variables in this section to configure your keyboard
+
+BuildPath="ICED-R"
+
+## KLL Configuration ##
+
+# Only changing the basemap (everything else is the same)
+# Generally shouldn't be changed, this will affect every layer
+BaseMap="defaultMap rightHand slave1 leftHand"
+
+# Load the library (starts the build)
+source cmake.bash
+
+
diff --git a/Scan/MD1/scan_loop.c b/Scan/MD1/scan_loop.c
index 02d6326..22d43c2 100644
--- a/Scan/MD1/scan_loop.c
+++ b/Scan/MD1/scan_loop.c
@@ -169,6 +169,7 @@ void CustomAction_blockKey_capability( uint8_t state, uint8_t stateType, uint8_t
 	// If key is not blocked, process
 	if ( key != CustomAction_blockHold_storage )
 	{
+		extern void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
 		Output_usbCodeSend_capability( state, stateType, &key );
 	}
 }