diff --git a/Model100.ino b/Model100.ino
index 52d9720..c674412 100644
--- a/Model100.ino
+++ b/Model100.ino
@@ -37,6 +37,9 @@
 
 #include "Kaleidoscope-USB-Quirks.h"
 
+#include "Kaleidoscope-OneShot.h"
+#include "Kaleidoscope-Escape-OneShot.h"
+
 enum {
   MACRO_VERSION_INFO,
   MACRO_ANY,
@@ -90,15 +93,15 @@ KEYMAPS(
    RALT(Key_7),             LSHIFT(Key_6),   Key_Comma, Key_Period, Key_P, Key_Z, Key_Tab,
    ___,                     Key_A,           Key_O,     Key_E,      Key_U, Key_I,
    LALT(LCTRL(Key_Delete)), RALT(Key_Comma), Key_Q,     Key_J,      Key_K, Key_X, Key_Escape,
-   Key_LeftControl, Key_Backspace, Key_LeftAlt, ShiftToLayer(SHIFTED),
-   ShiftToLayer(FUNCTION),
+   Key_LeftControl, Key_Backspace, Key_LeftAlt, OSL(SHIFTED),
+   OSL(FUNCTION),
 
    M(1),        Key_6, Key_7, Key_8, Key_9, Key_Backtick, MoveToLayer(HUN),
    Key_Enter,   Key_F, Key_G, Key_C, Key_R, Key_L,        LSHIFT(Key_7),
                 Key_D, Key_H, Key_T, Key_N, Key_S,        LSHIFT(Key_1),
    Key_LeftGui, Key_B, Key_M, Key_W, Key_V, Key_Y,        Key_Slash,
-   ShiftToLayer(SHIFTED), ShiftToLayer(ALTGR), Key_Spacebar, Key_RightControl,
-   ShiftToLayer(FUNCTION)),
+   OSL(SHIFTED), OSL(ALTGR), Key_Spacebar, Key_RightControl,
+   OSL(FUNCTION)),
 
   [SHIFTED] = KEYMAP_STACKED
   (___,         LSHIFT(Key_4),      RALT(Key_V),   RALT(Key_X),      RALT(Key_Semicolon), LSHIFT(Key_5), ___,
@@ -112,7 +115,7 @@ KEYMAPS(
    LSHIFT(Key_Enter), LSHIFT(Key_F), LSHIFT(Key_G), LSHIFT(Key_C),   LSHIFT(Key_R), LSHIFT(Key_L), LSHIFT(Key_3),
                       LSHIFT(Key_D), LSHIFT(Key_H), LSHIFT(Key_T),   LSHIFT(Key_N), LSHIFT(Key_S), LSHIFT(Key_2),
    ___,               LSHIFT(Key_B), LSHIFT(Key_M), LSHIFT(Key_W),   LSHIFT(Key_V), LSHIFT(Key_Y), LSHIFT(Key_Slash),
-   ___, ShiftToLayer(ALTGR_SHIFT), ___, ___,
+   ___, OSL(ALTGR_SHIFT), ___, ___,
    ___),
 
   [ALTGR] = KEYMAP_STACKED
@@ -120,14 +123,14 @@ KEYMAPS(
    RALT(Key_Backtick), RALT(Key_A),     Key_0,           RALT(LSHIFT(Key_Period)),   Key_Minus,                      RALT(Key_Z),                     ___,
    ___,                Key_Quote,       Key_Equals,      Key_Semicolon,              Key_RightBracket,               Key_NonUsBackslashAndPipe,
    ___,                RALT(Key_Quote), Key_LeftBracket, RALT(Key_J),                Key_Backslash,                  RALT(Key_NonUsBackslashAndPipe), ___,
-   ___, ___, ___, ShiftToLayer(ALTGR_SHIFT),
+   ___, ___, ___, OSL(ALTGR_SHIFT),
    ___,
 
    ___, XXX,                 XXX,         RALT(LSHIFT(Key_Slash)), RALT(Key_8),         RALT(LSHIFT(Key_8)),     MoveToLayer(ONEHAND_LEFT),
    ___, RALT(Key_I),         RALT(Key_L), RALT(Key_E),             RALT(Key_H),         RALT(Key_S),             RALT(Key_RightBracket),
         RALT(Key_D),         XXX,         RALT(Key_T),             RALT(Key_K),         RALT(Key_Minus),         RALT(Key_Equals),
    ___, RALT(LSHIFT(Key_O)), RALT(Key_O), RALT(Key_P),             RALT(LSHIFT(Key_M)), RALT(LSHIFT(Key_Comma)), RALT(Key_Y),
-   ShiftToLayer(ALTGR_SHIFT), ___, ___, ___,
+   OSL(ALTGR_SHIFT), ___, ___, ___,
    ___),
 
   [ALTGR_SHIFT] = KEYMAP_STACKED
@@ -166,14 +169,14 @@ KEYMAPS(
    ___,          Key_A, Key_S, Key_D, Key_F, Key_G,
    ___,          Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape,
    Key_LeftControl, Key_Backspace, Key_LeftAlt, Key_LeftShift,
-   ShiftToLayer(FUNCTION),
+   OSL(FUNCTION),
 
    ___,         Key_6, Key_7, Key_8,     Key_9,      Key_0,         MoveToLayer(PRIMARY),
    Key_Enter,   Key_Y, Key_U, Key_I,     Key_O,      Key_P,         Key_Minus,
                 Key_H, Key_J, Key_K,     Key_L,      Key_Semicolon, Key_Quote,
    Key_LeftGui, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash,     Key_Backslash,
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
-   ShiftToLayer(FUNCTION)),
+   OSL(FUNCTION)),
 
   [COLEMAK] = KEYMAP_STACKED
   (___,                       Key_1, Key_2, Key_3, Key_4, Key_5, ___,
@@ -181,14 +184,14 @@ KEYMAPS(
    ___,                       Key_A, Key_R, Key_S, Key_T, Key_D,
    Key_NonUsBackslashAndPipe, Key_Y, Key_X, Key_C, Key_V, Key_B, Key_Escape,
    Key_LeftControl, Key_Backspace, Key_LeftAlt, Key_LeftShift,
-   ShiftToLayer(FUNCTION),
+   OSL(FUNCTION),
 
    ___,         Key_6, Key_7, Key_8,     Key_9,      Key_0,         MoveToLayer(PRIMARY),
    Key_Enter,   Key_J, Key_L, Key_U,     Key_Z,      Key_Semicolon, Key_Equals,
                 Key_H, Key_N, Key_E,     Key_I,      Key_O,         Key_Quote,
    Key_LeftGui, Key_K, Key_M, Key_Comma, Key_Period, Key_Slash,     Key_Minus,
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
-   ShiftToLayer(FUNCTION)),
+   OSL(FUNCTION)),
 
   [ONEHAND_LEFT] = KEYMAP_STACKED
   (XXX, Key_1, Key_2, Key_3, Key_4, Key_5, Key_Tab,
@@ -196,7 +199,7 @@ KEYMAPS(
    XXX, Key_A, Key_S, Key_D, Key_F, Key_G,
    XXX, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape,
    Key_LeftControl, Key_Spacebar, Key_LeftAlt, Key_LeftShift,
-   ShiftToLayer(ONEHAND_RIGHT),
+   OSL(ONEHAND_RIGHT),
 
    XXX, XXX, XXX, XXX, XXX, XXX, XXX,
    XXX, XXX, XXX, XXX, XXX, XXX, XXX,
@@ -309,7 +312,10 @@ KALEIDOSCOPE_INIT_PLUGINS(
   MouseKeys,
   HostPowerManagement,
   MagicCombo,
-  USBQuirks
+  USBQuirks,
+  OneShot,
+  EscapeOneShot,
+  EscapeOneShotConfig
 );
 
 void setup() {