diff --git a/app/build.gradle b/app/build.gradle
index 6d49403..ad43968 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,6 +39,6 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation files('libs/simple-xml-2.7.1.jar')
 }
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/DestroyEffect.java b/app/src/main/java/de/frajul/endlessroll/entities/DestroyEffect.java
index a937031..cc1a8c6 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/DestroyEffect.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/DestroyEffect.java
@@ -7,7 +7,7 @@
 
 package de.frajul.endlessroll.entities;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import de.frajul.endlessroll.data.Vector;
 import de.frajul.endlessroll.entities.particles.ParticleEffect;
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/shapes/PlayerShape.java b/app/src/main/java/de/frajul/endlessroll/entities/shapes/PlayerShape.java
index 70c9938..2cb94af 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/shapes/PlayerShape.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/shapes/PlayerShape.java
@@ -7,8 +7,8 @@
 
 package de.frajul.endlessroll.entities.shapes;
 
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
 
 import de.frajul.endlessroll.R;
 import de.frajul.endlessroll.entities.textures.Texture;
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/textures/TexturePack.java b/app/src/main/java/de/frajul/endlessroll/entities/textures/TexturePack.java
index 404ee29..be00a10 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/textures/TexturePack.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/textures/TexturePack.java
@@ -8,7 +8,7 @@
 package de.frajul.endlessroll.entities.textures;
 
 import android.content.Context;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
 
 import de.frajul.endlessroll.R;
 import de.frajul.endlessroll.entities.shapes.PlayerShape;
diff --git a/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java b/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
index dcf826d..87ceffb 100644
--- a/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
+++ b/app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
@@ -7,8 +7,8 @@
 
 package de.frajul.endlessroll.entities.tools;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/app/src/main/java/de/frajul/endlessroll/levels/worlds/World.java b/app/src/main/java/de/frajul/endlessroll/levels/worlds/World.java
index 2972e0d..2dd6713 100644
--- a/app/src/main/java/de/frajul/endlessroll/levels/worlds/World.java
+++ b/app/src/main/java/de/frajul/endlessroll/levels/worlds/World.java
@@ -7,7 +7,7 @@
 
 package de.frajul.endlessroll.levels.worlds;
 
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/main/java/de/frajul/endlessroll/main/physics/Physics.java b/app/src/main/java/de/frajul/endlessroll/main/physics/Physics.java
index 608513f..fe11597 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/physics/Physics.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/physics/Physics.java
@@ -7,7 +7,7 @@
 
 package de.frajul.endlessroll.main.physics;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java
index ddd18ee..bc4a163 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java
@@ -7,7 +7,7 @@
 
 package de.frajul.endlessroll.main.screens;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.ViewGroup;
 
 import de.frajul.endlessroll.main.GameActivity;
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/Screen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/Screen.java
index 4e66cc4..ab36fd8 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/Screen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/Screen.java
@@ -8,8 +8,8 @@
 package de.frajul.endlessroll.main.screens;
 
 import android.content.Context;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
index fe3bde9..d4aea55 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
@@ -7,7 +7,7 @@
 
 package de.frajul.endlessroll.main.screens;
 
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
index 069a751..bc699e1 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
@@ -8,7 +8,7 @@
 package de.frajul.endlessroll.main.screens;
 
 import android.graphics.Typeface;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
@@ -19,7 +19,6 @@ import de.frajul.endlessroll.R;
 import de.frajul.endlessroll.main.GameActivity;
 import de.frajul.endlessroll.main.MyGlSurfaceView;
 import de.frajul.endlessroll.main.game.StartScene;
-import de.frajul.endlessroll.sqlDatabase.MyDatabase;
 import de.frajul.endlessroll.views.ConfirmDialog;
 import de.frajul.endlessroll.views.DevToolsDialog;
 
