diff --git a/lib/jna-3.4.0.jar b/lib/jna-3.4.0.jar
deleted file mode 100644
index cd906f9..0000000
Binary files a/lib/jna-3.4.0.jar and /dev/null differ
diff --git a/lib/platform-3.4.0.jar b/lib/platform-3.4.0.jar
deleted file mode 100644
index d9e9c70..0000000
Binary files a/lib/platform-3.4.0.jar and /dev/null differ
diff --git a/src/org/synthuse/RobotMacro.java b/src/org/synthuse/RobotMacro.java
index ed86901..e35f5fc 100644
--- a/src/org/synthuse/RobotMacro.java
+++ b/src/org/synthuse/RobotMacro.java
@@ -333,18 +333,18 @@ public class RobotMacro {
 	    	case '-': return(new int[]{KeyEvent.VK_MINUS});
 	    	case '=': return(new int[]{KeyEvent.VK_EQUALS});
 	    	case '~': return(new int[]{KeyEvent.VK_ENTER});//return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_BACK_QUOTE});
-	    	case '!': return(new int[]{KeyEvent.VK_EXCLAMATION_MARK});
-	    	case '@': return(new int[]{KeyEvent.VK_AT});
-	    	case '#': return(new int[]{KeyEvent.VK_NUMBER_SIGN});
-	    	case '$': return(new int[]{KeyEvent.VK_DOLLAR});
+	    	case '!': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_1});
+	    	case '@': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_2});
+	    	case '#': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_3});
+	    	case '$': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_4});
 	    	case '%': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_5});
-	    	case '^': return(new int[]{KeyEvent.VK_CIRCUMFLEX});
-	    	case '&': return(new int[]{KeyEvent.VK_AMPERSAND});
-	    	case '*': return(new int[]{KeyEvent.VK_ASTERISK});
-	    	case '(': return(new int[]{KeyEvent.VK_LEFT_PARENTHESIS});
-	    	case ')': return(new int[]{KeyEvent.VK_RIGHT_PARENTHESIS});
-	    	case '_': return(new int[]{KeyEvent.VK_UNDERSCORE});
-	    	case '+': return(new int[]{KeyEvent.VK_PLUS});
+	    	case '^': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_6});
+	    	case '&': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_7});
+	    	case '*': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_8});
+	    	case '(': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_9});
+	    	case ')': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_0});
+	    	case '_': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_MINUS});
+	    	case '+': return(new int[]{KeyEvent.VK_SHIFT, KeyEvent.VK_EQUALS});
 	    	case '\t': return(new int[]{KeyEvent.VK_TAB});
 	    	case '\n': return(new int[]{KeyEvent.VK_ENTER});
 	    	case '[': return(new int[]{KeyEvent.VK_OPEN_BRACKET});