diff --git a/lib/bootloader b/lib/bootloader
index 74a37a8..b754ecb 160000
--- a/lib/bootloader
+++ b/lib/bootloader
@@ -1 +1 @@
-Subproject commit 74a37a8d9e88e94aca28379201fcfc57be87cf6b
+Subproject commit b754ecbe686ff8f622d658f6a5768c9ef1d89995
diff --git a/right/build/kds/.cproject b/right/build/kds/.cproject
index ab9b0f5..4eed9f3 100644
--- a/right/build/kds/.cproject
+++ b/right/build/kds/.cproject
@@ -74,6 +74,7 @@
 									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
 									<listOptionValue builtIn="false" value="../../../src/buspal"/>
 									<listOptionValue builtIn="false" value="../../../src/buspal/bm_usb"/>
+									<listOptionValue builtIn="false" value="../../../../lib/bootloader/src"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include"/>
@@ -214,6 +215,7 @@
 									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
 									<listOptionValue builtIn="false" value="../../../src/buspal"/>
 									<listOptionValue builtIn="false" value="../../../src/buspal/bm_usb"/>
+									<listOptionValue builtIn="false" value="../../../../lib/bootloader/src"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include"/>
@@ -356,6 +358,7 @@
 									<listOptionValue builtIn="false" value="../../../src/ksdk_usb"/>
 									<listOptionValue builtIn="false" value="../../../src/buspal"/>
 									<listOptionValue builtIn="false" value="../../../src/buspal/bm_usb"/>
+									<listOptionValue builtIn="false" value="../../../../lib/bootloader/src"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/osa"/>
 									<listOptionValue builtIn="false" value="../../../../lib/KSDK_2.0_MK22FN512xxx12/middleware/usb_1.0.0/include"/>
@@ -456,11 +459,11 @@
 			<resource resourceType="PROJECT" workspacePath="/uhk-right"/>
 		</configuration>
 		<configuration configurationName="v6-debug-srec"/>
+		<configuration configurationName="v7-debug"/>
+		<configuration configurationName="v6-release"/>
 		<configuration configurationName="release">
 			<resource resourceType="PROJECT" workspacePath="/uhk-right"/>
 		</configuration>
-		<configuration configurationName="v6-release"/>
-		<configuration configurationName="v7-debug"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
diff --git a/right/build/kds/.project b/right/build/kds/.project
index f9d3e0e..3a559f3 100644
--- a/right/build/kds/.project
+++ b/right/build/kds/.project
@@ -30,6 +30,11 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
 	<linkedResources>
+		<link>
+			<name>bootloader-shared</name>
+			<type>2</type>
+			<locationURI>virtual:/virtual</locationURI>
+		</link>
 		<link>
 			<name>drivers</name>
 			<type>2</type>
@@ -60,6 +65,16 @@
 			<type>2</type>
 			<locationURI>virtual:/virtual</locationURI>
 		</link>
+		<link>
+			<name>bootloader-shared/wormhole.c</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/lib/bootloader/src/bootloader/src/wormhole.c</locationURI>
+		</link>
+		<link>
+			<name>bootloader-shared/wormhole.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/lib/bootloader/src/bootloader/wormhole.h</locationURI>
+		</link>
 		<link>
 			<name>drivers/fsl_adc16.c</name>
 			<type>1</type>
diff --git a/right/src/main.c b/right/src/main.c
index 25013b7..3b4917e 100644
--- a/right/src/main.c
+++ b/right/src/main.c
@@ -12,7 +12,7 @@
 #include "bus_pal_hardware.h"
 #include "bootloader_config.h"
 #include "command.h"
-#include "wormhole.h"
+#include "bootloader/wormhole.h"
 #include "eeprom.h"
 
 key_matrix_t KeyMatrix = {
diff --git a/right/src/usb_composite_device.c b/right/src/usb_composite_device.c
index 014d358..77fdcc9 100644
--- a/right/src/usb_composite_device.c
+++ b/right/src/usb_composite_device.c
@@ -4,7 +4,7 @@
 #include "usb_descriptors/usb_descriptor_strings.h"
 #include "bootloader_config.h"
 #include "bus_pal_hardware.h"
-#include "wormhole.h"
+#include "bootloader/wormhole.h"
 
 static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param);
 usb_composite_device_t UsbCompositeDevice;
diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index 2fc9ec1..6f8d97b 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -9,7 +9,7 @@
 #include "led_pwm.h"
 #include "slave_scheduler.h"
 #include "slave_drivers/uhk_module_driver.h"
-#include "wormhole.h"
+#include "bootloader/wormhole.h"
 #include "peripherals/adc.h"
 #include "eeprom.h"
 #include "keymaps.h"
diff --git a/right/src/wormhole.c b/right/src/wormhole.c
deleted file mode 100644
index 5a5570b..0000000
--- a/right/src/wormhole.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "wormhole.h"
-
-wormhole_t ATTR_NO_INIT Wormhole;
diff --git a/right/src/wormhole.h b/right/src/wormhole.h
deleted file mode 100644
index 01f610b..0000000
--- a/right/src/wormhole.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __WORMHOLE_H__
-#define __WORMHOLE_H__
-
-// Includes:
-
-    #include <stdint.h>
-    #include "attributes.h"
-
-// Macros:
-
-    #define WORMHOLE_MAGIC_NUMBER 0x3b04cd9e94521f9a
-
-// Typedefs:
-
-    typedef enum {
-        EnumerationMode_Bootloader,
-        EnumerationMode_NormalKeyboard,
-        EnumerationMode_CompatibleKeyboard,
-        EnumerationMode_BusPal,
-    } enumeration_mode_t;
-
-    typedef struct {
-      uint64_t magicNumber;
-      uint8_t enumerationMode;
-    } wormhole_t;
-
-// Variables:
-
-    extern wormhole_t ATTR_NO_INIT Wormhole;
-
-#endif