diff --git a/core/src/main/java/it/cavallium/warppi/extra/mario/MarioScreen.java b/core/src/main/java/it/cavallium/warppi/extra/mario/MarioScreen.java
index 1b1441b9..5a5d7d88 100644
--- a/core/src/main/java/it/cavallium/warppi/extra/mario/MarioScreen.java
+++ b/core/src/main/java/it/cavallium/warppi/extra/mario/MarioScreen.java
@@ -1,6 +1,7 @@
 package it.cavallium.warppi.extra.mario;
 
 import java.io.IOException;
+import java.nio.file.NoSuchFileException;
 
 import it.cavallium.warppi.WarpPI;
 import it.cavallium.warppi.StaticVars;
@@ -75,6 +76,7 @@ public class MarioScreen extends Screen {
 			if (MarioScreen.gpuTest3 == null) {
 				try {
 					MarioScreen.gpuTest3 = d.display.getGraphicEngine().loadSkin("N:\\gputest\\font_gputest3.png");
+				} catch (final NoSuchFileException ignored) {
 				} catch (final Exception ex) {
 					ex.printStackTrace();
 				}
@@ -112,6 +114,7 @@ public class MarioScreen extends Screen {
 			if (MarioScreen.gpuTest3 == null) {
 				try {
 					MarioScreen.gpuTest3 = d.display.getGraphicEngine().loadSkin("N:\\gputest\\font_gputest3.png");
+				} catch (final NoSuchFileException ignored) {
 				} catch (final Exception ex) {
 					ex.printStackTrace();
 				}
diff --git a/engine-jogl/pom.xml b/engine-jogl/pom.xml
index 347f495a..a47e91c5 100644
--- a/engine-jogl/pom.xml
+++ b/engine-jogl/pom.xml
@@ -12,6 +12,12 @@
 
 	<name>WarpPI Calculator JOGL Engine</name>
 	<description>WarpPI Calculator engine-jogl project</description>
+	<repositories>
+		<repository>
+			<id>jogamp</id>
+			<url>https://jogamp.org/deployment/maven/</url>
+		</repository>
+	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>it.cavallium</groupId>
@@ -21,12 +27,12 @@
 		<dependency>
 			<groupId>org.jogamp.jogl</groupId>
 			<artifactId>jogl-all-main</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jogamp.gluegen</groupId>
 			<artifactId>gluegen-rt-main</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>ar.com.hjg</groupId>
diff --git a/engine-jogl/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/jogl/NEWTWindow.java b/engine-jogl/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/jogl/NEWTWindow.java
index cefe87dd..3f60e5d6 100644
--- a/engine-jogl/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/jogl/NEWTWindow.java
+++ b/engine-jogl/src/main/java/it/cavallium/warppi/gui/graphicengine/impl/jogl/NEWTWindow.java
@@ -47,7 +47,6 @@ import com.jogamp.opengl.util.Animator;
 import com.jogamp.opengl.util.texture.Texture;
 
 import it.cavallium.warppi.WarpPI;
-import it.cavallium.warppi.device.display.DisplayOutputDevice;
 import it.cavallium.warppi.device.input.Keyboard;
 import it.cavallium.warppi.StaticVars;
 import it.cavallium.warppi.event.Key;
@@ -174,208 +173,47 @@ class NEWTWindow implements GLEventListener {
 			@Override
 			public void keyPressed(final KeyEvent arg0) {
 				switch (arg0.getKeyCode()) {
-					case KeyEvent.VK_ESCAPE:
-						Keyboard.keyPressed(Key.POWEROFF);
-						break;
-					case KeyEvent.VK_D:
-						Keyboard.keyPressed(Key.debug_DEG);
-						break;
-					case KeyEvent.VK_R:
-						Keyboard.keyPressed(Key.debug_RAD);
-						break;
-					case KeyEvent.VK_G:
-						Keyboard.keyPressed(Key.debug_GRA);
-						break;
-					case KeyEvent.VK_X:
-						if (Keyboard.alpha)
-							Keyboard.keyPressed(Key.LETTER_X);
-						else
-							Keyboard.keyPressed(Key.NONE);
-						break;
-					case KeyEvent.VK_P:
-						if (Keyboard.alpha)
-							Keyboard.keyPressed(Key.PI);
-						else
-							Keyboard.keyPressed(Key.NONE);
-						break;
-					case KeyEvent.VK_B:
-						if (Keyboard.shift)
-							Keyboard.keyPressed(Key.BRIGHTNESS_CYCLE_REVERSE);
-						else if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyPressed(Key.BRIGHTNESS_CYCLE);
-						else
-							Keyboard.keyPressed(Key.ZOOM_MODE);
-						break;
 					case KeyEvent.VK_ENTER:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyPressed(Key.SIMPLIFY);
-						else
-							Keyboard.keyPressed(Key.NONE);
 						int row = 2;
 						int col = 1;
 						Keyboard.debugKeysDown[row - 1][col - 1] = true;
 						break;
-					case KeyEvent.VK_1:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyPressed(Key.debug1);
-						else
-							Keyboard.keyPressed(Key.NONE);
-						break;
-					case KeyEvent.VK_2:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyPressed(Key.debug2);
-						else
-							Keyboard.keyPressed(Key.NONE);
-						break;
-					case KeyEvent.VK_3:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyPressed(Key.debug3);
-						else
-							Keyboard.keyPressed(Key.NONE);
-						break;
-					case KeyEvent.VK_4:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyPressed(Key.debug4);
-						else
-							Keyboard.keyPressed(Key.NONE);
-						break;
-					case KeyEvent.VK_5:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyPressed(Key.debug5);
-						else
-							Keyboard.keyPressed(Key.NONE);
-						break;
-					case 0x15:
-					case KeyEvent.VK_SHIFT:
-						Keyboard.keyPressed(Key.SHIFT);
-						break;
-					case KeyEvent.VK_CONTROL:
-						Keyboard.keyPressed(Key.ALPHA);
-						break;
-					case KeyEvent.VK_M:
-						Keyboard.keyPressed(Key.SURD_MODE);
-						break;
-					case KeyEvent.VK_LEFT:
-						Keyboard.keyPressed(Key.LEFT);
-						break;
-					case KeyEvent.VK_RIGHT:
-						Keyboard.keyPressed(Key.RIGHT);
-						break;
-					case KeyEvent.VK_UP:
-						Keyboard.keyPressed(Key.UP);
-						break;
-					case KeyEvent.VK_DOWN:
-					case (short) 12:
-						Keyboard.keyPressed(Key.DOWN);
-						break;
+					default: {
+					}
+				}
+				Key click = convertSimpleKey(arg0);
+				if (click != null) {
+					Keyboard.keyPressed(click);
 				}
 			}
 
 			@Override
 			public void keyReleased(final KeyEvent arg0) {
 				switch (arg0.getKeyCode()) {
-					case KeyEvent.VK_ESCAPE:
-						Keyboard.keyReleased(Key.POWEROFF);
-						break;
-					case KeyEvent.VK_D:
-						Keyboard.keyReleased(Key.debug_DEG);
-						break;
-					case KeyEvent.VK_R:
-						Keyboard.keyReleased(Key.debug_RAD);
-						break;
-					case KeyEvent.VK_G:
-						Keyboard.keyReleased(Key.debug_GRA);
-						break;
-					case KeyEvent.VK_X:
-						if (Keyboard.alpha)
-							Keyboard.keyReleased(Key.LETTER_X);
-						else
-							Keyboard.keyReleased(Key.NONE);
-						break;
-					case KeyEvent.VK_P:
-						if (Keyboard.alpha)
-							Keyboard.keyReleased(Key.PI);
-						else
-							Keyboard.keyReleased(Key.NONE);
-						break;
-					case KeyEvent.VK_B:
-						if (Keyboard.shift)
-							Keyboard.keyReleased(Key.BRIGHTNESS_CYCLE_REVERSE);
-						else if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyReleased(Key.BRIGHTNESS_CYCLE);
-						else
-							Keyboard.keyReleased(Key.ZOOM_MODE);
-						break;
 					case KeyEvent.VK_ENTER:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyReleased(Key.SIMPLIFY);
-						else
-							Keyboard.keyReleased(Key.NONE);
 						int row = 2;
 						int col = 1;
 						Keyboard.debugKeysDown[row - 1][col - 1] = false;
 						break;
-					case KeyEvent.VK_1:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyReleased(Key.debug1);
-						else
-							Keyboard.keyReleased(Key.NONE);
-						break;
-					case KeyEvent.VK_2:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyReleased(Key.debug2);
-						else
-							Keyboard.keyReleased(Key.NONE);
-						break;
-					case KeyEvent.VK_3:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyReleased(Key.debug3);
-						else
-							Keyboard.keyReleased(Key.NONE);
-						break;
-					case KeyEvent.VK_4:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyReleased(Key.debug4);
-						else
-							Keyboard.keyReleased(Key.NONE);
-						break;
-					case KeyEvent.VK_5:
-						if (!Keyboard.shift && !Keyboard.alpha)
-							Keyboard.keyReleased(Key.debug5);
-						else
-							Keyboard.keyReleased(Key.NONE);
-						break;
 					case 0x15:
 					case KeyEvent.VK_SHIFT:
-						Keyboard.keyReleased(Key.SHIFT);
 						if (Keyboard.shift) {
 							Keyboard.keyPressed(Key.SHIFT);
 							Keyboard.keyReleased(Key.SHIFT);
 						}
 						break;
 					case KeyEvent.VK_CONTROL:
-						Keyboard.keyReleased(Key.ALPHA);
 						if (Keyboard.alpha) {
 							Keyboard.keyPressed(Key.ALPHA);
 							Keyboard.keyReleased(Key.ALPHA);
 						}
 						break;
-					case KeyEvent.VK_M:
-						Keyboard.keyPressed(Key.SURD_MODE);
-						break;
-					case KeyEvent.VK_LEFT:
-						Keyboard.keyReleased(Key.LEFT);
-						break;
-					case KeyEvent.VK_RIGHT:
-						Keyboard.keyReleased(Key.RIGHT);
-						break;
-					case KeyEvent.VK_UP:
-						Keyboard.keyReleased(Key.UP);
-						break;
-					case KeyEvent.VK_DOWN:
-					case (short) 12:
-						Keyboard.keyReleased(Key.DOWN);
-						break;
+					default: {
+					}
+				}
+				Key click = convertSimpleKey(arg0);
+				if (click != null) {
+					Keyboard.keyReleased(click);
 				}
 			}
 		});
@@ -386,6 +224,91 @@ class NEWTWindow implements GLEventListener {
 		animator.start();
 	}
 
+	private Key convertSimpleKey(KeyEvent event) {
+		switch (event.getKeyChar()) {
+			case '+': {
+				if (event.isControlDown()) {
+					return Key.ZOOM_MODE;
+				} else {
+					return Key.PLUS;
+				}
+			}
+			case '-': return Key.MINUS;
+			case '*': return Key.MULTIPLY;
+			case '/': return Key.DIVIDE;
+			case 'd': case 'D': return Key.debug_DEG;
+			case 'r': case 'R': return Key.debug_RAD;
+			case 'g': case 'G': return Key.debug_GRA;
+			case 'x': case 'X': return Key.LETTER_X;
+			case 'y': case 'Y': return Key.LETTER_Y;
+			case 'p': case 'P': return Key.PI;
+			case 'b': return Key.BRIGHTNESS_CYCLE;
+			case 'B': return Key.BRIGHTNESS_CYCLE_REVERSE;
+			case '=': return Key.SIMPLIFY;
+			case '0': return Key.NUM0;
+			case '1': return Key.NUM1;
+			case '2': return Key.NUM2;
+			case '3': return Key.NUM3;
+			case '4': return Key.NUM4;
+			case '5': return Key.NUM5;
+			case '6': return Key.NUM6;
+			case '7': return Key.NUM7;
+			case '8': return Key.NUM8;
+			case '9': return Key.NUM9;
+			case 'm': case 'M': return Key.SURD_MODE;
+		}
+		switch (event.getKeyCode()) {
+			case KeyEvent.VK_ESCAPE:
+				return Key.POWEROFF;
+			case KeyEvent.VK_ENTER:
+				if (!Keyboard.shift && !Keyboard.alpha)
+					return Key.OK;
+				else
+					return Key.NONE;
+			case KeyEvent.VK_F1:
+				return Key.debug1;
+			case KeyEvent.VK_F2:
+				return Key.debug2;
+			case KeyEvent.VK_F3:
+				return Key.debug3;
+			case KeyEvent.VK_F4:
+				return Key.debug4;
+			case KeyEvent.VK_F5:
+				return Key.debug5;
+			case 0x15:
+			case KeyEvent.VK_SHIFT:
+				return Key.SHIFT;
+			case KeyEvent.VK_CONTROL:
+				return Key.ALPHA;
+			case KeyEvent.VK_LEFT:
+				if (Keyboard.alpha) {
+					return Key.HISTORY_BACK;
+				} else {
+					return Key.LEFT;
+				}
+			case KeyEvent.VK_RIGHT:
+				if (Keyboard.alpha) {
+					return Key.HISTORY_FORWARD;
+				} else {
+					return Key.RIGHT;
+				}
+			case KeyEvent.VK_UP:
+				return Key.UP;
+			case KeyEvent.VK_DOWN:
+			case (short) 12:
+				return Key.DOWN;
+			case KeyEvent.VK_BACK_SPACE:
+				return Key.DELETE;
+			case KeyEvent.VK_DELETE:
+				if (Keyboard.alpha) {
+					return Key.RESET;
+				} else {
+					return null;
+				}
+			default: return null;
+		}
+	}
+
 	@Override
 	public void init(final GLAutoDrawable drawable) {
 		final GL2ES1 gl = drawable.getGL().getGL2ES1();
diff --git a/pom.xml b/pom.xml
index 31bec1da..e3971821 100755
--- a/pom.xml
+++ b/pom.xml
@@ -60,14 +60,6 @@
 	</profiles>
 
 	<repositories>
-		<repository>
-			<id>teavm-dev</id>
-			<url>https://dl.bintray.com/konsoletyper/teavm</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<layout>default</layout>
-		</repository>
 		<repository>
 			<id>oss-snapshots-repo</id>
 			<name>Sonatype OSS Maven Repository</name>
@@ -84,14 +76,6 @@
 	</repositories>
 
 	<pluginRepositories>
-		<pluginRepository>
-			<id>1_teavm-dev</id>
-			<url>https://dl.bintray.com/konsoletyper/teavm</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<layout>default</layout>
-		</pluginRepository>
 		<pluginRepository>
 			<id>sonatype</id>
 			<url>https://oss.sonatype.org/content/repositories/releases/</url>
diff --git a/teavm/pom.xml b/teavm/pom.xml
index a5bc8ff0..7c39f373 100644
--- a/teavm/pom.xml
+++ b/teavm/pom.xml
@@ -22,28 +22,20 @@
 		<dependency>
 			<groupId>org.teavm</groupId>
 			<artifactId>teavm-classlib</artifactId>
-			<version>0.7.0-dev-859</version>
+			<version>0.9.0-dev-11</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 	<repositories>
 		<repository>
 			<id>teavm-dev</id>
-			<url>https://dl.bintray.com/konsoletyper/teavm</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<layout>default</layout>
+			<url>https://teavm.org/maven/repository</url>
 		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>
-			<id>1_teavm-dev</id>
-			<url>https://dl.bintray.com/konsoletyper/teavm</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<layout>default</layout>
+			<id>teavm-dev</id>
+			<url>https://teavm.org/maven/repository</url>
 		</pluginRepository>
 	</pluginRepositories>
 	<build>
@@ -81,7 +73,7 @@
 			<plugin>
 				<groupId>org.teavm</groupId>
 				<artifactId>teavm-maven-plugin</artifactId>
-				<version>0.7.0-dev-859</version>
+				<version>0.9.0-dev-11</version>
 				<executions>
 					<execution>
 						<goals>