diff --git a/app/src/main/java/de/frajul/endlessroll/main/tutorial/BreakPoint.java b/app/src/main/java/de/frajul/endlessroll/main/tutorial/BreakPoint.java
index 1d45b64..24be58a 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/tutorial/BreakPoint.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/tutorial/BreakPoint.java
@@ -7,8 +7,8 @@
 
 package de.frajul.endlessroll.main.tutorial;
 
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
 
 /**
  * Created by Julian on 14.03.2017.
diff --git a/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java b/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java
index 8f37440..c1432f5 100644
--- a/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java
+++ b/app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java
@@ -10,7 +10,7 @@ package de.frajul.endlessroll.sounds;
 import android.content.Context;
 import android.media.AudioManager;
 import android.media.SoundPool;
-import android.support.annotation.RawRes;
+import androidx.annotation.RawRes;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/de/frajul/endlessroll/views/BountyMessage.java b/app/src/main/java/de/frajul/endlessroll/views/BountyMessage.java
index f7ba55e..3921012 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/BountyMessage.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/BountyMessage.java
@@ -8,9 +8,9 @@
 package de.frajul.endlessroll.views;
 
 import android.content.Context;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/app/src/main/java/de/frajul/endlessroll/views/ConfirmDialog.java b/app/src/main/java/de/frajul/endlessroll/views/ConfirmDialog.java
index 5d10efc..6399fd0 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/ConfirmDialog.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/ConfirmDialog.java
@@ -9,7 +9,7 @@ package de.frajul.endlessroll.views;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 import android.view.Window;
 import android.widget.Button;
diff --git a/app/src/main/java/de/frajul/endlessroll/views/CreditsDialog.java b/app/src/main/java/de/frajul/endlessroll/views/CreditsDialog.java
index e8e9597..35df895 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/CreditsDialog.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/CreditsDialog.java
@@ -10,7 +10,7 @@ package de.frajul.endlessroll.views;
 import android.animation.ObjectAnimator;
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
diff --git a/app/src/main/java/de/frajul/endlessroll/views/DevToolsDialog.java b/app/src/main/java/de/frajul/endlessroll/views/DevToolsDialog.java
index d0dc01b..ba5ed8d 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/DevToolsDialog.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/DevToolsDialog.java
@@ -7,22 +7,13 @@
 
 package de.frajul.endlessroll.views;
 
-import android.animation.ObjectAnimator;
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.view.MotionEvent;
+import androidx.annotation.IdRes;
+
 import android.view.View;
 import android.view.Window;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.view.animation.LinearInterpolator;
 import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import java.util.concurrent.locks.ReentrantLock;
 
 import de.frajul.endlessroll.R;
 import de.frajul.endlessroll.main.GameActivity;
diff --git a/app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java b/app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java
index e17dbcb..90c4d07 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java
@@ -7,7 +7,7 @@
 
 package de.frajul.endlessroll.views;
 
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
diff --git a/app/src/main/java/de/frajul/endlessroll/views/LevelButton.java b/app/src/main/java/de/frajul/endlessroll/views/LevelButton.java
index 97455d3..fa79f06 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/LevelButton.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/LevelButton.java
@@ -7,7 +7,7 @@
 
 package de.frajul.endlessroll.views;
 
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/app/src/main/java/de/frajul/endlessroll/views/PriceButton.java b/app/src/main/java/de/frajul/endlessroll/views/PriceButton.java
index df82152..eed5d66 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/PriceButton.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/PriceButton.java
@@ -9,8 +9,8 @@ package de.frajul.endlessroll.views;
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
 import android.view.View;
 import android.view.animation.Animation;
 import android.widget.ImageView;
diff --git a/gradle.properties b/gradle.properties
index 254649d..457b93a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,5 +18,7 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableJetifier=true
 android.nonFinalResIds=false
-android.nonTransitiveRClass=false
\ No newline at end of file
+android.nonTransitiveRClass=false
+android.useAndroidX=true
\ No newline at end of file
diff --git a/particlelab/build.gradle b/particlelab/build.gradle
index 5b65370..5108896 100644
--- a/particlelab/build.gradle
+++ b/particlelab/build.gradle
@@ -30,5 +30,5 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
 }