diff --git a/app/build.gradle b/app/build.gradle
index 43f8195..490c42a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,27 +1,24 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.2'
+    compileSdkVersion 33
     defaultConfig {
         applicationId "de.hampager.dapnetmobile"
-        minSdkVersion 15
-        targetSdkVersion 27
+        minSdkVersion 21
+        targetSdkVersion 33
         versionCode 25
         versionName "1.2.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
             shrinkResources false
             minifyEnabled false
-            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
         debug {
             minifyEnabled false
-            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
         }
@@ -37,17 +34,16 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'org.osmdroid:osmdroid-android:6.0.2'
     implementation 'com.github.MKergall:osmbonuspack:6.5.2'
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:recyclerview-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation 'com.splitwise:tokenautocomplete:2.0.8@aar'
-    //implementation "com.splitwise:tokenautocomplete:3.0.1@aar"
-    implementation 'com.android.support:support-v4:27.1.1'
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.github.DecentralizedAmateurPagingNetwork:DAP4J:1.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
-}
\ No newline at end of file
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fb817df..f8f2452 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,8 @@
         android:screenOrientation="portrait"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar">
-        <activity android:name=".activites.SplashActivity">
+        <activity android:name=".activites.SplashActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -31,7 +32,8 @@
         <activity
             android:name=".activites.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -46,7 +48,8 @@
         <activity
             android:name=".activites.LoginActivity"
             android:label="@string/title_activity_login"
-            android:parentActivityName=".activites.MainActivity">
+            android:parentActivityName=".activites.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
diff --git a/app/src/main/java/de/hampager/dapnetmobile/DAPNETApp.java b/app/src/main/java/de/hampager/dapnetmobile/DAPNETApp.java
index 064611c..bb6bcc9 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/DAPNETApp.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/DAPNETApp.java
@@ -4,21 +4,13 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.squareup.leakcanary.LeakCanary;
-
 import de.hampager.dap4j.DapnetSingleton;
 
 public class DAPNETApp extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return;
-        }
-        //LeakCanary.install(this);
-        // Normal app init code...
+
         SharedPreferences sharedPref = getSharedPreferences("sharedPref", Context.MODE_PRIVATE);
         String url = sharedPref.getString("server", getResources().getString(R.string.ClearNetURL));
         String user = sharedPref.getString("user", "");
diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java
index 7c70d91..4fc6ed6 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java
@@ -8,9 +8,9 @@
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TextInputEditText;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputEditText;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Patterns;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java
index 52fc8da..516e77c 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java
@@ -6,15 +6,15 @@
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java
index c9446f5..8c26fb0 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java
@@ -4,20 +4,18 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TextInputEditText;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputEditText;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.InputType;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java
index 5070bb7..a99e1ff 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java
@@ -4,8 +4,8 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java
index 388d876..24d181b 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java
@@ -3,15 +3,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import java.util.Timer;
 import java.util.TimerTask;
 
 import de.hampager.dapnetmobile.R;
