diff --git a/app/src/main/res/layout/activity_choose_exercise.xml b/app/src/main/res/layout/activity_choose_exercise.xml
index 466943d..46c9169 100644
--- a/app/src/main/res/layout/activity_choose_exercise.xml
+++ b/app/src/main/res/layout/activity_choose_exercise.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,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <android.support.design.chip.ChipGroup
+        <com.google.android.material.chip.ChipGroup
             android:id="@+id/layout_filter_buttons"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
@@ -35,7 +35,7 @@
         android:layout_gravity="center"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
-        android:drawableStart="@drawable/ic_alarm_black"
+        android:drawableStart="@drawable/ic_alarm_24"
         android:gravity="center"
         android:text="@string/exercise_time"
         android:textColor="@color/black"
@@ -46,7 +46,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/h_scroll_filter_buttons" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/exercise_list"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -61,4 +61,4 @@
         app:layout_constraintVertical_bias="0.0"
         tools:listitem="@layout/layout_exercise_grid_item" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_edit_exercise_set.xml b/app/src/main/res/layout/activity_edit_exercise_set.xml
index 4ab2d4a..d7e7128 100644
--- a/app/src/main/res/layout/activity_edit_exercise_set.xml
+++ b/app/src/main/res/layout/activity_edit_exercise_set.xml
@@ -1,28 +1,28 @@
 <?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"
     android:fitsSystemWindows="true">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:fitsSystemWindows="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <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.ActionBar">
 
-        <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="@color/colorPrimary"/>
+            android:background="?colorPrimary"/>
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -53,7 +53,7 @@
               android:layout_marginBottom="8dp"
               android:layout_marginEnd="8dp"
               android:layout_marginTop="8dp"
-              android:drawableStart="@drawable/ic_alarm_white"
+              android:drawableStart="@drawable/ic_alarm_24"
               android:gravity="center"
               android:text="@string/exercise_time"
               android:textColor="@color/white"
@@ -63,17 +63,17 @@
               app:layout_constraintEnd_toEndOf="parent"
               app:layout_constraintTop_toTopOf="parent" />
 
-      </android.support.constraint.ConstraintLayout>
+      </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/exercise_list"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -85,7 +85,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.0">
 
-        </android.support.v7.widget.RecyclerView>
+        </androidx.recyclerview.widget.RecyclerView>
 
         <ProgressBar
             android:id="@+id/loading_spinner"
@@ -98,10 +98,11 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/add_button"
+        style="@style/AppTheme.FAB"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
@@ -111,8 +112,8 @@
         android:onClick="onClick"
         app:fabSize="normal"
         android:layout_gravity="bottom|end"
-        app:srcCompat="@drawable/ic_edit_white_24dp" />
+        app:srcCompat="@drawable/ic_edit_24" />
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_exercise.xml b/app/src/main/res/layout/activity_exercise.xml
index 157adf9..d4173a0 100644
--- a/app/src/main/res/layout/activity_exercise.xml
+++ b/app/src/main/res/layout/activity_exercise.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:id="@+id/main_content"
@@ -20,11 +20,11 @@
         android:hapticFeedbackEnabled="true"
         android:onClick="onClick"
         android:scaleType="fitXY"
-        android:tint="@color/colorPrimary"
+        android:tint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:srcCompat="@drawable/ic_play_arrow_black" />
+        app:srcCompat="@drawable/ic_play_arrow_48" />
 
     <ImageButton
         android:id="@+id/button_next"
@@ -39,11 +39,11 @@
         android:hapticFeedbackEnabled="true"
         android:onClick="onClick"
         android:scaleType="fitXY"
-        android:tint="@color/colorPrimary"
+        android:tint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:srcCompat="@drawable/ic_skip_next_black_48dp"
+        app:srcCompat="@drawable/ic_skip_next_48"
         app:layout_constraintHorizontal_bias="0.6666" />
 
     <ImageButton
@@ -59,11 +59,11 @@
         android:hapticFeedbackEnabled="true"
         android:onClick="onClick"
         android:scaleType="fitXY"
-        android:tint="@color/colorPrimary"
+        android:tint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:srcCompat="@drawable/ic_skip_previous_black_48dp"
+        app:srcCompat="@drawable/ic_skip_previous_48"
         app:layout_constraintHorizontal_bias="0.3333" />
 
     <ImageButton
