diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/config.h
index 7e68d57e1e..44b8c1553f 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/config.h
@@ -9,7 +9,7 @@
 #define COMBO_TERM 30
 
 /* Oneshot keys */
-#define ONESHOT_TIMEOUT 2500
+#define ONESHOT_TIMEOUT 1000
 
 /* Caps word */
 #define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/keymap.c
index df57fa30ed..06c4043644 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jdominpa/keymap.c
@@ -2,26 +2,17 @@
 
 /* Sticky mods */
 #define OS_SHFT OSM(MOD_LSFT)
-#define OS_CTRL OSM(MOD_LCTL)
-#define OS_ALT  OSM(MOD_LALT)
-#define OS_GUI  OSM(MOD_LGUI)
-
-/* Tab switching */
-#define TAB_R C(KC_TAB)
-#define TAB_L C(S(KC_TAB))
-
-/* Editing commands */
-#define UNDO C(KC_Z)
-#define CUT  C(KC_X)
-#define COPY C(KC_C)
-#define PSTE C(KC_V)
 
 /* Layers */
 #define LA_NAV LT(NAV, KC_SPC)
+//#define LA_SYM LT(SYM, KC_A)
+//#define LA_NUM LT(NUM, KC_SCLN)
 
 enum layers {
     DEF,
     NAV,
+//    SYM,
+//    NUM,
     GAME,
 };
 
@@ -37,11 +28,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 	[NAV] = LAYOUT_65_ansi_blocker( /* Navigation and editing */
 		XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  QK_BOOT,
-		XXXXXXX,  KC_TAB,   KC_WSCH,  TAB_L,    TAB_R,    KC_VOLU,  KC_PGUP,  KC_HOME,  KC_UP,    KC_END,   KC_DEL,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-		XXXXXXX,  OS_SHFT,  OS_GUI,   OS_ALT,   OS_CTRL,  KC_VOLD,  KC_PGDN,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_BSPC,  XXXXXXX,            XXXXXXX,  XXXXXXX,
-		XXXXXXX,  KC_MUTE,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MSTP,  PSTE,     COPY,     CUT,      UNDO,     KC_ENT,   XXXXXXX,            XXXXXXX,  XXXXXXX,
+		XXXXXXX,  XXXXXXX,  KC_ESC,   KC_PGUP,  KC_INS,   XXXXXXX,  XXXXXXX,  KC_BSPC,  KC_ENT,   KC_DEL,   XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+		XXXXXXX,  KC_LSFT,  KC_LGUI,  KC_LALT,  KC_LCTL,  XXXXXXX,  XXXXXXX,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  XXXXXXX,            XXXXXXX,  XXXXXXX,
+		XXXXXXX,  XXXXXXX,  KC_RALT,  KC_PGDN,  KC_LALT,  XXXXXXX,  XXXXXXX,  KC_TAB,   KC_HOME,  KC_END,   XXXXXXX,  XXXXXXX,            XXXXXXX,  XXXXXXX,
 		XXXXXXX,  XXXXXXX,  XXXXXXX,                      XXXXXXX,                      XXXXXXX,            XXXXXXX,  XXXXXXX,            XXXXXXX,  XXXXXXX),
-
+    
+	/* [SYM] = LAYOUT_65_ansi_blocker( /\* Symbols *\/ */
+	/* 	XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, */
+	/* 	XXXXXXX,  XXXXXXX,  KC_LCBR,  KC_RCBR,  KC_BSLS,  KC_DLR,   KC_CIRC,  KC_7,     KC_8,     KC_9,     XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, */
+	/* 	XXXXXXX,  KC_AT,    KC_LPRN,  KC_RPRN,  KC_DQUO,  KC_QUOT,  KC_HASH,  OS_4,     OS_5,     OS_6,     XXXXXXX,  XXXXXXX,            XXXXXXX,  XXXXXXX, */
+	/* 	OS_SHFT,  XXXXXXX,  KC_LBRC,  KC_RBRC,  KC_QUES,  KC_GRV,   XXXXXXX,  KC_1,     KC_2,     KC_3,     XXXXXXX,  OS_SHFT,            XXXXXXX,  XXXXXXX, */
+	/* 	XXXXXXX,  XXXXXXX,  XXXXXXX,                      XXXXXXX,                      XXXXXXX,            XXXXXXX,  XXXXXXX,            XXXXXXX,  XXXXXXX), */
+
+	/* [NUM] = LAYOUT_65_ansi_blocker( /\* Numbers and function keys *\/ */
+	/* 	XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  QK_BOOT, */
+	/* 	XXXXXXX,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX, */
+	/* 	XXXXXXX,  OS_GUI,   OS_ALT,   OS_CTRL,  OS_SHFT,  KC_F11,   KC_F12,   OS_SHFT,  OS_CTRL,  OS_ALT,   OS_GUI,   XXXXXXX,            XXXXXXX,  XXXXXXX, */
+	/* 	XXXXXXX,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   XXXXXXX,            XXXXXXX,  XXXXXXX, */
+	/* 	XXXXXXX,  XXXXXXX,  XXXXXXX,                      XXXXXXX,                      XXXXXXX,            XXXXXXX,  XXXXXXX,            XXXXXXX,  XXXXXXX), */
+    
 	[GAME] = LAYOUT_65_ansi_blocker( /* Gaming */
 		KC_ESC,   KC_1,          KC_2,       KC_3,    KC_4,  KC_5,    KC_6,   KC_7,   KC_8,      KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_DEL,
 		KC_TAB,   KC_Q,          KC_W,       KC_E,    KC_R,  KC_T,    KC_Y,   KC_U,   KC_I,      KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_BSLS,   XXXXXXX,