-import de.hampager.dapnetmobile.fragments.PrivacyFragment;
-import de.hampager.dapnetmobile.fragments.WelcomeFragment;
 
 /**
  * SplashActivity : displays app logo upon startup.
diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java
index 33ae072..6fb6c17 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java
@@ -1,8 +1,8 @@
 package de.hampager.dapnetmobile.adapters;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java
index 20adcf8..1c1c6a4 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java
index b34228e..e447006 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java
index a87b801..51c6acc 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java
index 26f83c6..490597c 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java
index 81451b3..44dbbae 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java
index 6658db1..8ea2231 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java
index af3ea21..816238c 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java
index 47de468..87a4593 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java
index 4969e9e..8ab1dec 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java
@@ -3,13 +3,13 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.core.view.MenuItemCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java
index 260ad94..1ade009 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.text.Html;
 import android.util.Log;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java
index 2b131a1..7038ad6 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java
@@ -7,10 +7,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java
index 3a64e8e..6dc48bd 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java
index 42494b1..4c68596 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java
@@ -2,13 +2,13 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java
index a3d8d34..fea891e 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java
@@ -3,15 +3,14 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
diff --git a/app/src/main/java/de/hampager/dapnetmobile/listeners/CustomOnItemSelectedListener.java b/app/src/main/java/de/hampager/dapnetmobile/listeners/CustomOnItemSelectedListener.java
index a90c7b9..1a06b77 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/listeners/CustomOnItemSelectedListener.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/listeners/CustomOnItemSelectedListener.java
@@ -1,6 +1,6 @@
 package de.hampager.dapnetmobile.listeners;
 
-import android.support.design.widget.TextInputLayout;
+import com.google.android.material.textfield.TextInputLayout;
 import android.view.View;
 import android.widget.AdapterView;
 
diff --git a/app/src/main/java/de/hampager/dapnetmobile/tokenautocomplete/TokenTextView.java b/app/src/main/java/de/hampager/dapnetmobile/tokenautocomplete/TokenTextView.java
index a7f57e0..f556c13 100644
--- a/app/src/main/java/de/hampager/dapnetmobile/tokenautocomplete/TokenTextView.java
+++ b/app/src/main/java/de/hampager/dapnetmobile/tokenautocomplete/TokenTextView.java
@@ -1,7 +1,7 @@
 package de.hampager.dapnetmobile.tokenautocomplete;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
 public class TokenTextView extends AppCompatTextView {
diff --git a/app/src/main/res/layout-sw720dp/activity_main.xml b/app/src/main/res/layout-sw720dp/activity_main.xml
index 79568d9..166309c 100644
--- a/app/src/main/res/layout-sw720dp/activity_main.xml
+++ b/app/src/main/res/layout-sw720dp/activity_main.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/drawer_layout"
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
         tools:openDrawer="start">
-        <android.support.design.widget.NavigationView
+        <com.google.android.material.navigation.NavigationView
             android:id="@+id/nav_view"
             android:layout_width="240dp"
             android:layout_height="match_parent"
@@ -20,7 +20,7 @@
             app:headerLayout="@layout/nav_header_main"
             app:menu="@menu/activity_main_drawer" />
 
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
     <FrameLayout
         android:id="@+id/content_frame"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 0a0f074..cdd5130 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -35,30 +35,30 @@
                 android:contentDescription="@string/rwth_afu_dapnet_logo_desc"
                 app:srcCompat="@mipmap/ic_afu_dapnet_logo" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/usertextinput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:hint="@string/prompt_user">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/user"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="text|textNoSuggestions|textFilter"
                     android:maxLines="1" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/passwordtextinput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 app:passwordToggleEnabled="true">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/password"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
                     android:inputType="textPassword"
                     android:maxLines="1" />
                 <!--android:imeActionId="@+id/login"-->
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <Spinner
                 android:id="@+id/spinner"
@@ -78,7 +78,7 @@
                 android:entries="@array/server_array"
                 android:prompt="@string/server_prompt" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/servertextinput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -86,13 +86,13 @@
                 android:inputType="textUri"
                 android:visibility="gone">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/server"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:maxLines="1"
                     android:text="@string/default_url_prefix" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <Button
                 android:id="@+id/user_sign_in_button"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ed8f4d7..083da45 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -20,7 +20,7 @@
         android:layout_height="match_parent" />
     </FrameLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -29,4 +29,4 @@
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/activity_main_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_post_call.xml b/app/src/main/res/layout/activity_post_call.xml
index b02ac31..4b456d2 100644
--- a/app/src/main/res/layout/activity_post_call.xml
+++ b/app/src/main/res/layout/activity_post_call.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
@@ -12,7 +12,7 @@
         android:layout_margin="16dp"
         android:orientation="vertical">
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/til_postcalltext"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
             app:counterEnabled="true"
             app:counterMaxLength="80">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/post_call_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -33,7 +33,7 @@
                 android:maxLines="3"
                 android:minLines="2"
                 android:scrollbars="vertical" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <!--
         <EditText
@@ -98,4 +98,4 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 94324b5..46b10f6 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -18,4 +18,4 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_dapnet_logo" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 9f91b34..90e01e1 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="de.hampager.dapnetmobile.activites.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include
         android:id="@+id/include"
@@ -43,4 +43,4 @@
         app:srcCompat="@mipmap/ic_radiotower_green" />
         -->
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_call.xml b/app/src/main/res/layout/fragment_call.xml
index 66ffe81..91b10e7 100644
--- a/app/src/main/res/layout/fragment_call.xml
+++ b/app/src/main/res/layout/fragment_call.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/swipeRefreshCalls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/item_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         app:reverseLayout="true"
         app:stackFromEnd="true" />
-</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_call_item_row.xml b/app/src/main/res/layout/fragment_call_item_row.xml
index f406178..72a0082 100644
--- a/app/src/main/res/layout/fragment_call_item_row.xml
+++ b/app/src/main/res/layout/fragment_call_item_row.xml
@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -102,6 +102,6 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
 
 
diff --git a/app/src/main/res/layout/fragment_table.xml b/app/src/main/res/layout/fragment_table.xml
index 66ffe81..91b10e7 100644
--- a/app/src/main/res/layout/fragment_table.xml
+++ b/app/src/main/res/layout/fragment_table.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/swipeRefreshCalls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/item_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         app:reverseLayout="true"
         app:stackFromEnd="true" />
-</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_table_item_row.xml b/app/src/main/res/layout/fragment_table_item_row.xml
index 95350ba..1df52f6 100644
--- a/app/src/main/res/layout/fragment_table_item_row.xml
+++ b/app/src/main/res/layout/fragment_table_item_row.xml
@@ -1,4 +1,4 @@
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -113,6 +113,6 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
 
 
diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index b354ca2..3932d8d 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -1,4 +1,4 @@
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -48,7 +48,7 @@
         app:layout_constraintStart_toEndOf="@+id/welcome_statslist"
         app:layout_constraintTop_toBottomOf="@+id/logo_imageview" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/welcome_statslist"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -58,4 +58,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/map_container" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_welcome_item.xml b/app/src/main/res/layout/fragment_welcome_item.xml
index 9fb305f..bd53a77 100644
--- a/app/src/main/res/layout/fragment_welcome_item.xml
+++ b/app/src/main/res/layout/fragment_welcome_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -32,4 +32,4 @@
             android:text="" />
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stats_item.xml b/app/src/main/res/layout/stats_item.xml
index 39a7296..facfca7 100644
--- a/app/src/main/res/layout/stats_item.xml
+++ b/app/src/main/res/layout/stats_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="2dp">
@@ -35,4 +35,4 @@
             android:text="@string/plchldr" />
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index 27e6a07..59b73cf 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/action_search"
         android:title="@string/action_search"
-        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a03f48b..9956b83 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,15 +2,11 @@
 
 buildscript {
     repositories {
-
-        jcenter()
         mavenCentral()
-
         google()
-
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -23,8 +19,7 @@ plugins {
 }
 allprojects {
     repositories {
-        jcenter()
-
+        mavenCentral()
         google()
         maven { url "https://jitpack.io" }
     }
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 49af9c6..e3ce3df 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip