--- a/WinWorkstation.st	Thu May 25 09:42:28 2017 +0100
+++ b/WinWorkstation.st	Thu Jun 01 15:54:54 2017 +0100
@@ -12599,34 +12599,34 @@
 			    arg = @symbol(Appl);
 			    break;
 			case VK_NUMPAD0:
-			    arg = @symbol(KeyPad0);
+			    arg = __MKCHARACTER((int)'0');
 			    break;
 			case VK_NUMPAD1:
-			    arg = @symbol(KeyPad1);
+			    arg = __MKCHARACTER((int)'1');
 			    break;
 			case VK_NUMPAD2:
-			    arg = @symbol(KeyPad2);
+			    arg = __MKCHARACTER((int)'2');
 			    break;
 			case VK_NUMPAD3:
-			    arg = @symbol(KeyPad3);
+			    arg = __MKCHARACTER((int)'3');
 			    break;
 			case VK_NUMPAD4:
-			    arg = @symbol(KeyPad4);
+			    arg = __MKCHARACTER((int)'4');
 			    break;
 			case VK_NUMPAD5:
-			    arg = @symbol(KeyPad5);
+			    arg = __MKCHARACTER((int)'5');
 			    break;
 			case VK_NUMPAD6:
-			    arg = @symbol(KeyPad6);
+			    arg = __MKCHARACTER((int)'6');
 			    break;
 			case VK_NUMPAD7:
-			    arg = @symbol(KeyPad7);
+			    arg = __MKCHARACTER((int)'7');
 			    break;
 			case VK_NUMPAD8:
-			    arg = @symbol(KeyPad8);
+			    arg = __MKCHARACTER((int)'8');
 			    break;
 			case VK_NUMPAD9:
-			    arg = @symbol(KeyPad9);
+			    arg = __MKCHARACTER((int)'9');
 			    break;
 			case VK_LSHIFT:
 			    arg = @symbol(Shift_L);
@@ -14759,34 +14759,6 @@
 "/    Processor disableSemaphore:eventSema
 !
 
-initializeDefaultKeyboardMappingsIn:aKeyboardMap
-
-    #(
-	Copy            Ctrlc           "copy selection to buffer"
-	Cut             Ctrlx           "cut selection into buffer"
-	Paste           Ctrlv           "paste buffer or external selection"
-	UserAbort       CtrlCancel      "Abort window process"
-	UserInterrupt   Pause           "interrupt window process"
-	$0              KeyPad0         "NumLocked numeric keypad keys..."
-	$1              KeyPad1
-	$2              KeyPad2
-	$3              KeyPad3
-	$4              KeyPad4
-	$5              KeyPad5
-	$6              KeyPad6
-	$7              KeyPad7
-	$8              KeyPad8
-	$9              KeyPad9
-    ) pairWiseDo:[:eachMapping :eachKey|
-	    aKeyboardMap
-		bindValue:eachMapping to:eachKey.
-	].
-
-    "
-     Screen default initializeDefaultKeyboardMappingsIn:Screen default keyboardMap
-    "
-!
-
 initializeDefaultValues
     focusMode := #activeWindow.