diff --git a/MeditationAssistant/build.gradle b/MeditationAssistant/build.gradle
index 7d11784..ca0e692 100644
--- a/MeditationAssistant/build.gradle
+++ b/MeditationAssistant/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
 
         versionCode 158
         versionName "1.5.8"
@@ -75,13 +75,13 @@ android {
 }
 
 dependencies {
-    implementation "com.android.support:support-compat:28.0.0"
-    implementation "com.android.support:support-core-utils:28.0.0"
-    implementation "com.android.support:support-core-ui:28.0.0"
-    implementation "com.android.support:support-media-compat:28.0.0"
-    implementation "com.android.support:support-fragment:28.0.0"
-    implementation "com.android.support:recyclerview-v7:28.0.0"
-    implementation "com.android.support:design:28.0.0"
+    implementation 'androidx.core:core:1.1.0'
+    implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
+    implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
+    implementation 'androidx.media:media:1.1.0'
+    implementation 'androidx.fragment:fragment:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation "net.openid:appauth:0.7.1"
     implementation "com.squareup.okio:okio:2.2.2"
     implementation 'com.opencsv:opencsv:4.6'
diff --git a/MeditationAssistant/src/main/AndroidManifest.xml b/MeditationAssistant/src/main/AndroidManifest.xml
index 5e3f11a..bf260db 100644
--- a/MeditationAssistant/src/main/AndroidManifest.xml
+++ b/MeditationAssistant/src/main/AndroidManifest.xml
@@ -116,7 +116,7 @@
             </intent-filter>
         </activity>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AboutActivity.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AboutActivity.java
index b848467..f7c76f9 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AboutActivity.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AboutActivity.java
@@ -6,7 +6,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.NavUtils;
+import androidx.core.app.NavUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthConfiguration.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthConfiguration.java
index 623331b..1854177 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthConfiguration.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthConfiguration.java
@@ -6,8 +6,8 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.openid.appauth.connectivity.ConnectionBuilder;
 import net.openid.appauth.connectivity.DefaultConnectionBuilder;
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthResultActivity.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthResultActivity.java
index 001d40e..d7e93c5 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthResultActivity.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthResultActivity.java
@@ -3,9 +3,9 @@ package sh.ftp.rocketninelabs.meditationassistant;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.MainThread;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import android.util.Log;
 
 import net.openid.appauth.AppAuthConfiguration;
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthStateManager.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthStateManager.java
index 725ccbe..a5a4f7e 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthStateManager.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/AuthStateManager.java
@@ -2,9 +2,9 @@ package sh.ftp.rocketninelabs.meditationassistant;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.AnyThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import net.openid.appauth.AuthState;
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/CalendarFragment.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/CalendarFragment.java
index c2609a8..90b06aa 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/CalendarFragment.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/CalendarFragment.java
@@ -3,7 +3,7 @@ package sh.ftp.rocketninelabs.meditationassistant;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/DailyReminderReceiver.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/DailyReminderReceiver.java
index bc7f905..7ac86a8 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/DailyReminderReceiver.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/DailyReminderReceiver.java
@@ -8,8 +8,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.TaskStackBuilder;
 import android.util.Log;
 
 import java.text.SimpleDateFormat;
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
index 7cb5911..3deac7d 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
@@ -28,8 +28,8 @@ import android.os.Looper;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/NumberPicker.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/NumberPicker.java
index 5983bd4..a87ffcc 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/NumberPicker.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/NumberPicker.java
@@ -1967,7 +1967,7 @@ public class NumberPicker extends LinearLayout {
     /**
      * @hide
      */
-    public static class CustomEditText extends android.support.v7.widget.AppCompatEditText {
+    public static class CustomEditText extends androidx.appcompat.widget.AppCompatEditText {
 
         public CustomEditText(Context context, AttributeSet attrs) {
             super(context, attrs);
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/ProgressActivity.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/ProgressActivity.java
index 036d557..7fbc4c5 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/ProgressActivity.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/ProgressActivity.java
@@ -3,13 +3,13 @@ package sh.ftp.rocketninelabs.meditationassistant;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.app.NavUtils;
-import android.support.v4.view.PagerTabStrip;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.core.app.NavUtils;
+import androidx.viewpager.widget.PagerTabStrip;
+import androidx.viewpager.widget.ViewPager;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SessionsFragment.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SessionsFragment.java
index 3402c62..07eac13 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SessionsFragment.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SessionsFragment.java
@@ -4,7 +4,7 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
+import androidx.fragment.app.ListFragment;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SettingsActivity.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SettingsActivity.java
index 3db4c20..351d229 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SettingsActivity.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/SettingsActivity.java
@@ -25,8 +25,8 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.RingtonePreference;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -346,8 +346,8 @@ public class SettingsActivity extends PreferenceActivity {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
-                    break;
                 }
+                break;
             }
             case PERMISSION_REQUEST_IMPORT_READ_EXTERNAL_STORAGE: {
                 if ((grantResults.length > 0
@@ -386,8 +386,8 @@ public class SettingsActivity extends PreferenceActivity {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
-                    break;
                 }
+                break;
             }
             case PERMISSION_REQUEST_EXPORT_WRITE_EXTERNAL_STORAGE: {
                 if ((grantResults.length > 0
@@ -426,8 +426,8 @@ public class SettingsActivity extends PreferenceActivity {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
-                    break;
                 }
+                break;
             }
         }
     }
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/StatsFragment.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/StatsFragment.java
index e7668f3..8095a1e 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/StatsFragment.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/StatsFragment.java
@@ -3,7 +3,7 @@ package sh.ftp.rocketninelabs.meditationassistant;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/MeditationAssistant/src/main/res/layout/activity_progress.xml b/MeditationAssistant/src/main/res/layout/activity_progress.xml
index d6b93fb..f00b491 100644
--- a/MeditationAssistant/src/main/res/layout/activity_progress.xml
+++ b/MeditationAssistant/src/main/res/layout/activity_progress.xml
@@ -11,19 +11,19 @@
         android:layout_weight="1"
         android:orientation="vertical">
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
             tools:ignore="NestedWeights">
 
-            <android.support.v4.view.PagerTabStrip
+            <androidx.viewpager.widget.PagerTabStrip
                 android:id="@+id/titles"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"/>
 
-        </android.support.v4.view.ViewPager>
+        </androidx.viewpager.widget.ViewPager>
 
     </LinearLayout>
 
diff --git a/gradle.properties b/gradle.properties
index 8899b5f..9ae6647 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,4 +13,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Thu May 28 12:58:03 PDT 2015
-org.gradle.jvmargs=-Xmx4096m -XX\:MaxPermSize\=1024m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
+android.enableJetifier=true
+android.useAndroidX=true