diff --git a/Model100/Model100.ino b/Model100/Model100.ino
index 836ab04..e0212a7 100644
--- a/Model100/Model100.ino
+++ b/Model100/Model100.ino
@@ -221,10 +221,10 @@ KEYMAPS(
    ___, Key_Delete, ___, ___,
    ___,
 
-   Consumer_ScanPreviousTrack, Key_F6,            Key_F7, Key_F8, Key_F9, Key_F10,            Key_F11,
-   Consumer_PlaySlashPause,    Key_Equals,        Key_7,  Key_8,  Key_9,  LSHIFT(Key_Equals), Key_F12,
-                               Key_Minus,         Key_4,  Key_5,  Key_6,  Key_Quote,          ___,
-   Key_PcApplication,          LSHIFT(Key_Minus), Key_1,  Key_2,  Key_3,  LSHIFT(Key_Quote),  ___,
+   ___, Key_F6,            Key_F7, Key_F8, Key_F9, Key_F10,            Key_F11,
+   ___, Key_Equals,        Key_7,  Key_8,  Key_9,  LSHIFT(Key_Equals), Key_F12,
+        Key_Minus,         Key_4,  Key_5,  Key_6,  Key_Quote,          ___,
+   ___, LSHIFT(Key_Minus), Key_1,  Key_2,  Key_3,  LSHIFT(Key_Quote),  ___,
    ___, ___, Key_Enter, Key_0,
    ___),
 
@@ -236,10 +236,10 @@ KEYMAPS(
    ___, ___, ___, ___,
    ___,
 
-   ___, ___, ___,       ___,    ___,    ___,    ___,
-   ___, Key_VolumeUp,   Key_F7, Key_F8, Key_F9, Key_Home,   ___,
-        Key_VolumeDown, Key_F4, Key_F5, Key_F6, Key_End,    ___,
-   ___, Key_Mute,       Key_F1, Key_F2, Key_F3, Key_Insert, ___,
+   ___, ___, ___,    ___,    ___,    ___,        ___,
+   ___, ___, Key_F7, Key_F8, Key_F9, Key_Home,   ___,
+        ___, Key_F4, Key_F5, Key_F6, Key_End,    ___,
+   ___, ___, Key_F1, Key_F2, Key_F3, Key_Insert, ___,
    ___, ___, ___, ___,
    ___)
 
@@ -592,7 +592,8 @@ void setup() {
   // To avoid any surprises, SpaceCadet is turned off by default. However, it
   // can be permanently enabled via Chrysalis, so we should only disable it if
   // no configuration exists.
-  SpaceCadetConfig.disableSpaceCadetIfUnconfigured();
+  // SpaceCadetConfig.disableSpaceCadetIfUnconfigured();
+  SpaceCadet.disable();
 
   // Editable layer names are stored in EEPROM too, and we reserve 16 bytes per
   // layer for them. We need one extra byte per layer for bookkeeping, so we