diff --git a/settings.gradle b/settings.gradle
index 08e71faa..799d9ffa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,6 +5,7 @@ include ':vtm-android-example'
 include ':vtm-android-gdx'
 include ':vtm-app'
 include ':vtm-desktop'
+include ':vtm-desktop-lwjgl'
 include ':vtm-extras'
 include ':vtm-gdx'
 include ':vtm-gdx-poi3d'
diff --git a/vtm-desktop-lwjgl/build.gradle b/vtm-desktop-lwjgl/build.gradle
new file mode 100644
index 00000000..098f633c
--- /dev/null
+++ b/vtm-desktop-lwjgl/build.gradle
@@ -0,0 +1,19 @@
+apply plugin: 'java-library'
+apply plugin: 'maven'
+
+dependencies {
+    api project(':vtm-desktop')
+    api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
+}
+
+sourceSets {
+    main {
+        java.srcDirs = ['src']
+    }
+}
+
+if (project.hasProperty("SONATYPE_USERNAME")) {
+    afterEvaluate {
+        project.apply from: "${rootProject.projectDir}/deploy.gradle"
+    }
+}
diff --git a/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java b/vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/GdxMapApp.java
similarity index 95%
rename from vtm-desktop/src/org/oscim/gdx/GdxMapApp.java
rename to vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/GdxMapApp.java
index 666195ab..f46f350a 100644
--- a/vtm-desktop/src/org/oscim/gdx/GdxMapApp.java
+++ b/vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/GdxMapApp.java
@@ -16,19 +16,20 @@
  * You should have received a copy of the GNU Lesser General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.oscim.gdx;
+package org.oscim.gdx.lwjgl;
 
 import com.badlogic.gdx.Files;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
 import com.badlogic.gdx.graphics.glutils.GLVersion;
 import com.badlogic.gdx.utils.SharedLibraryLoader;
-
 import org.oscim.awt.AwtGraphics;
 import org.oscim.backend.DateTime;
 import org.oscim.backend.DateTimeAdapter;
 import org.oscim.backend.GLAdapter;
 import org.oscim.core.Tile;
+import org.oscim.gdx.GdxAssets;
+import org.oscim.gdx.GdxMap;
 import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 import org.oscim.utils.FastMath;
@@ -66,7 +67,7 @@ public class GdxMapApp extends GdxMap {
     protected static LwjglApplicationConfiguration getConfig(String title) {
         LwjglApplicationConfiguration.disableAudio = true;
         LwjglApplicationConfiguration cfg = new LwjglApplicationConfiguration();
-        cfg.title = title != null ? title : "vtm-gdx";
+        cfg.title = title != null ? title : "vtm-gdx-lwjgl";
 
         int[] sizes = new int[]{128, 64, 32, 16};
         for (int size : sizes) {
diff --git a/vtm-desktop/src/org/oscim/gdx/LwjglGL20.java b/vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/LwjglGL20.java
similarity index 98%
rename from vtm-desktop/src/org/oscim/gdx/LwjglGL20.java
rename to vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/LwjglGL20.java
index e11fddce..f78651fa 100644
--- a/vtm-desktop/src/org/oscim/gdx/LwjglGL20.java
+++ b/vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/LwjglGL20.java
@@ -30,26 +30,14 @@
  * limitations under the License.
  ******************************************************************************/
 
-package org.oscim.gdx;
+package org.oscim.gdx.lwjgl;
 
 import com.badlogic.gdx.utils.GdxRuntimeException;
-
 import org.lwjgl.BufferUtils;
-import org.lwjgl.opengl.EXTFramebufferObject;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL13;
-import org.lwjgl.opengl.GL14;
-import org.lwjgl.opengl.GL15;
-import org.lwjgl.opengl.GL20;
+import org.lwjgl.opengl.*;
 import org.oscim.backend.GL;
 
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.ShortBuffer;
+import java.nio.*;
 
 /**
  * An implementation of the {@link GL20} interface based on LWJGL. Note that LWJGL shaders and OpenGL ES shaders will not be 100%
diff --git a/vtm-desktop/src/org/oscim/gdx/LwjglGL30.java b/vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/LwjglGL30.java
similarity index 97%
rename from vtm-desktop/src/org/oscim/gdx/LwjglGL30.java
rename to vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/LwjglGL30.java
index 2c8df349..5e188080 100644
--- a/vtm-desktop/src/org/oscim/gdx/LwjglGL30.java
+++ b/vtm-desktop-lwjgl/src/org/oscim/gdx/lwjgl/LwjglGL30.java
@@ -14,33 +14,16 @@
  * limitations under the License.
  ******************************************************************************/
 
-package org.oscim.gdx;
+package org.oscim.gdx.lwjgl;
 
 import com.badlogic.gdx.utils.GdxRuntimeException;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-import org.lwjgl.opengl.GL15;
-import org.lwjgl.opengl.GL20;
-import org.lwjgl.opengl.GL21;
-import org.lwjgl.opengl.GL31;
-import org.lwjgl.opengl.GL32;
-import org.lwjgl.opengl.GL33;
-import org.lwjgl.opengl.GL40;
-import org.lwjgl.opengl.GL41;
-import org.lwjgl.opengl.GL43;
+import org.lwjgl.opengl.*;
 import org.oscim.backend.GL30;
 
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.LongBuffer;
-import java.nio.ShortBuffer;
+import java.nio.*;
 
 /**
- * See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-lwjgl3/src/com/badlogic/gdx/backends/lwjgl3/Lwjgl3GL30.java
+ * See https://github.com/libgdx/libgdx/blob/master/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglGL30.java
  */
 public class LwjglGL30 extends LwjglGL20 implements GL30 {
     @Override
diff --git a/vtm-desktop/build.gradle b/vtm-desktop/build.gradle
index 35820c34..c02486e3 100644
--- a/vtm-desktop/build.gradle
+++ b/vtm-desktop/build.gradle
@@ -3,7 +3,6 @@ apply plugin: 'maven'
 
 dependencies {
     api project(':vtm-gdx')
-    api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
     api 'com.github.blackears:svgSalamander:v1.1.1'
 }
 
diff --git a/vtm-playground/build.gradle b/vtm-playground/build.gradle
index 81b7ced8..22955daf 100644
--- a/vtm-playground/build.gradle
+++ b/vtm-playground/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'application'
 
 dependencies {
-    implementation project(':vtm-desktop')
+    implementation project(':vtm-desktop-lwjgl')
     file("${rootDir}/vtm-desktop/natives").eachDir() { dir ->
         implementation files(dir.path)
     }
diff --git a/vtm-playground/src/org/oscim/stuff/MapzenTest.java b/vtm-playground/src/org/oscim/stuff/MapzenTest.java
index def8a5e1..152a6bc8 100644
--- a/vtm-playground/src/org/oscim/stuff/MapzenTest.java
+++ b/vtm-playground/src/org/oscim/stuff/MapzenTest.java
@@ -16,7 +16,7 @@
  */
 package org.oscim.stuff;
 
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
diff --git a/vtm-playground/src/org/oscim/test/AnimatorTest.java b/vtm-playground/src/org/oscim/test/AnimatorTest.java
index 69ac2d4f..06a004cd 100644
--- a/vtm-playground/src/org/oscim/test/AnimatorTest.java
+++ b/vtm-playground/src/org/oscim/test/AnimatorTest.java
@@ -18,9 +18,8 @@
 package org.oscim.test;
 
 import com.badlogic.gdx.Input;
-
 import org.oscim.core.BoundingBox;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.tiling.TileSource;
diff --git a/vtm-playground/src/org/oscim/test/AtlasMarkerLayerTest.java b/vtm-playground/src/org/oscim/test/AtlasMarkerLayerTest.java
index 964e632e..e13ca93f 100644
--- a/vtm-playground/src/org/oscim/test/AtlasMarkerLayerTest.java
+++ b/vtm-playground/src/org/oscim/test/AtlasMarkerLayerTest.java
@@ -18,7 +18,7 @@ package org.oscim.test;
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.core.GeoPoint;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
diff --git a/vtm-playground/src/org/oscim/test/AtlasMultiTextureTest.java b/vtm-playground/src/org/oscim/test/AtlasMultiTextureTest.java
index 0e589734..1a12fc51 100644
--- a/vtm-playground/src/org/oscim/test/AtlasMultiTextureTest.java
+++ b/vtm-playground/src/org/oscim/test/AtlasMultiTextureTest.java
@@ -21,7 +21,7 @@ import org.oscim.backend.canvas.Canvas;
 import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint;
 import org.oscim.core.GeoPoint;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
diff --git a/vtm-playground/src/org/oscim/test/AtlasThemeTest.java b/vtm-playground/src/org/oscim/test/AtlasThemeTest.java
index 6e9f59f3..a5cb9ac7 100644
--- a/vtm-playground/src/org/oscim/test/AtlasThemeTest.java
+++ b/vtm-playground/src/org/oscim/test/AtlasThemeTest.java
@@ -15,7 +15,7 @@
  */
 package org.oscim.test;
 
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.utils.Parameters;
 
 public class AtlasThemeTest extends SimpleMapTest {
diff --git a/vtm-playground/src/org/oscim/test/BitmapTileTest.java b/vtm-playground/src/org/oscim/test/BitmapTileTest.java
index 74d35ca3..164ea4e9 100644
--- a/vtm-playground/src/org/oscim/test/BitmapTileTest.java
+++ b/vtm-playground/src/org/oscim/test/BitmapTileTest.java
@@ -17,8 +17,7 @@
 package org.oscim.test;
 
 import com.badlogic.gdx.Input;
-
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.tiling.source.bitmap.DefaultSources;
diff --git a/vtm-playground/src/org/oscim/test/CircleTest.java b/vtm-playground/src/org/oscim/test/CircleTest.java
index 6403c510..f631a50e 100644
--- a/vtm-playground/src/org/oscim/test/CircleTest.java
+++ b/vtm-playground/src/org/oscim/test/CircleTest.java
@@ -17,7 +17,7 @@ package org.oscim.test;
 import org.oscim.backend.GLAdapter;
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeometryBuffer;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
diff --git a/vtm-playground/src/org/oscim/test/ClusterMarkerLayerTest.java b/vtm-playground/src/org/oscim/test/ClusterMarkerLayerTest.java
index 3c6d2a5b..a5bcf537 100644
--- a/vtm-playground/src/org/oscim/test/ClusterMarkerLayerTest.java
+++ b/vtm-playground/src/org/oscim/test/ClusterMarkerLayerTest.java
@@ -19,14 +19,8 @@ import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Bitmap;
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeoPoint;
-import org.oscim.gdx.GdxMapApp;
-import org.oscim.layers.marker.ClusterMarkerRenderer;
-import org.oscim.layers.marker.ItemizedLayer;
-import org.oscim.layers.marker.MarkerItem;
-import org.oscim.layers.marker.MarkerLayer;
-import org.oscim.layers.marker.MarkerRenderer;
-import org.oscim.layers.marker.MarkerRendererFactory;
-import org.oscim.layers.marker.MarkerSymbol;
+import org.oscim.gdx.lwjgl.GdxMapApp;
+import org.oscim.layers.marker.*;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
diff --git a/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java b/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java
index 0959b4d0..95c07eef 100644
--- a/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java
+++ b/vtm-playground/src/org/oscim/test/ExternalRenderThemeTest.java
@@ -17,8 +17,7 @@
 package org.oscim.test;
 
 import com.badlogic.gdx.Input;
-
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.renderer.MapRenderer;
diff --git a/vtm-playground/src/org/oscim/test/ExtrusionsTest.java b/vtm-playground/src/org/oscim/test/ExtrusionsTest.java
index 3349fb9e..291b1b6b 100644
--- a/vtm-playground/src/org/oscim/test/ExtrusionsTest.java
+++ b/vtm-playground/src/org/oscim/test/ExtrusionsTest.java
@@ -17,7 +17,7 @@ package org.oscim.test;
 import org.oscim.core.MapElement;
 import org.oscim.core.Tag;
 import org.oscim.core.Tile;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.TileGridLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.buildings.S3DBLayer;
diff --git a/vtm-playground/src/org/oscim/test/GdxPoi3DTest.java b/vtm-playground/src/org/oscim/test/GdxPoi3DTest.java
index d02d5cbf..aaa317b8 100644
--- a/vtm-playground/src/org/oscim/test/GdxPoi3DTest.java
+++ b/vtm-playground/src/org/oscim/test/GdxPoi3DTest.java
@@ -18,7 +18,7 @@
 package org.oscim.test;
 
 import org.oscim.core.MapPosition;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.gdx.poi3d.Poi3DLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
diff --git a/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java b/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java
index ce3c85b2..87fb690d 100644
--- a/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java
+++ b/vtm-playground/src/org/oscim/test/GdxSpriteBatchTest.java
@@ -24,10 +24,9 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
-
 import org.oscim.backend.GL;
 import org.oscim.core.Point;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.renderer.GLState;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.tiling.TileSource;
diff --git a/vtm-playground/src/org/oscim/test/HairLineTest.java b/vtm-playground/src/org/oscim/test/HairLineTest.java
index f3192689..88826ed1 100644
--- a/vtm-playground/src/org/oscim/test/HairLineTest.java
+++ b/vtm-playground/src/org/oscim/test/HairLineTest.java
@@ -19,7 +19,7 @@ package org.oscim.test;
 import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint.Cap;
 import org.oscim.core.GeometryBuffer;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
diff --git a/vtm-playground/src/org/oscim/test/LineRenderTest.java b/vtm-playground/src/org/oscim/test/LineRenderTest.java
index 36e67560..2e41524e 100644
--- a/vtm-playground/src/org/oscim/test/LineRenderTest.java
+++ b/vtm-playground/src/org/oscim/test/LineRenderTest.java
@@ -18,12 +18,11 @@
 package org.oscim.test;
 
 import com.badlogic.gdx.Input;
-
 import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint.Cap;
 import org.oscim.core.GeometryBuffer;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
diff --git a/vtm-playground/src/org/oscim/test/LineTest.java b/vtm-playground/src/org/oscim/test/LineTest.java
index 40103243..b0015a6c 100644
--- a/vtm-playground/src/org/oscim/test/LineTest.java
+++ b/vtm-playground/src/org/oscim/test/LineTest.java
@@ -2,10 +2,9 @@ package org.oscim.test;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
-
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeometryBuffer;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
diff --git a/vtm-playground/src/org/oscim/test/LineTexTest.java b/vtm-playground/src/org/oscim/test/LineTexTest.java
index b973e9c4..904dc166 100644
--- a/vtm-playground/src/org/oscim/test/LineTexTest.java
+++ b/vtm-playground/src/org/oscim/test/LineTexTest.java
@@ -22,7 +22,7 @@ import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeoPoint;
 import org.oscim.core.MapPosition;
 import org.oscim.event.Event;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.vector.PathLayer;
 import org.oscim.layers.vector.geometries.Style;
diff --git a/vtm-playground/src/org/oscim/test/MapEventLayer2Test.java b/vtm-playground/src/org/oscim/test/MapEventLayer2Test.java
index 07c8c337..75b0761d 100644
--- a/vtm-playground/src/org/oscim/test/MapEventLayer2Test.java
+++ b/vtm-playground/src/org/oscim/test/MapEventLayer2Test.java
@@ -14,7 +14,7 @@
  */
 package org.oscim.test;
 
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.utils.Parameters;
 
 public class MapEventLayer2Test extends MarkerLayerTest {
diff --git a/vtm-playground/src/org/oscim/test/MapilionMvtTest.java b/vtm-playground/src/org/oscim/test/MapilionMvtTest.java
index d1412ba3..8b949363 100644
--- a/vtm-playground/src/org/oscim/test/MapilionMvtTest.java
+++ b/vtm-playground/src/org/oscim/test/MapilionMvtTest.java
@@ -14,8 +14,10 @@
  */
 package org.oscim.test;
 
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.core.MapPosition;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
@@ -29,9 +31,6 @@ import org.oscim.tiling.source.mvt.MapilionMvtTileSource;
 import java.io.File;
 import java.util.UUID;
 
-import okhttp3.Cache;
-import okhttp3.OkHttpClient;
-
 public class MapilionMvtTest extends GdxMapApp {
 
     // Metered API key for demonstration purposes
diff --git a/vtm-playground/src/org/oscim/test/MapsforgeMultiTest.java b/vtm-playground/src/org/oscim/test/MapsforgeMultiTest.java
index 886885d5..b5233a04 100644
--- a/vtm-playground/src/org/oscim/test/MapsforgeMultiTest.java
+++ b/vtm-playground/src/org/oscim/test/MapsforgeMultiTest.java
@@ -16,7 +16,7 @@ package org.oscim.test;
 
 import org.oscim.core.MapPosition;
 import org.oscim.core.Tile;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
diff --git a/vtm-playground/src/org/oscim/test/MapsforgePoi3DTest.java b/vtm-playground/src/org/oscim/test/MapsforgePoi3DTest.java
index de6352e0..24940163 100644
--- a/vtm-playground/src/org/oscim/test/MapsforgePoi3DTest.java
+++ b/vtm-playground/src/org/oscim/test/MapsforgePoi3DTest.java
@@ -15,7 +15,7 @@
  */
 package org.oscim.test;
 
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 
 import java.io.File;
 
diff --git a/vtm-playground/src/org/oscim/test/MapsforgeS3DBTest.java b/vtm-playground/src/org/oscim/test/MapsforgeS3DBTest.java
index 32be3f3b..1b917434 100644
--- a/vtm-playground/src/org/oscim/test/MapsforgeS3DBTest.java
+++ b/vtm-playground/src/org/oscim/test/MapsforgeS3DBTest.java
@@ -14,7 +14,7 @@
  */
 package org.oscim.test;
 
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 
 import java.io.File;
 
diff --git a/vtm-playground/src/org/oscim/test/MapsforgeStyleTest.java b/vtm-playground/src/org/oscim/test/MapsforgeStyleTest.java
index d19ffed7..9126e8ba 100644
--- a/vtm-playground/src/org/oscim/test/MapsforgeStyleTest.java
+++ b/vtm-playground/src/org/oscim/test/MapsforgeStyleTest.java
@@ -15,8 +15,7 @@
 package org.oscim.test;
 
 import com.badlogic.gdx.Input;
-
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.theme.StreamRenderTheme;
 import org.oscim.theme.XmlRenderThemeMenuCallback;
 import org.oscim.theme.XmlRenderThemeStyleLayer;
diff --git a/vtm-playground/src/org/oscim/test/MapsforgeTest.java b/vtm-playground/src/org/oscim/test/MapsforgeTest.java
index 5507ddc4..3614b6de 100644
--- a/vtm-playground/src/org/oscim/test/MapsforgeTest.java
+++ b/vtm-playground/src/org/oscim/test/MapsforgeTest.java
@@ -20,7 +20,7 @@ package org.oscim.test;
 import org.oscim.core.MapPosition;
 import org.oscim.core.Tile;
 import org.oscim.event.Event;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.gdx.poi3d.Poi3DLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.buildings.S3DBLayer;
@@ -30,11 +30,7 @@ import org.oscim.map.Map;
 import org.oscim.renderer.BitmapRenderer;
 import org.oscim.renderer.ExtrusionRenderer;
 import org.oscim.renderer.GLViewport;
-import org.oscim.scalebar.DefaultMapScaleBar;
-import org.oscim.scalebar.ImperialUnitAdapter;
-import org.oscim.scalebar.MapScaleBar;
-import org.oscim.scalebar.MapScaleBarLayer;
-import org.oscim.scalebar.MetricUnitAdapter;
+import org.oscim.scalebar.*;
 import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.source.mapfile.MapFileTileSource;
 import org.oscim.tiling.source.mapfile.MapInfo;
diff --git a/vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java b/vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java
index c7a8d899..2fa135fd 100644
--- a/vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java
+++ b/vtm-playground/src/org/oscim/test/MapzenGeojsonTest.java
@@ -14,8 +14,10 @@
  */
 package org.oscim.test;
 
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.core.MapPosition;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.geojson.MapzenGeojsonTileSource;
 import java.io.File;
 import java.util.UUID;
 
-import okhttp3.Cache;
-import okhttp3.OkHttpClient;
-
 public class MapzenGeojsonTest extends GdxMapApp {
 
     private static final boolean USE_CACHE = false;
diff --git a/vtm-playground/src/org/oscim/test/MapzenMvtTest.java b/vtm-playground/src/org/oscim/test/MapzenMvtTest.java
index 777ed2e1..7c3a71c5 100644
--- a/vtm-playground/src/org/oscim/test/MapzenMvtTest.java
+++ b/vtm-playground/src/org/oscim/test/MapzenMvtTest.java
@@ -14,8 +14,10 @@
  */
 package org.oscim.test;
 
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.core.MapPosition;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.mvt.MapzenMvtTileSource;
 import java.io.File;
 import java.util.UUID;
 
-import okhttp3.Cache;
-import okhttp3.OkHttpClient;
-
 public class MapzenMvtTest extends GdxMapApp {
 
     private static final boolean USE_CACHE = false;
diff --git a/vtm-playground/src/org/oscim/test/MarkerLayerLabelsTest.java b/vtm-playground/src/org/oscim/test/MarkerLayerLabelsTest.java
index c1534746..cb2c0a76 100644
--- a/vtm-playground/src/org/oscim/test/MarkerLayerLabelsTest.java
+++ b/vtm-playground/src/org/oscim/test/MarkerLayerLabelsTest.java
@@ -22,7 +22,7 @@ import org.oscim.core.GeoPoint;
 import org.oscim.event.Gesture;
 import org.oscim.event.GestureListener;
 import org.oscim.event.MotionEvent;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.Layer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
diff --git a/vtm-playground/src/org/oscim/test/MarkerLayerTest.java b/vtm-playground/src/org/oscim/test/MarkerLayerTest.java
index 4914c9fc..9d506ce1 100644
--- a/vtm-playground/src/org/oscim/test/MarkerLayerTest.java
+++ b/vtm-playground/src/org/oscim/test/MarkerLayerTest.java
@@ -20,7 +20,7 @@ import org.oscim.core.GeoPoint;
 import org.oscim.event.Gesture;
 import org.oscim.event.GestureListener;
 import org.oscim.event.MotionEvent;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.Layer;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
diff --git a/vtm-playground/src/org/oscim/test/NextzenGeojsonTest.java b/vtm-playground/src/org/oscim/test/NextzenGeojsonTest.java
index a59362fb..43ba0b2a 100644
--- a/vtm-playground/src/org/oscim/test/NextzenGeojsonTest.java
+++ b/vtm-playground/src/org/oscim/test/NextzenGeojsonTest.java
@@ -14,8 +14,10 @@
  */
 package org.oscim.test;
 
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.core.MapPosition;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.geojson.NextzenGeojsonTileSource;
 import java.io.File;
 import java.util.UUID;
 
-import okhttp3.Cache;
-import okhttp3.OkHttpClient;
-
 public class NextzenGeojsonTest extends GdxMapApp {
 
     private static final boolean USE_CACHE = false;
diff --git a/vtm-playground/src/org/oscim/test/NextzenMvtTest.java b/vtm-playground/src/org/oscim/test/NextzenMvtTest.java
index 786883c3..89efd290 100644
--- a/vtm-playground/src/org/oscim/test/NextzenMvtTest.java
+++ b/vtm-playground/src/org/oscim/test/NextzenMvtTest.java
@@ -14,8 +14,10 @@
  */
 package org.oscim.test;
 
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.core.MapPosition;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.mvt.NextzenMvtTileSource;
 import java.io.File;
 import java.util.UUID;
 
-import okhttp3.Cache;
-import okhttp3.OkHttpClient;
-
 public class NextzenMvtTest extends GdxMapApp {
 
     private static final boolean USE_CACHE = false;
diff --git a/vtm-playground/src/org/oscim/test/OSciMapS3DBTest.java b/vtm-playground/src/org/oscim/test/OSciMapS3DBTest.java
index 68791925..469795b4 100644
--- a/vtm-playground/src/org/oscim/test/OSciMapS3DBTest.java
+++ b/vtm-playground/src/org/oscim/test/OSciMapS3DBTest.java
@@ -16,7 +16,7 @@
  */
 package org.oscim.test;
 
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.buildings.S3DBTileLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
diff --git a/vtm-playground/src/org/oscim/test/OpenMapTilesMvtTest.java b/vtm-playground/src/org/oscim/test/OpenMapTilesMvtTest.java
index 3cc57834..33c38389 100644
--- a/vtm-playground/src/org/oscim/test/OpenMapTilesMvtTest.java
+++ b/vtm-playground/src/org/oscim/test/OpenMapTilesMvtTest.java
@@ -14,8 +14,10 @@
  */
 package org.oscim.test;
 
+import okhttp3.Cache;
+import okhttp3.OkHttpClient;
 import org.oscim.core.MapPosition;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
@@ -27,9 +29,6 @@ import org.oscim.tiling.source.mvt.OpenMapTilesMvtTileSource;
 import java.io.File;
 import java.util.UUID;
 
-import okhttp3.Cache;
-import okhttp3.OkHttpClient;
-
 public class OpenMapTilesMvtTest extends GdxMapApp {
 
     private static final boolean USE_CACHE = false;
diff --git a/vtm-playground/src/org/oscim/test/OverpassTest.java b/vtm-playground/src/org/oscim/test/OverpassTest.java
index a3a8ce3e..ebeceb69 100644
--- a/vtm-playground/src/org/oscim/test/OverpassTest.java
+++ b/vtm-playground/src/org/oscim/test/OverpassTest.java
@@ -18,7 +18,7 @@
 package org.oscim.test;
 
 import org.oscim.core.MapPosition;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.GroupLayer;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
diff --git a/vtm-playground/src/org/oscim/test/POTTextureTest.java b/vtm-playground/src/org/oscim/test/POTTextureTest.java
index bd7629aa..97741627 100644
--- a/vtm-playground/src/org/oscim/test/POTTextureTest.java
+++ b/vtm-playground/src/org/oscim/test/POTTextureTest.java
@@ -17,7 +17,7 @@
  */
 package org.oscim.test;
 
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.utils.Parameters;
 
 public class POTTextureTest extends SimpleMapTest {
diff --git a/vtm-playground/src/org/oscim/test/PathLayerTest.java b/vtm-playground/src/org/oscim/test/PathLayerTest.java
index 48f1ed81..e4b07596 100644
--- a/vtm-playground/src/org/oscim/test/PathLayerTest.java
+++ b/vtm-playground/src/org/oscim/test/PathLayerTest.java
@@ -22,7 +22,7 @@ import org.oscim.core.MapPosition;
 import org.oscim.event.Event;
 import org.oscim.event.Gesture;
 import org.oscim.event.MotionEvent;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.vector.PathLayer;
 import org.oscim.map.Map.UpdateListener;
diff --git a/vtm-playground/src/org/oscim/test/RotateMarkerLayerTest.java b/vtm-playground/src/org/oscim/test/RotateMarkerLayerTest.java
index 1515ceb7..9ba263ad 100644
--- a/vtm-playground/src/org/oscim/test/RotateMarkerLayerTest.java
+++ b/vtm-playground/src/org/oscim/test/RotateMarkerLayerTest.java
@@ -15,7 +15,7 @@
  */
 package org.oscim.test;
 
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.marker.MarkerItem;
 
 import java.util.Timer;
diff --git a/vtm-playground/src/org/oscim/test/RuleVisitorTest.java b/vtm-playground/src/org/oscim/test/RuleVisitorTest.java
index 8bfcda60..ac1d9328 100644
--- a/vtm-playground/src/org/oscim/test/RuleVisitorTest.java
+++ b/vtm-playground/src/org/oscim/test/RuleVisitorTest.java
@@ -17,8 +17,7 @@
 package org.oscim.test;
 
 import com.badlogic.gdx.Input;
-
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.theme.RenderTheme;
diff --git a/vtm-playground/src/org/oscim/test/SimpleMapTest.java b/vtm-playground/src/org/oscim/test/SimpleMapTest.java
index 01b603f2..1ef8fad5 100644
--- a/vtm-playground/src/org/oscim/test/SimpleMapTest.java
+++ b/vtm-playground/src/org/oscim/test/SimpleMapTest.java
@@ -17,7 +17,7 @@
 package org.oscim.test;
 
 import org.oscim.core.MapPosition;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.GroupLayer;
 import org.oscim.layers.tile.buildings.BuildingLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
@@ -25,11 +25,7 @@ import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.map.Map;
 import org.oscim.renderer.BitmapRenderer;
 import org.oscim.renderer.GLViewport;
-import org.oscim.scalebar.DefaultMapScaleBar;
-import org.oscim.scalebar.ImperialUnitAdapter;
-import org.oscim.scalebar.MapScaleBar;
-import org.oscim.scalebar.MapScaleBarLayer;
-import org.oscim.scalebar.MetricUnitAdapter;
+import org.oscim.scalebar.*;
 import org.oscim.theme.VtmThemes;
 import org.oscim.tiling.TileSource;
 import org.oscim.tiling.source.OkHttpEngine;
diff --git a/vtm-playground/src/org/oscim/test/ThemeBuilderTest.java b/vtm-playground/src/org/oscim/test/ThemeBuilderTest.java
index 388a9fae..f941c823 100644
--- a/vtm-playground/src/org/oscim/test/ThemeBuilderTest.java
+++ b/vtm-playground/src/org/oscim/test/ThemeBuilderTest.java
@@ -18,7 +18,7 @@ package org.oscim.test;
 
 import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint.Cap;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
 import org.oscim.theme.RenderTheme;
diff --git a/vtm-playground/src/org/oscim/test/TileRenderTest.java b/vtm-playground/src/org/oscim/test/TileRenderTest.java
index 3edfe583..3852296c 100644
--- a/vtm-playground/src/org/oscim/test/TileRenderTest.java
+++ b/vtm-playground/src/org/oscim/test/TileRenderTest.java
@@ -21,13 +21,9 @@ import org.oscim.core.MapElement;
 import org.oscim.core.MapPosition;
 import org.oscim.core.MercatorProjection;
 import org.oscim.event.Event;
-import org.oscim.gdx.GdxMapApp;
-import org.oscim.layers.tile.MapTile;
+import org.oscim.gdx.lwjgl.GdxMapApp;
+import org.oscim.layers.tile.*;
 import org.oscim.layers.tile.MapTile.TileNode;
-import org.oscim.layers.tile.TileLoader;
-import org.oscim.layers.tile.TileManager;
-import org.oscim.layers.tile.TileSet;
-import org.oscim.layers.tile.VectorTileRenderer;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.VectorTileLoader;
 import org.oscim.layers.tile.vector.labeling.LabelLayer;
diff --git a/vtm-playground/src/org/oscim/test/VectorLayerTest.java b/vtm-playground/src/org/oscim/test/VectorLayerTest.java
index aa25ab98..89e5e38f 100644
--- a/vtm-playground/src/org/oscim/test/VectorLayerTest.java
+++ b/vtm-playground/src/org/oscim/test/VectorLayerTest.java
@@ -17,7 +17,7 @@
 package org.oscim.test;
 
 import org.oscim.backend.canvas.Color;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.vector.VectorLayer;
 import org.oscim.layers.vector.geometries.PointDrawable;
diff --git a/vtm-playground/src/org/oscim/test/jeo/LayerTest.java b/vtm-playground/src/org/oscim/test/jeo/LayerTest.java
index 9026de98..c636ec3f 100644
--- a/vtm-playground/src/org/oscim/test/jeo/LayerTest.java
+++ b/vtm-playground/src/org/oscim/test/jeo/LayerTest.java
@@ -20,7 +20,7 @@ package org.oscim.test.jeo;
 import org.jeo.map.Style;
 import org.jeo.vector.VectorDataset;
 import org.oscim.backend.canvas.Color;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.JeoVectorLayer;
 import org.oscim.layers.OSMIndoorLayer;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
diff --git a/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java b/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java
index 7e40462a..7849e2ec 100644
--- a/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java
+++ b/vtm-playground/src/org/oscim/test/jeo/ThemeTest.java
@@ -16,7 +16,7 @@
  */
 package org.oscim.test.jeo;
 
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.theme.carto.RenderTheme;
diff --git a/vtm-playground/src/org/oscim/test/renderer/AtlasTest.java b/vtm-playground/src/org/oscim/test/renderer/AtlasTest.java
index 4e67117c..bbe50534 100644
--- a/vtm-playground/src/org/oscim/test/renderer/AtlasTest.java
+++ b/vtm-playground/src/org/oscim/test/renderer/AtlasTest.java
@@ -18,7 +18,7 @@ package org.oscim.test.renderer;
 
 import org.oscim.backend.canvas.Color;
 import org.oscim.backend.canvas.Paint.Cap;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
diff --git a/vtm-playground/src/org/oscim/test/renderer/BezierTest.java b/vtm-playground/src/org/oscim/test/renderer/BezierTest.java
index cd3be3e6..e6926eac 100644
--- a/vtm-playground/src/org/oscim/test/renderer/BezierTest.java
+++ b/vtm-playground/src/org/oscim/test/renderer/BezierTest.java
@@ -19,7 +19,7 @@ package org.oscim.test.renderer;
 import org.oscim.backend.canvas.Color;
 import org.oscim.core.GeometryBuffer;
 import org.oscim.core.Point;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
diff --git a/vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java b/vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java
index d7661c96..96a4ef10 100644
--- a/vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java
+++ b/vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java
@@ -18,15 +18,9 @@ package org.oscim.test.renderer;
 
 import org.oscim.backend.GL;
 import org.oscim.backend.canvas.Color;
-import org.oscim.gdx.GdxMapApp;
+import org.oscim.gdx.lwjgl.GdxMapApp;
 import org.oscim.layers.GenericLayer;
-import org.oscim.renderer.BucketRenderer;
-import org.oscim.renderer.BufferObject;
-import org.oscim.renderer.GLShader;
-import org.oscim.renderer.GLState;
-import org.oscim.renderer.GLUtils;
-import org.oscim.renderer.GLViewport;
-import org.oscim.renderer.MapRenderer;
+import org.oscim.renderer.*;
 import org.oscim.utils.FastMath;
 
 import java.nio.FloatBuffer;
diff --git a/vtm-theme-comparator/build.gradle b/vtm-theme-comparator/build.gradle
index 11f4506f..22cd7e7e 100644
--- a/vtm-theme-comparator/build.gradle
+++ b/vtm-theme-comparator/build.gradle
@@ -8,7 +8,7 @@ configurations.all {
 */
 
 dependencies {
-    implementation project(':vtm-desktop')
+    implementation project(':vtm-desktop-lwjgl')
     file("${rootDir}/vtm-desktop/natives").eachDir() { dir ->
         implementation files(dir.path)
     }
diff --git a/vtm-theme-comparator/src/org/oscim/theme/comparator/Main.java b/vtm-theme-comparator/src/org/oscim/theme/comparator/Main.java
index 662b108c..bacb241d 100644
--- a/vtm-theme-comparator/src/org/oscim/theme/comparator/Main.java
+++ b/vtm-theme-comparator/src/org/oscim/theme/comparator/Main.java
@@ -15,16 +15,16 @@
  */
 package org.oscim.theme.comparator;
 
+import ch.qos.logback.classic.LoggerContext;
 import com.badlogic.gdx.utils.SharedLibraryLoader;
 import com.jtattoo.plaf.DecorationHelper;
 import com.jtattoo.plaf.hifi.HiFiLookAndFeel;
-
 import org.oscim.awt.AwtGraphics;
 import org.oscim.backend.DateTime;
 import org.oscim.backend.DateTimeAdapter;
 import org.oscim.backend.GLAdapter;
 import org.oscim.gdx.GdxAssets;
-import org.oscim.gdx.LwjglGL20;
+import org.oscim.gdx.lwjgl.LwjglGL20;
 import org.oscim.theme.comparator.logging.AllAppender;
 import org.oscim.theme.comparator.logging.BaseAppender;
 import org.oscim.theme.comparator.logging.MapsforgeAppender;
@@ -32,18 +32,11 @@ import org.oscim.theme.comparator.logging.VtmAppender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.swing.*;
 import java.util.Properties;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 
-import javax.swing.ImageIcon;
-import javax.swing.JFrame;
-import javax.swing.JRootPane;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-
-import ch.qos.logback.classic.LoggerContext;
-
 public class Main {
 
     public static Preferences prefs = Preferences.userNodeForPackage(Main.class);