@@ -80,12 +80,12 @@
         android:hapticFeedbackEnabled="true"
         android:onClick="onClick"
         android:scaleType="fitXY"
-        android:tint="@color/middlegrey"
+        android:tint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_bias="0.8333"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:srcCompat="@drawable/ic_repeat_black_48dp" />
+        app:srcCompat="@drawable/ic_repeat_48" />
 
     <ImageButton
         android:id="@+id/button_continuous"
@@ -101,14 +101,14 @@
         android:hapticFeedbackEnabled="true"
         android:onClick="onClick"
         android:scaleType="fitXY"
-        android:tint="@color/middlegrey"
+        android:tint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_bias="0.1666"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:srcCompat="@drawable/ic_update_black_40dp" />
+        app:srcCompat="@drawable/ic_update_40" />
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/exercise_layout"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -150,14 +150,14 @@
                 android:gravity="center"
                 android:text="00:00"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                android:textColor="@color/colorPrimaryDark"
+                android:textColor="?colorAccent"
                 android:textSize="20sp"
                 android:textStyle="bold" />
 
 
         </RelativeLayout>
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/exercise_image_container"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -191,17 +191,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
                 android:layout_marginTop="8dp"
                 android:padding="4dp"
                 android:background="?android:selectableItemBackgroundBorderless"
                 android:hapticFeedbackEnabled="true"
+                android:tint="?colorControlNormal"
                 app:layout_constraintRight_toRightOf="@+id/exercise_image"
                 app:layout_constraintTop_toTopOf="@+id/exercise_image"
-                app:srcCompat="@drawable/ic_about"
-                android:tint="@color/black"/>
+                app:srcCompat="@drawable/ic_about"/>
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <TextView
             android:id="@+id/execution_title"
@@ -241,7 +240,7 @@
             app:layout_constraintLeft_toLeftOf="@+id/description_title"
             app:layout_constraintTop_toBottomOf="@+id/description_title" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/section_card"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -264,7 +263,7 @@
                 android:gravity="center"
                 android:text="Neck, Arms"
                 android:textColor="@color/white" />
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
         <TextView
             android:id="@+id/exercise_name"
@@ -284,9 +283,9 @@
             app:layout_constraintTop_toBottomOf="@+id/section_card" />
 
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bigProgressBarLayout"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -331,7 +330,7 @@
             android:text="00:00"
             android:textAlignment="center"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
-            android:textColor="@color/colorPrimaryDark"
+            android:textColor="?colorPrimary"
             android:textSize="36sp"
             android:textStyle="bold"
             android:visibility="visible"
@@ -339,6 +338,6 @@
             app:layout_constraintLeft_toLeftOf="@+id/progressBarBig"
             app:layout_constraintRight_toRightOf="@+id/progressBarBig"
             app:layout_constraintTop_toTopOf="@+id/progressBarBig" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index 985f85a..55aa23d 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
+<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"
@@ -9,7 +9,7 @@
     android:layout_height="match_parent"
     tools:openDrawer="start">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
@@ -37,9 +37,9 @@
 
         </LinearLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         tools:visibility="gone"
         android:layout_width="wrap_content"
@@ -49,4 +49,4 @@
         app:headerLayout="@layout/nav_header"
         app:menu="@menu/nav_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_manage_exercise_set.xml b/app/src/main/res/layout/activity_manage_exercise_set.xml
index c8d4530..1431cbc 100644
--- a/app/src/main/res/layout/activity_manage_exercise_set.xml
+++ b/app/src/main/res/layout/activity_manage_exercise_set.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"
@@ -8,7 +8,7 @@
     android:fitsSystemWindows="true"
     tools:openDrawer="start">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinator_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -16,7 +16,7 @@
 
         <include layout="@layout/layout_toolbar"/>
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:id="@+id/main_content"
@@ -46,7 +46,7 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/exercise_set_list"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -59,11 +59,11 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintVertical_bias="0.0">
 
-            </android.support.v7.widget.RecyclerView>
+            </androidx.recyclerview.widget.RecyclerView>
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/add_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -74,11 +74,11 @@
             android:clickable="true"
             android:onClick="onClick"
             app:fabSize="normal"
