diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index c342b9076..dc18edac8 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -15,6 +15,12 @@
 // pushing dev branch
 // git push origin dev:dev
 
+// debounce settings
+// remove these after getting a new keyboard
+// #define DEBOUNCE 50
+// #define QMK_KEYS_PER_SCAN 4
+
+
 enum custom_keycodes {
   PLACEHOLDER = SAFE_RANGE, // can always be here
   EPRM,
@@ -43,7 +49,7 @@ enum custom_keycodes {
 
   SHELL_EXPAND_OE_LOGPATTERN,
   SHELL_EXPAND_OE_TRANPATTERN,
-  
+
   // Cloud9 macros
   CLOUD9_TAB_LEFT,
   CLOUD9_TAB_RIGHT,
@@ -52,6 +58,9 @@ enum custom_keycodes {
   CLOUD9_GOTO_LINE,
   CLOUD9_NAVIGATE,
 
+  // Windows 10 macros,
+  WINDOWS10_WORKSPACE_LEFT,
+  WINDOWS10_WORKSPACE_RIGHT,
 };
 
 
@@ -61,7 +70,7 @@ enum custom_keycodes {
 #define KEYSEL           3 // arrow navigation + shift (allow text selection)
 #define SHELL_NAV        4 // bash shortcuts
 #define SHELL_SCREEN     5 // linux screen shortcuts
-#define SCREEN_NAV       6 // navigate between linux screen tabs 
+#define SCREEN_NAV       6 // navigate between linux screen tabs
 #define BROWSER_CONTROL  7 // control browser and mouse
 #define COMBINED         8 // combined numbers and symbols layer
 #define ANDROID_STUDIO   9
@@ -161,7 +170,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       MEH(KC_1),         OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL),
 
       // left thumb cluster
-                MEH(KC_4),      MEH(KC_5),
+                WINDOWS10_WORKSPACE_LEFT, WINDOWS10_WORKSPACE_RIGHT,
                                 MEH(KC_6),
       MO(COMBINED),MO(KEYNAV),  OSM(MOD_LALT),
 
@@ -176,7 +185,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       MEH(KC_F5),MEH(KC_F6),MEH(KC_F7),MEH(KC_F8),KC_ENTER,KC_SPACE
 
   ),
-  
+
     // alternate base layout
   [BASE_ALTERNATE] = LAYOUT_ergodox(
        // left hand
@@ -201,7 +210,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS,
        KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS
-  ),  
+  ),
 
   [KEYNAV] = LAYOUT_ergodox(
     // left hand
@@ -381,8 +390,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,KC_TRNS,
 	KC_TRNS,
 	KC_TRNS,KC_TRNS,KC_TRNS),
-  
-  
+
+
     [BROWSER_CONTROL] = LAYOUT_ergodox(
 		   // left hand
            KC_TRNS, KC_TRNS,      KC_TRNS,       KC_TRNS,       KC_TRNS,      KC_TRNS, KC_TRNS,
@@ -493,19 +502,19 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             if (record->event.pressed) {
                 return MACRO( D(LCTL), T(A), U(LCTL), T(RBRC), END);
             }
-        break;        
+        break;
 
 	case DEL_TO_HOME:
             if (record->event.pressed) {
-                return MACRO( 
+                return MACRO(
 				// delete to the beginning of the line
  				D(LSFT), T(HOME), U(LSFT),
 				T(DELETE),
 				END);
-            }				
-  	    break;		
+            }
+  	    break;
+
 
-   
       }
     return MACRO_NONE;
 };
@@ -599,21 +608,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case SHELL_HTCSTATUS:
             SEND_STRING("htcStatus -j ");
             return true;
-            break;               
+            break;
         case SHELL_HTCBOUNCE:
             SEND_STRING("htcBounce -j ");
             return true;
-            break;               
+            break;
 	case SHELL_EXPAND_OE_LOGPATTERN:
             SEND_STRING(SS_TAP(X_LEFT)"*CQW_HKEX"SS_TAP(X_END)"*.log"SS_LCTRL("x")SS_LSFT("8"));
-	    break;	
+	    break;
 	case SHELL_EXPAND_OE_TRANPATTERN:
             SEND_STRING(SS_TAP(X_LEFT)"*CQW_HKEX"SS_TAP(X_END)"*.tran"SS_LCTRL("x")SS_LSFT("8"));
-	    break;	
+	    break;
         case SHELL_DUMPTLOG:
             SEND_STRING(" | dumptlog - ");
             return true;
-            break;            
+            break;
 	// Cloud9 macros
 	case CLOUD9_TAB_LEFT:
             SEND_STRING(SS_LCTRL("["));
@@ -639,6 +648,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             SEND_STRING(SS_LCTRL("e"));
             return true;
 			break;
+        case WINDOWS10_WORKSPACE_LEFT:
+            SEND_STRING(SS_LGUI(SS_LCTRL(SS_TAP(X_LEFT))));
+            return true;
+            break;
+        case WINDOWS10_WORKSPACE_RIGHT:
+            SEND_STRING(SS_LGUI(SS_LCTRL(SS_TAP(X_RIGHT))));
+            break;
 
     }
   }