diff --git a/hyperlap2d-common-api b/hyperlap2d-common-api
index a11c1ac0..e764fc4f 160000
--- a/hyperlap2d-common-api
+++ b/hyperlap2d-common-api
@@ -1 +1 @@
-Subproject commit a11c1ac006a8ee142e67f701c9e5ccdb4c4fca74
+Subproject commit e764fc4f3cab50501504a837e863ef22de1a19f5
diff --git a/hyperlap2d-runtime-libgdx b/hyperlap2d-runtime-libgdx
index 88663fda..35e3e4b3 160000
--- a/hyperlap2d-runtime-libgdx
+++ b/hyperlap2d-runtime-libgdx
@@ -1 +1 @@
-Subproject commit 88663fda42c777871df7e60624381e9d6caee865
+Subproject commit 35e3e4b3d59e78de9ec2da0514d07feca8ce6364
diff --git a/src/main/java/games/rednblack/editor/Main.java b/src/main/java/games/rednblack/editor/Main.java
index f1e7a268..c1e242f6 100644
--- a/src/main/java/games/rednblack/editor/Main.java
+++ b/src/main/java/games/rednblack/editor/Main.java
@@ -3,7 +3,6 @@ package games.rednblack.editor;
 import com.badlogic.gdx.Graphics;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
-import com.badlogic.gdx.graphics.glutils.ShaderProgram;
 import games.rednblack.editor.proxy.SettingsManager;
 import org.apache.commons.lang3.SystemUtils;
 
@@ -43,7 +42,7 @@ public class Main {
         config.useVsync(false);
         config.setTitle("HyperLap2D");
         config.setWindowIcon("hyperlap_icon_96.png");
-        if (settingsManager.editorConfigVO.useOpenGL3)
+        if (settingsManager.editorConfigVO.useANGLEGLES2)
             config.setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.ANGLE_GLES20, 3, 2);
         config.setBackBufferConfig(8,8,8,8,16,8, settingsManager.editorConfigVO.msaaSamples);
 
diff --git a/src/main/java/games/rednblack/editor/view/ui/settings/GeneralSettings.java b/src/main/java/games/rednblack/editor/view/ui/settings/GeneralSettings.java
index 0e515b3b..6522cccc 100644
--- a/src/main/java/games/rednblack/editor/view/ui/settings/GeneralSettings.java
+++ b/src/main/java/games/rednblack/editor/view/ui/settings/GeneralSettings.java
@@ -14,7 +14,7 @@ import games.rednblack.h2d.common.vo.EditorConfigVO;
 
 public class GeneralSettings extends SettingsNodeValue<EditorConfigVO> {
 
-    private final VisCheckBox autoSaving, useOpenGL3;
+    private final VisCheckBox autoSaving, useANGLEGLES2;
     private final VisCheckBox enablePlugins;
     private VisSelectBox<String> filterKeyMapping;
     private VisSlider uiScaleDensity, msaaSamples, fpsLimit;
@@ -41,8 +41,8 @@ public class GeneralSettings extends SettingsNodeValue<EditorConfigVO> {
         getContentTable().add(getMassSamplesTable()).left().padTop(5).row();
         getContentTable().add(getFPSLimitTable()).left().padTop(5).row();
 
-        useOpenGL3 = StandardWidgetsFactory.createCheckBox("Use OpenGL 3 API [Require restart]");
-        getContentTable().add(useOpenGL3).left().padTop(5).padLeft(8).row();
+        useANGLEGLES2 = StandardWidgetsFactory.createCheckBox("Use ANGLE OpenGL ES 2 API [Require restart]");
+        getContentTable().add(useANGLEGLES2).left().padTop(5).padLeft(8).row();
     }
 
     private Actor getKeyMappingTable() {
@@ -133,7 +133,7 @@ public class GeneralSettings extends SettingsNodeValue<EditorConfigVO> {
     @Override
     public void translateSettingsToView() {
         autoSaving.setChecked(getSettings().autoSave);
-        useOpenGL3.setChecked(getSettings().useOpenGL3);
+        useANGLEGLES2.setChecked(getSettings().useANGLEGLES2);
         enablePlugins.setChecked(getSettings().enablePlugins);
         filterKeyMapping.setSelected(getSettings().keyBindingLayout);
         uiScaleDensity.setValue(getSettings().uiScaleDensity);
@@ -144,7 +144,7 @@ public class GeneralSettings extends SettingsNodeValue<EditorConfigVO> {
     @Override
     public void translateViewToSettings() {
         getSettings().autoSave = autoSaving.isChecked();
-        getSettings().useOpenGL3 = useOpenGL3.isChecked();
+        getSettings().useANGLEGLES2 = useANGLEGLES2.isChecked();
         getSettings().enablePlugins = enablePlugins.isChecked();
         getSettings().keyBindingLayout = filterKeyMapping.getSelected();
         getSettings().uiScaleDensity = getUIScaleDensity();
@@ -156,7 +156,7 @@ public class GeneralSettings extends SettingsNodeValue<EditorConfigVO> {
     @Override
     public boolean validateSettings() {
         return getSettings().autoSave != autoSaving.isChecked()
-                || getSettings().useOpenGL3 != useOpenGL3.isChecked()
+                || getSettings().useANGLEGLES2 != useANGLEGLES2.isChecked()
                 || getSettings().enablePlugins != enablePlugins.isChecked()
                 || !getSettings().keyBindingLayout.equals(filterKeyMapping.getSelected())
                 || getSettings().uiScaleDensity != getUIScaleDensity()