-            app:srcCompat="@drawable/ic_add_white_24dp" />
+            app:srcCompat="@drawable/ic_add_24" />
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         tools:visibility="gone"
         android:layout_width="wrap_content"
@@ -88,4 +88,4 @@
         app:headerLayout="@layout/nav_header"
         app:menu="@menu/nav_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 006b4d0..41235bd 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.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"
@@ -8,14 +8,14 @@
     android:fitsSystemWindows="true"
     tools:openDrawer="start">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context="org.secuso.aktivpause.activities.EditExerciseSetActivity">
 
         <include layout="@layout/layout_toolbar"/>
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:id="@+id/main_content"
@@ -64,11 +64,11 @@
             </LinearLayout>
 
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         tools:visibility="gone"
         android:layout_width="wrap_content"
@@ -78,4 +78,4 @@
         app:headerLayout="@layout/nav_header"
         app:menu="@menu/nav_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_timer.xml b/app/src/main/res/layout/activity_timer.xml
index d2ba8e8..d09d360 100644
--- a/app/src/main/res/layout/activity_timer.xml
+++ b/app/src/main/res/layout/activity_timer.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"
@@ -8,7 +8,7 @@
     android:fitsSystemWindows="true"
     tools:openDrawer="start">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fitsSystemWindows="true"
@@ -16,7 +16,7 @@
 
         <include layout="@layout/layout_toolbar"/>
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/main_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -25,7 +25,7 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:context="org.secuso.aktivpause.activities.TimerActivity">
 
-            <android.support.v7.widget.AppCompatSpinner
+            <androidx.appcompat.widget.AppCompatSpinner
                 android:id="@+id/spinner_choose_exercise_set"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:divider="@color/colorAccent"
+                        android:divider="?colorAccent"
                         android:dividerPadding="4dp"
                         android:gravity="center"
                         android:orientation="horizontal"
@@ -113,7 +113,7 @@
                             android:layout_marginEnd="-2dp"
                             android:layout_marginStart="-3dp"
                             android:text=":"
-                            android:textColor="@color/colorAccent"
+                            android:textColor="?colorAccent"
                             android:textSize="@dimen/picker_selected_text_size"
                             android:textStyle="bold"
                             android:theme="@style/AppTheme.NumberPicker" />
@@ -141,7 +141,7 @@
                             android:layout_marginEnd="-2dp"
                             android:layout_marginStart="-3dp"
                             android:text=":"
-                            android:textColor="@color/colorAccent"
+                            android:textColor="?colorAccent"
                             android:textSize="@dimen/picker_selected_text_size"
                             android:textStyle="bold"
                             android:theme="@style/AppTheme.NumberPicker" />
@@ -177,7 +177,7 @@
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:divider="@color/colorAccent"
+                        android:divider="?colorAccent"
                         android:dividerPadding="4dp"
                         android:gravity="center"
                         android:orientation="horizontal"
@@ -208,7 +208,7 @@
                             android:layout_marginEnd="-2dp"
                             android:layout_marginStart="-3dp"
                             android:text=":"
-                            android:textColor="@color/colorAccent"
+                            android:textColor="?colorAccent"
                             android:textSize="@dimen/picker_selected_text_size"
                             android:textStyle="bold"
                             android:theme="@style/AppTheme.NumberPicker" />
@@ -237,8 +237,8 @@
             <ProgressBar
                 android:id="@+id/progressBar"
                 style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="0dp"
-                android:layout_height="260dp"
+                android:layout_width="300dp"
+                android:layout_height="300dp"
                 android:layout_centerHorizontal="true"
                 android:layout_marginBottom="0dp"
                 android:layout_marginEnd="0dp"
@@ -269,8 +269,8 @@
                 android:gravity="center"
                 android:text="00:00:00"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                android:textColor="@color/colorPrimaryDark"
-                android:textSize="36sp"
+                android:textColor="?colorPrimary"
+                android:textSize="32sp"
                 android:textStyle="bold"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="@+id/progressBar"
@@ -288,11 +288,11 @@
                 android:background="?android:selectableItemBackgroundBorderless"
                 android:hapticFeedbackEnabled="true"
                 android:onClick="onClick"
-                android:tint="@color/darkblue"
+                android:tint="?colorAccent"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
-                app:srcCompat="@drawable/ic_replay_black_48dp" />
+                app:srcCompat="@drawable/ic_replay_48" />
 
             <ImageButton
                 android:id="@+id/button_playPause"
@@ -305,18 +305,18 @@
                 android:hapticFeedbackEnabled="true"
                 android:onClick="onClick"
                 android:scaleType="fitXY"
-                android:tint="@color/darkblue"
+                android:tint="?colorAccent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:srcCompat="@drawable/ic_play_arrow_black" />
+                app:srcCompat="@drawable/ic_play_arrow_48" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         tools:visibility="gone"
         android:layout_width="wrap_content"
@@ -326,4 +326,4 @@
         app:headerLayout="@layout/nav_header"
         app:menu="@menu/nav_drawer" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_tutorial.xml b/app/src/main/res/layout/activity_tutorial.xml
index 6a58d17..a5b4c85 100644
--- a/app/src/main/res/layout/activity_tutorial.xml
+++ b/app/src/main/res/layout/activity_tutorial.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:showIn="@layout/activity_tutorial">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/dialog_add_exercise_set.xml b/app/src/main/res/layout/dialog_add_exercise_set.xml
index 2b2366e..9c12f22 100644
--- a/app/src/main/res/layout/dialog_add_exercise_set.xml
+++ b/app/src/main/res/layout/dialog_add_exercise_set.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<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"
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
@@ -19,12 +19,12 @@
         app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="8dp">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/dialog_add_exercise_set_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/dialog_add_exercise_set_name"/>
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-</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/dialog_exercise.xml b/app/src/main/res/layout/dialog_exercise.xml
index 747b5dd..761df08 100644
--- a/app/src/main/res/layout/dialog_exercise.xml
+++ b/app/src/main/res/layout/dialog_exercise.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"
@@ -84,7 +84,7 @@
         app:layout_constraintTop_toBottomOf="@+id/description_title"
         app:layout_constraintVertical_bias="0.0" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/section_card"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -109,6 +109,6 @@
             android:gravity="center"
             android:text="Neck, Arms"
             android:textColor="@color/white" />
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-</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/layout_exercise_grid_item.xml b/app/src/main/res/layout/layout_exercise_grid_item.xml
index d03b7be..9629a18 100644
--- a/app/src/main/res/layout/layout_exercise_grid_item.xml
+++ b/app/src/main/res/layout/layout_exercise_grid_item.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"
     android:id="@+id/exercise_layout"
     android:layout_width="match_parent"
@@ -48,4 +48,4 @@
         app:layout_constraintBottom_toBottomOf="@+id/exercise_image"
         app:layout_constraintRight_toRightOf="@+id/exercise_image" />
 
-</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/layout_exercise_set.xml b/app/src/main/res/layout/layout_exercise_set.xml
index a92bac8..382523f 100644
--- a/app/src/main/res/layout/layout_exercise_set.xml
+++ b/app/src/main/res/layout/layout_exercise_set.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"
@@ -7,7 +7,7 @@
     android:layout_margin="0dp"
     android:padding="0dp">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/exercise_set_card"
         android:longClickable="true"
         android:clickable="true"
@@ -20,12 +20,13 @@
         android:visibility="visible"
         app:cardCornerRadius="2dp"
         app:cardElevation="4dp"
+        android:backgroundTint="?backgroundColor"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -50,11 +51,11 @@
                 android:layout_marginTop="8dp"
                 android:background="?android:selectableItemBackgroundBorderless"
                 android:hapticFeedbackEnabled="true"
-                android:tint="@color/colorAccent"
+                android:tint="?colorAccent"
                 android:visibility="gone"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_mode_edit_black_24dp" />
+                app:srcCompat="@drawable/ic_edit_24" />
 
             <TextView
                 android:id="@+id/exercise_set_time_short"
@@ -63,9 +64,8 @@
                 android:layout_gravity="center"
                 android:layout_marginEnd="8dp"
                 android:layout_marginTop="8dp"
-                android:drawableStart="@drawable/ic_alarm_black"
+                android:drawableStart="@drawable/ic_alarm_24"
                 android:gravity="center"
-                android:textColor="@color/black"
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -91,7 +91,6 @@
                 android:layout_marginRight="8dp"
                 android:layout_marginTop="8dp"
                 android:text="@string/set_contains_no_exercises"
-                android:textColor="@color/black"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintHorizontal_bias="0.0"
@@ -117,7 +116,7 @@
 
             </LinearLayout>
 
-        </android.support.constraint.ConstraintLayout>
-    </android.support.v7.widget.CardView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
 
-</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/layout_section_filter_button.xml b/app/src/main/res/layout/layout_section_filter_button.xml
index 9d29f88..96b849f 100644
--- a/app/src/main/res/layout/layout_section_filter_button.xml
+++ b/app/src/main/res/layout/layout_section_filter_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.chip.Chip
+<com.google.android.material.chip.Chip
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/button"
diff --git a/app/src/main/res/layout/layout_toolbar.xml b/app/src/main/res/layout/layout_toolbar.xml
index 95f6bc6..96c7132 100644
--- a/app/src/main/res/layout/layout_toolbar.xml
+++ b/app/src/main/res/layout/layout_toolbar.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout
+<com.google.android.material.appbar.AppBarLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:theme="@style/AppTheme.ActionBar">
-    <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="@color/colorPrimary" />
+        android:background="?colorPrimary" />
 
-</android.support.design.widget.AppBarLayout>
\ No newline at end of file
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
index b6b2296..d85d6e1 100644
--- a/app/src/main/res/layout/nav_header.xml
+++ b/app/src/main/res/layout/nav_header.xml
@@ -2,17 +2,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
-    android:background="@color/colorAccent"
+    android:background="?colorAccent"
     android:gravity="bottom"
     android:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark">
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="#ffffff"
+        android:background="?backgroundColor"
         android:paddingTop="7dp"
         android:paddingBottom="7dp"
         android:orientation="horizontal">
@@ -29,7 +28,7 @@
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/activity_horizontal_margin"
             android:text="@string/app_name_short"
-            android:textColor="@color/colorPrimary"
+            android:textColor="?colorPrimary"
             android:textSize="18sp"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/tutorial_slide1.xml b/app/src/main/res/layout/tutorial_slide1.xml
index 6b79a07..aebf28b 100644
--- a/app/src/main/res/layout/tutorial_slide1.xml
+++ b/app/src/main/res/layout/tutorial_slide1.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorAccent">
+    android:background="@color/colorDarkAccent">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/tutorial_slide2.xml b/app/src/main/res/layout/tutorial_slide2.xml
index 275dcd9..f678f3a 100644
--- a/app/src/main/res/layout/tutorial_slide2.xml
+++ b/app/src/main/res/layout/tutorial_slide2.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorAccent">
+    android:background="@color/colorDarkAccent">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/tutorial_slide3.xml b/app/src/main/res/layout/tutorial_slide3.xml
index 52f82d4..2b1c88f 100644
--- a/app/src/main/res/layout/tutorial_slide3.xml
+++ b/app/src/main/res/layout/tutorial_slide3.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorAccent">
+    android:background="@color/colorDarkAccent">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/tutorial_slide4.xml b/app/src/main/res/layout/tutorial_slide4.xml
index 70414ca..8228e60 100644
--- a/app/src/main/res/layout/tutorial_slide4.xml
+++ b/app/src/main/res/layout/tutorial_slide4.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorAccent">
+    android:background="@color/colorDarkAccent">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/tutorial_slide5.xml b/app/src/main/res/layout/tutorial_slide5.xml
index 53227e8..377df0f 100644
--- a/app/src/main/res/layout/tutorial_slide5.xml
+++ b/app/src/main/res/layout/tutorial_slide5.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorAccent">
+    android:background="@color/colorDarkAccent">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/tutorial_slide6.xml b/app/src/main/res/layout/tutorial_slide6.xml
index 8029bd4..0af9f6c 100644
--- a/app/src/main/res/layout/tutorial_slide6.xml
+++ b/app/src/main/res/layout/tutorial_slide6.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorAccent">
+    android:background="@color/colorDarkAccent">
 
     <LinearLayout
         android:layout_width="wrap_content"