diff --git a/app/build.gradle b/app/build.gradle
index 5de79861..448312c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,9 @@
 apply plugin: 'com.android.application'
 
+
 android {
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion 30
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
@@ -11,7 +12,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
     }
@@ -41,15 +42,16 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.google.android.material:material:1.2.0-alpha06'
     implementation "com.google.code.gson:gson:$rootProject.gsonLibraryVersion"
-    implementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
+    implementation 'androidx.annotation:annotation:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "com.takisoft.fix:preference-v7:$rootProject.prefFixLibraryVersion"
-    implementation "com.android.support:design:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
-    implementation "com.android.support.constraint:constraint-layout:$rootProject.constraintLayoutVersion"
-    implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation "com.github.medyo:android-about-page:$rootProject.aboutPageLibraryVersion"
     implementation "com.github.iamareebjamal:jsyn:$rootProject.jsynLibraryVersion"
     implementation "com.illposed.osc:javaosc-core:$rootProject.javaOscLibraryVersion"
@@ -69,6 +71,11 @@ dependencies {
     }
     // Test
     testImplementation "junit:junit:$rootProject.junitVersion"
-    androidTestImplementation "com.android.support.test:runner:$rootProject.testRunnerRulesVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    implementation "androidx.core:core-ktx:+"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
 }
diff --git a/app/src/androidTest/java/io/neurolab/ExampleInstrumentedTest.java b/app/src/androidTest/java/io/neurolab/ExampleInstrumentedTest.java
index d248c161..467bc5bd 100644
--- a/app/src/androidTest/java/io/neurolab/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/io/neurolab/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package io.neurolab;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0d9264c2..a0987eef 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -78,7 +78,7 @@
         <activity android:name=".activities.DeviceInstructionsActivity" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="io.neurolab.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/app/src/main/java/io/neurolab/activities/AboutUsActivity.java b/app/src/main/java/io/neurolab/activities/AboutUsActivity.java
index 66db2f15..f21b7eb9 100644
--- a/app/src/main/java/io/neurolab/activities/AboutUsActivity.java
+++ b/app/src/main/java/io/neurolab/activities/AboutUsActivity.java
@@ -3,8 +3,8 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
diff --git a/app/src/main/java/io/neurolab/activities/DataLoggerActivity.java b/app/src/main/java/io/neurolab/activities/DataLoggerActivity.java
index b9782a93..a37750e7 100644
--- a/app/src/main/java/io/neurolab/activities/DataLoggerActivity.java
+++ b/app/src/main/java/io/neurolab/activities/DataLoggerActivity.java
@@ -4,9 +4,9 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/app/src/main/java/io/neurolab/activities/DeviceInstructionsActivity.java b/app/src/main/java/io/neurolab/activities/DeviceInstructionsActivity.java
index aaa99295..218e82ac 100644
--- a/app/src/main/java/io/neurolab/activities/DeviceInstructionsActivity.java
+++ b/app/src/main/java/io/neurolab/activities/DeviceInstructionsActivity.java
@@ -1,8 +1,8 @@
 package io.neurolab.activities;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import io.neurolab.R;
 
diff --git a/app/src/main/java/io/neurolab/activities/FocusParentActivity.java b/app/src/main/java/io/neurolab/activities/FocusParentActivity.java
index 6d741ff4..970e8763 100644
--- a/app/src/main/java/io/neurolab/activities/FocusParentActivity.java
+++ b/app/src/main/java/io/neurolab/activities/FocusParentActivity.java
@@ -2,8 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
 
 import io.neurolab.R;
 import io.neurolab.fragments.FocusVisualFragment;
diff --git a/app/src/main/java/io/neurolab/activities/MeditationActivity.java b/app/src/main/java/io/neurolab/activities/MeditationActivity.java
index 2f0f2bc4..35270693 100644
--- a/app/src/main/java/io/neurolab/activities/MeditationActivity.java
+++ b/app/src/main/java/io/neurolab/activities/MeditationActivity.java
@@ -3,7 +3,7 @@
 import android.annotation.TargetApi;
 import android.os.Bundle;
 import android.support.v4.media.session.PlaybackStateCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
diff --git a/app/src/main/java/io/neurolab/activities/MeditationHome.java b/app/src/main/java/io/neurolab/activities/MeditationHome.java
index 49d7d3d7..ed1cb903 100644
--- a/app/src/main/java/io/neurolab/activities/MeditationHome.java
+++ b/app/src/main/java/io/neurolab/activities/MeditationHome.java
@@ -2,8 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
 
 import io.neurolab.R;
 import io.neurolab.main.NeuroLab;
diff --git a/app/src/main/java/io/neurolab/activities/MeditationListActivity.java b/app/src/main/java/io/neurolab/activities/MeditationListActivity.java
index 39b8adcd..4253b2b5 100644
--- a/app/src/main/java/io/neurolab/activities/MeditationListActivity.java
+++ b/app/src/main/java/io/neurolab/activities/MeditationListActivity.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.TypedValue;
 
 import java.lang.reflect.Field;
diff --git a/app/src/main/java/io/neurolab/activities/MemoryGraphParent.java b/app/src/main/java/io/neurolab/activities/MemoryGraphParent.java
index 9112b538..23f249bf 100644
--- a/app/src/main/java/io/neurolab/activities/MemoryGraphParent.java
+++ b/app/src/main/java/io/neurolab/activities/MemoryGraphParent.java
@@ -1,10 +1,10 @@
 package io.neurolab.activities;
 
 import android.os.Bundle;
-import android.support.design.widget.BottomNavigationView;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 
 import io.neurolab.R;
 import io.neurolab.fragments.MemoryGraphFragment;
diff --git a/app/src/main/java/io/neurolab/activities/OnBoardingActivity.java b/app/src/main/java/io/neurolab/activities/OnBoardingActivity.java
index d3d88073..aee6e06e 100644
--- a/app/src/main/java/io/neurolab/activities/OnBoardingActivity.java
+++ b/app/src/main/java/io/neurolab/activities/OnBoardingActivity.java
@@ -3,9 +3,9 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
 import android.view.Window;
 import android.view.WindowManager;
 
diff --git a/app/src/main/java/io/neurolab/activities/PinLayoutActivity.java b/app/src/main/java/io/neurolab/activities/PinLayoutActivity.java
index e3737176..ac3f8d12 100644
--- a/app/src/main/java/io/neurolab/activities/PinLayoutActivity.java
+++ b/app/src/main/java/io/neurolab/activities/PinLayoutActivity.java
@@ -6,9 +6,9 @@
 import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.os.Bundle;
-import android.support.v4.content.res.ResourcesCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/app/src/main/java/io/neurolab/activities/ProgramModeActivity.java b/app/src/main/java/io/neurolab/activities/ProgramModeActivity.java
index b324604e..85d3ea84 100644
--- a/app/src/main/java/io/neurolab/activities/ProgramModeActivity.java
+++ b/app/src/main/java/io/neurolab/activities/ProgramModeActivity.java
@@ -2,8 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.WindowManager;
 
 import io.neurolab.R;
diff --git a/app/src/main/java/io/neurolab/activities/RelaxParentActivity.java b/app/src/main/java/io/neurolab/activities/RelaxParentActivity.java
index fbaac633..e7479c28 100644
--- a/app/src/main/java/io/neurolab/activities/RelaxParentActivity.java
+++ b/app/src/main/java/io/neurolab/activities/RelaxParentActivity.java
@@ -2,8 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.appcompat.app.AppCompatActivity;
 
 import io.neurolab.R;
 import io.neurolab.fragments.RelaxVisualFragment;
diff --git a/app/src/main/java/io/neurolab/activities/SettingsActivity.java b/app/src/main/java/io/neurolab/activities/SettingsActivity.java
index 23878ddc..bc1faa21 100644
--- a/app/src/main/java/io/neurolab/activities/SettingsActivity.java
+++ b/app/src/main/java/io/neurolab/activities/SettingsActivity.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
 
 import io.neurolab.R;
 import io.neurolab.fragments.ConfigFragment;
diff --git a/app/src/main/java/io/neurolab/activities/ShareDataActivity.java b/app/src/main/java/io/neurolab/activities/ShareDataActivity.java
index b06d234d..af2d50b8 100644
--- a/app/src/main/java/io/neurolab/activities/ShareDataActivity.java
+++ b/app/src/main/java/io/neurolab/activities/ShareDataActivity.java
@@ -8,8 +8,8 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.StrictMode;
-import android.support.v4.content.FileProvider;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.content.FileProvider;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.SparseBooleanArray;
 import android.view.View;
 import android.widget.AdapterView;
diff --git a/app/src/main/java/io/neurolab/activities/TestModeActivity.java b/app/src/main/java/io/neurolab/activities/TestModeActivity.java
index 39006fe6..13503910 100644
--- a/app/src/main/java/io/neurolab/activities/TestModeActivity.java
+++ b/app/src/main/java/io/neurolab/activities/TestModeActivity.java
@@ -8,8 +8,8 @@
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
diff --git a/app/src/main/java/io/neurolab/adapters/DataLoggerListAdapter.java b/app/src/main/java/io/neurolab/adapters/DataLoggerListAdapter.java
index 6e249041..9be7b0c1 100644
--- a/app/src/main/java/io/neurolab/adapters/DataLoggerListAdapter.java
+++ b/app/src/main/java/io/neurolab/adapters/DataLoggerListAdapter.java
@@ -5,9 +5,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/io/neurolab/adapters/MeditationListAdapter.java b/app/src/main/java/io/neurolab/adapters/MeditationListAdapter.java
index 494fb849..016b555b 100644
--- a/app/src/main/java/io/neurolab/adapters/MeditationListAdapter.java
+++ b/app/src/main/java/io/neurolab/adapters/MeditationListAdapter.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.Intent;
-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/io/neurolab/communication/bluetooth/BluetoothTestActivity.java b/app/src/main/java/io/neurolab/communication/bluetooth/BluetoothTestActivity.java
index 342e302c..41b92c48 100644
--- a/app/src/main/java/io/neurolab/communication/bluetooth/BluetoothTestActivity.java
+++ b/app/src/main/java/io/neurolab/communication/bluetooth/BluetoothTestActivity.java
@@ -8,8 +8,8 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
diff --git a/app/src/main/java/io/neurolab/fragments/ConfigFragment.java b/app/src/main/java/io/neurolab/fragments/ConfigFragment.java
index 3d4ae586..f71773be 100644
--- a/app/src/main/java/io/neurolab/fragments/ConfigFragment.java
+++ b/app/src/main/java/io/neurolab/fragments/ConfigFragment.java
@@ -2,10 +2,10 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.SwitchPreference;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 import android.widget.Toast;
 
 import io.neurolab.R;
diff --git a/app/src/main/java/io/neurolab/fragments/FocusVisualFragment.java b/app/src/main/java/io/neurolab/fragments/FocusVisualFragment.java
index b8dc10ce..c5515b00 100644
--- a/app/src/main/java/io/neurolab/fragments/FocusVisualFragment.java
+++ b/app/src/main/java/io/neurolab/fragments/FocusVisualFragment.java
@@ -14,10 +14,10 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AlertDialog;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -28,6 +28,8 @@
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import com.opencsv.CSVReader;
 import com.opencsv.exceptions.CsvValidationException;
 
@@ -52,7 +54,7 @@
 import static android.app.Activity.RESULT_OK;
 import static io.neurolab.utilities.FilePathUtil.LOG_FILE_KEY;
 
-public class FocusVisualFragment extends android.support.v4.app.Fragment {
+public class FocusVisualFragment extends Fragment {
 
     private static final int PERMISSION_REQUEST_WRITE_EXTERNAL_STORAGE_RESULT = 1;
     private boolean permission = false;
diff --git a/app/src/main/java/io/neurolab/fragments/MemoryGraphFragment.java b/app/src/main/java/io/neurolab/fragments/MemoryGraphFragment.java
index e5f2ebd4..de156996 100644
--- a/app/src/main/java/io/neurolab/fragments/MemoryGraphFragment.java
+++ b/app/src/main/java/io/neurolab/fragments/MemoryGraphFragment.java
@@ -11,11 +11,11 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java b/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java
index f3ce40b1..1587524b 100644
--- a/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java
+++ b/app/src/main/java/io/neurolab/fragments/NeuroSettingsFragment.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.KeyEvent;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
diff --git a/app/src/main/java/io/neurolab/fragments/RelaxVisualFragment.java b/app/src/main/java/io/neurolab/fragments/RelaxVisualFragment.java
index f3e912f7..880ca309 100644
--- a/app/src/main/java/io/neurolab/fragments/RelaxVisualFragment.java
+++ b/app/src/main/java/io/neurolab/fragments/RelaxVisualFragment.java
@@ -2,15 +2,17 @@
 
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.fragment.app.Fragment;
+
 import io.neurolab.R;
 import io.neurolab.tools.Animations;
 
-public class RelaxVisualFragment extends android.support.v4.app.Fragment {
+public class RelaxVisualFragment extends Fragment {
 
     public static final String RELAX_PROGRAM_FLAG = "Relax";
 
diff --git a/app/src/main/java/io/neurolab/fragments/SpectrumFragment.java b/app/src/main/java/io/neurolab/fragments/SpectrumFragment.java
index f176126b..090a0c41 100644
--- a/app/src/main/java/io/neurolab/fragments/SpectrumFragment.java
+++ b/app/src/main/java/io/neurolab/fragments/SpectrumFragment.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/app/src/main/java/io/neurolab/fragments/StatisticsFragment.java b/app/src/main/java/io/neurolab/fragments/StatisticsFragment.java
index 2a2a98c3..900446ef 100644
--- a/app/src/main/java/io/neurolab/fragments/StatisticsFragment.java
+++ b/app/src/main/java/io/neurolab/fragments/StatisticsFragment.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/io/neurolab/gui/CustomSpaceView.java b/app/src/main/java/io/neurolab/gui/CustomSpaceView.java
index 4b7a1754..c77df7b2 100644
--- a/app/src/main/java/io/neurolab/gui/CustomSpaceView.java
+++ b/app/src/main/java/io/neurolab/gui/CustomSpaceView.java
@@ -5,7 +5,7 @@
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/app/src/main/java/io/neurolab/main/NeuroLab.java b/app/src/main/java/io/neurolab/main/NeuroLab.java
index 1863e091..9dc63cea 100644
--- a/app/src/main/java/io/neurolab/main/NeuroLab.java
+++ b/app/src/main/java/io/neurolab/main/NeuroLab.java
@@ -8,27 +8,30 @@
 import android.content.IntentSender;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.v4.content.ContextCompat;
-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.CardView;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import androidx.cardview.widget.CardView;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+
 import com.felhr.usbserial.UsbSerialDevice;
 import com.felhr.usbserial.UsbSerialInterface;
+import com.google.android.material.navigation.NavigationView;
 import com.google.android.play.core.appupdate.AppUpdateInfo;
 import com.google.android.play.core.appupdate.AppUpdateManager;
 import com.google.android.play.core.appupdate.AppUpdateManagerFactory;
@@ -59,7 +62,7 @@
 
 public class NeuroLab extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener, View.OnClickListener {
-
+public  int themetype=0;
     public static final String DEV_MODE_KEY = "developerMode";
     private static final String ACTION_USB_PERMISSION = "io.neurolab.USB_PERMISSION";
     private static final String[] READ_WRITE_PERMISSIONS = {
@@ -211,6 +214,7 @@ private void checkForUpdates(AppUpdateManager appUpdateManager, Task<AppUpdateIn
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == MY_REQUEST_CODE && resultCode != RESULT_OK) {
             checkForUpdates(appUpdateManager, appUpdateInfoTask);
         }
@@ -290,6 +294,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+
         // Handle action bar item clicks here. The action bar will
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
@@ -314,10 +319,24 @@ public boolean onOptionsItemSelected(MenuItem item) {
             Intent intent = new Intent(this, PinLayoutActivity.class);
             intent.putExtra("layout", false);
             startActivity(intent);
+        } else if (id == R.id.theme_change) {
+            if(themetype==0) {
+                AppCompatDelegate.setDefaultNightMode(
+                        AppCompatDelegate.MODE_NIGHT_YES);
+                themetype=1;
+            }
+            else{
+                AppCompatDelegate.setDefaultNightMode(
+                        AppCompatDelegate.MODE_NIGHT_NO);
+                themetype=0;
+            }
         }
+
         return super.onOptionsItemSelected(item);
     }
 
+
+
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
@@ -426,4 +445,4 @@ protected void onPause() {
     }
 
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/io/neurolab/main/ProgramModeActivity.java b/app/src/main/java/io/neurolab/main/ProgramModeActivity.java
index 16ccb3e5..eb5dc36f 100644
--- a/app/src/main/java/io/neurolab/main/ProgramModeActivity.java
+++ b/app/src/main/java/io/neurolab/main/ProgramModeActivity.java
@@ -2,8 +2,8 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.WindowManager;
 
 import io.neurolab.R;
diff --git a/app/src/main/java/io/neurolab/main/SampleSlide.java b/app/src/main/java/io/neurolab/main/SampleSlide.java
index 65fd01cb..597cc9ee 100644
--- a/app/src/main/java/io/neurolab/main/SampleSlide.java
+++ b/app/src/main/java/io/neurolab/main/SampleSlide.java
@@ -1,8 +1,8 @@
 package io.neurolab.main;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/io/neurolab/main/network/OSCReceiverFragment.java b/app/src/main/java/io/neurolab/main/network/OSCReceiverFragment.java
index 0ddb0186..b8ab1ed4 100644
--- a/app/src/main/java/io/neurolab/main/network/OSCReceiverFragment.java
+++ b/app/src/main/java/io/neurolab/main/network/OSCReceiverFragment.java
@@ -1,7 +1,7 @@
 package io.neurolab.main.network;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
diff --git a/app/src/main/java/io/neurolab/main/output/audio/PlaybackInfoListener.java b/app/src/main/java/io/neurolab/main/output/audio/PlaybackInfoListener.java
index 0dbadacd..0c070e13 100644
--- a/app/src/main/java/io/neurolab/main/output/audio/PlaybackInfoListener.java
+++ b/app/src/main/java/io/neurolab/main/output/audio/PlaybackInfoListener.java
@@ -1,6 +1,6 @@
 package io.neurolab.main.output.audio;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/app/src/main/java/io/neurolab/settings/FeedbackSettings.java b/app/src/main/java/io/neurolab/settings/FeedbackSettings.java
index c7dc1cc0..5559a526 100644
--- a/app/src/main/java/io/neurolab/settings/FeedbackSettings.java
+++ b/app/src/main/java/io/neurolab/settings/FeedbackSettings.java
@@ -1,19 +1,12 @@
 package io.neurolab.settings;
 
 import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
 import android.widget.FrameLayout;
 import android.widget.TextView;
-import android.widget.Toolbar;
 
 import java.util.ArrayList;
 import java.util.concurrent.locks.ReentrantLock;
 
-import io.neurolab.R;
 import io.neurolab.main.output.feedback.Feedback;
 import io.neurolab.model.Config;
 import io.neurolab.model.DefaultFFTData;
diff --git a/app/src/main/java/io/neurolab/utilities/PermissionUtils.java b/app/src/main/java/io/neurolab/utilities/PermissionUtils.java
index 442091ef..be675f1f 100644
--- a/app/src/main/java/io/neurolab/utilities/PermissionUtils.java
+++ b/app/src/main/java/io/neurolab/utilities/PermissionUtils.java
@@ -4,11 +4,11 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class PermissionUtils {
 
diff --git a/app/src/main/res/drawable-nodpi-v4/universe_bg.png b/app/src/main/res/drawable-nodpi-v4/universe_bg.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable-nodpi-v4/yantra.png b/app/src/main/res/drawable-nodpi-v4/yantra.png
old mode 100755
new mode 100644
diff --git a/app/src/main/res/drawable/ic_baseline_brightness_2_24.xml b/app/src/main/res/drawable/ic_baseline_brightness_2_24.xml
new file mode 100644
index 00000000..b95c2eac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_brightness_2_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,2c-1.82,0 -3.53,0.5 -5,1.35C7.99,5.08 10,8.3 10,12s-2.01,6.92 -5,8.65C6.47,21.5 8.18,22 10,22c5.52,0 10,-4.48 10,-10S15.52,2 10,2z"/>
+</vector>
diff --git a/app/src/main/res/layout-land/activity_focus_parent.xml b/app/src/main/res/layout-land/activity_focus_parent.xml
index 4e9d35cc..b9673421 100644
--- a/app/src/main/res/layout-land/activity_focus_parent.xml
+++ b/app/src/main/res/layout-land/activity_focus_parent.xml
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/layout_margin_medium"
             android:text="@string/focus_program_info"
-            android:textColor="@android:color/black" />
+            />
 
         <TextView
             android:layout_width="match_parent"
@@ -52,7 +52,7 @@
             android:textSize="@dimen/text_size_larger"
             android:textStyle="bold" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/layout_margin_medium"
@@ -82,7 +82,7 @@
                     android:layout_weight="1"
                     android:text="@string/focus_game_one_info" />
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/play_focus_game"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -95,7 +95,7 @@
                     app:pressedTranslationZ="@dimen/view_width_or_height" />
 
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_relax_parent.xml b/app/src/main/res/layout-land/activity_relax_parent.xml
index 4d70b559..aeed2bc0 100644
--- a/app/src/main/res/layout-land/activity_relax_parent.xml
+++ b/app/src/main/res/layout-land/activity_relax_parent.xml
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/layout_margin_medium"
             android:text="@string/relax_program_info"
-            android:textColor="@android:color/black" />
+          />
 
         <TextView
             android:layout_width="match_parent"
@@ -52,7 +52,7 @@
             android:textSize="@dimen/text_size_larger"
             android:textStyle="bold" />
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="@dimen/layout_margin_medium"
@@ -84,7 +84,7 @@
                     android:layout_weight="1"
                     android:text="@string/relax_illusion_one_info" />
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/play_relax_illusion"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
                     app:pressedTranslationZ="@dimen/view_width_or_height" />
 
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_data_logger.xml b/app/src/main/res/layout/activity_data_logger.xml
index 20c3c743..d18daf85 100644
--- a/app/src/main/res/layout/activity_data_logger.xml
+++ b/app/src/main/res/layout/activity_data_logger.xml
@@ -15,7 +15,7 @@
         android:gravity="center"
         android:text="@string/no_logs" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/activity_focus_parent.xml b/app/src/main/res/layout/activity_focus_parent.xml
index 1f6442ca..d905bb84 100644
--- a/app/src/main/res/layout/activity_focus_parent.xml
+++ b/app/src/main/res/layout/activity_focus_parent.xml
@@ -37,7 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/layout_margin_medium"
         android:text="@string/focus_program_info"
-        android:textColor="@android:color/black" />
+    />
 
     <TextView
         android:layout_width="match_parent"
@@ -48,7 +48,7 @@
         android:textSize="@dimen/text_size_larger"
         android:textStyle="bold" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/layout_margin_medium"
@@ -78,7 +78,7 @@
                 android:layout_weight="1"
                 android:text="@string/focus_game_one_info" />
 
-            <android.support.design.widget.FloatingActionButton
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/play_focus_game"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -91,6 +91,6 @@
                 app:pressedTranslationZ="@dimen/view_width_or_height" />
 
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a61d8a63..8e69e22f 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"
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <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"
@@ -22,4 +22,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_meditation_home.xml b/app/src/main/res/layout/activity_meditation_home.xml
index 9836e263..9ef4490c 100644
--- a/app/src/main/res/layout/activity_meditation_home.xml
+++ b/app/src/main/res/layout/activity_meditation_home.xml
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/happy_card"
                 android:layout_width="@dimen/spacing_none"
                 android:layout_height="@dimen/bin_image_margin_top"
@@ -81,9 +81,9 @@
                     </LinearLayout>
 
                 </RelativeLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/depression_card"
                 android:layout_width="@dimen/spacing_none"
                 android:layout_height="@dimen/bin_image_margin_top"
@@ -134,7 +134,7 @@
 
                 </RelativeLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </LinearLayout>
 
         <LinearLayout
@@ -142,7 +142,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/sleep_card"
                 android:layout_width="@dimen/spacing_none"
                 android:layout_height="@dimen/bin_image_margin_top"
@@ -194,9 +194,9 @@
 
                 </RelativeLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/travel_card"
                 android:layout_width="@dimen/spacing_none"
                 android:layout_height="@dimen/bin_image_margin_top"
@@ -247,7 +247,7 @@
 
                 </RelativeLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </LinearLayout>
 
         <LinearLayout
@@ -255,7 +255,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/sh_break_card"
                 android:layout_width="@dimen/spacing_none"
                 android:layout_height="@dimen/layout_margin_huge"
@@ -307,9 +307,9 @@
                     </LinearLayout>
 
                 </RelativeLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/lg_break_card"
                 android:layout_width="@dimen/spacing_none"
                 android:layout_height="@dimen/layout_margin_huge"
@@ -361,7 +361,7 @@
 
                 </RelativeLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_meditation_list.xml b/app/src/main/res/layout/activity_meditation_list.xml
index 4e32593d..6ed74326 100644
--- a/app/src/main/res/layout/activity_meditation_list.xml
+++ b/app/src/main/res/layout/activity_meditation_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -28,11 +28,11 @@
         android:layout_margin="@dimen/layout_margin_medium"
         android:textColor="@color/colorPrimary" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/meditation_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_memory_graph_parent.xml b/app/src/main/res/layout/activity_memory_graph_parent.xml
index 5912d9e1..80a50093 100644
--- a/app/src/main/res/layout/activity_memory_graph_parent.xml
+++ b/app/src/main/res/layout/activity_memory_graph_parent.xml
@@ -16,7 +16,7 @@
 
     </FrameLayout>
 
-    <android.support.design.widget.BottomNavigationView
+    <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/navigation"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_pin_layout.xml b/app/src/main/res/layout/activity_pin_layout.xml
index f4e91ea8..60ddedcb 100644
--- a/app/src/main/res/layout/activity_pin_layout.xml
+++ b/app/src/main/res/layout/activity_pin_layout.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:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -21,4 +21,4 @@
         android:visibility="invisible"
         tools:ignore="ContentDescription" />
 
-</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/activity_relax_parent.xml b/app/src/main/res/layout/activity_relax_parent.xml
index 5945a949..fbf59af7 100644
--- a/app/src/main/res/layout/activity_relax_parent.xml
+++ b/app/src/main/res/layout/activity_relax_parent.xml
@@ -37,7 +37,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/layout_margin_medium"
         android:text="@string/relax_program_info"
-        android:textColor="@android:color/black" />
+        />
 
     <TextView
         android:layout_width="match_parent"
@@ -48,7 +48,7 @@
         android:textSize="@dimen/text_size_larger"
         android:textStyle="bold" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/layout_margin_medium"
@@ -80,7 +80,7 @@
                 android:layout_weight="1"
                 android:text="@string/relax_illusion_one_info" />
 
-            <android.support.design.widget.FloatingActionButton
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/play_relax_illusion"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -93,6 +93,6 @@
                 app:pressedTranslationZ="@dimen/view_width_or_height" />
 
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ 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 6d4b77c2..61410460 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.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -33,5 +33,5 @@
             android:background="@color/divider_color" />
     </LinearLayout>
 
-</android.support.v4.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
 
diff --git a/app/src/main/res/layout/activity_test_mode.xml b/app/src/main/res/layout/activity_test_mode.xml
index 6be3d2e2..d1ad3c24 100644
--- a/app/src/main/res/layout/activity_test_mode.xml
+++ b/app/src/main/res/layout/activity_test_mode.xml
@@ -1,5 +1,5 @@
 <?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"
     android:id="@+id/parent_layout_coordinator_test_mode"
     xmlns:tools="http://schemas.android.com/tools"
@@ -9,4 +9,4 @@
 
     <include layout="@layout/content_test_mode" />
 
-</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/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index b8a909cd..5d9ecbfa 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -1,17 +1,17 @@
 <?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="io.neurolab.main.NeuroLab">
 
-    <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="wrap_content"
@@ -22,10 +22,10 @@
             app:theme="@style/AppTheme.AppBarOverlay"
             app:titleTextColor="@color/color_white_background">
 
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/card_focus.xml b/app/src/main/res/layout/card_focus.xml
index 913a8f16..272da5ad 100644
--- a/app/src/main/res/layout/card_focus.xml
+++ b/app/src/main/res/layout/card_focus.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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/focus_card"
     android:layout_width="match_parent"
@@ -49,7 +49,7 @@
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/focus_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Display1"
                     android:textColor="#fff" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/focus_subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -73,4 +73,4 @@
             </LinearLayout>
         </LinearLayout>
     </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/card_meditation.xml b/app/src/main/res/layout/card_meditation.xml
index 9dba16d6..a148edcb 100644
--- a/app/src/main/res/layout/card_meditation.xml
+++ b/app/src/main/res/layout/card_meditation.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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/meditation_card"
     android:layout_width="match_parent"
@@ -49,7 +49,7 @@
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/meditation_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Display1"
                     android:textColor="#fff" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/meditation_subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -73,4 +73,4 @@
             </LinearLayout>
         </LinearLayout>
     </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/card_mem_graph.xml b/app/src/main/res/layout/card_mem_graph.xml
index 32eeffe0..2700a6e7 100644
--- a/app/src/main/res/layout/card_mem_graph.xml
+++ b/app/src/main/res/layout/card_mem_graph.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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mem_graph_card"
     android:layout_width="match_parent"
@@ -49,7 +49,7 @@
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/mem_graph_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
                     android:textColor="#fff"
                     android:textSize="@dimen/heading_text_size" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/mem_graph_subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -72,4 +72,4 @@
             </LinearLayout>
         </LinearLayout>
     </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/card_relax.xml b/app/src/main/res/layout/card_relax.xml
index 8914b2cf..3ba2a3ec 100644
--- a/app/src/main/res/layout/card_relax.xml
+++ b/app/src/main/res/layout/card_relax.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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/relax_card"
     android:layout_width="match_parent"
@@ -51,7 +51,7 @@
                 android:layout_weight="1"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/relax_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -63,7 +63,7 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Display1"
                     android:textColor="#fff" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/relax_subtitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -75,4 +75,4 @@
             </LinearLayout>
         </LinearLayout>
     </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/content_main.xml b/app/src/main/res/layout/content_main.xml
index ffb592ad..3fbcfc88 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -7,7 +7,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/home_activity_background"
         android:orientation="vertical"
         android:paddingTop="@dimen/padding_extra_larger"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
diff --git a/app/src/main/res/layout/fragment_relax_visual.xml b/app/src/main/res/layout/fragment_relax_visual.xml
index 1deab011..669be260 100644
--- a/app/src/main/res/layout/fragment_relax_visual.xml
+++ b/app/src/main/res/layout/fragment_relax_visual.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/layoutRelaxScreen"
     android:layout_width="match_parent"
@@ -51,4 +51,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_statistics.xml b/app/src/main/res/layout/fragment_statistics.xml
index 5ee4bbf5..e95ce997 100644
--- a/app/src/main/res/layout/fragment_statistics.xml
+++ b/app/src/main/res/layout/fragment_statistics.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/container_stats"
@@ -9,4 +9,4 @@
 
     <include layout="@layout/stat_items" />
 
-</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/item_meditation_layout.xml b/app/src/main/res/layout/item_meditation_layout.xml
index 265f19ea..cd0f9753 100644
--- a/app/src/main/res/layout/item_meditation_layout.xml
+++ b/app/src/main/res/layout/item_meditation_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/margin_small">
@@ -45,7 +45,7 @@
             app:layout_constraintTop_toTopOf="@+id/meditation_name"
             android:src="@drawable/ic_play_meditate" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <View
         android:id="@+id/divider_view_meditation"
diff --git a/app/src/main/res/layout/logged_data_item.xml b/app/src/main/res/layout/logged_data_item.xml
index 6eeb1dc2..e2425ed5 100644
--- a/app/src/main/res/layout/logged_data_item.xml
+++ b/app/src/main/res/layout/logged_data_item.xml
@@ -1,6 +1,6 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/parent_logged_card"
     android:layout_width="match_parent"
@@ -8,7 +8,7 @@
     android:layout_margin="@dimen/padding_medium"
     android:elevation="@dimen/card_elevation_medium">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="horizontal">
@@ -91,6 +91,6 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.428"
             app:srcCompat="@android:drawable/ic_menu_delete" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</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/stat_items.xml b/app/src/main/res/layout/stat_items.xml
index 9b905c42..58ced8c1 100644
--- a/app/src/main/res/layout/stat_items.xml
+++ b/app/src/main/res/layout/stat_items.xml
@@ -19,7 +19,7 @@
         android:text="@string/scores_label"
         android:padding="6dp"/>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -31,7 +31,7 @@
         android:layout_marginRight="@dimen/card_margin_large"
         app:cardElevation="@dimen/card_elevation_medium">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:id="@+id/stats_card"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -45,7 +45,7 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <android.support.constraint.ConstraintLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/delta_parent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -95,14 +95,14 @@
                         app:layout_constraintVertical_bias="1.0"
                         android:visibility="invisible"
                         app:srcCompat="@drawable/ic_happy" />
-                </android.support.constraint.ConstraintLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/view_width_or_height"
                     android:background="@android:color/darker_gray" />
 
-                <android.support.constraint.ConstraintLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/theta_parent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -154,14 +154,14 @@
                         app:layout_constraintStart_toEndOf="@+id/theta_label"
                         app:layout_constraintTop_toTopOf="@+id/theta_label"
                         app:layout_constraintVertical_bias="1.0" />
-                </android.support.constraint.ConstraintLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/view_width_or_height"
                     android:background="@android:color/darker_gray" />
 
-                <android.support.constraint.ConstraintLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/low_alpha_parent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -213,14 +213,14 @@
                         app:layout_constraintStart_toEndOf="@+id/low_alpha_label"
                         app:layout_constraintTop_toTopOf="@+id/low_alpha_label"
                         app:layout_constraintVertical_bias="1.0" />
-                </android.support.constraint.ConstraintLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/view_width_or_height"
                     android:background="@android:color/darker_gray" />
 
-                <android.support.constraint.ConstraintLayout
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/high_alpha_parent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -272,7 +272,7 @@
                         app:layout_constraintStart_toEndOf="@+id/high_alpha_label"
                         app:layout_constraintTop_toTopOf="@+id/high_alpha_label"
                         app:layout_constraintVertical_bias="1.0" />
-                </android.support.constraint.ConstraintLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <View
                     android:layout_width="match_parent"
@@ -281,7 +281,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index d82462b7..8d7bd57d 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -2,6 +2,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/theme_change"
+        android:icon="@drawable/ic_baseline_brightness_2_24"
+        android:orderInCategory="100"
+        android:title=""
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/device_icon"
         android:icon="@drawable/ic_disconnected"
diff --git a/app/src/main/res/menu/share_menu.xml b/app/src/main/res/menu/share_menu.xml
index f9e537f7..6c7c731a 100644
--- a/app/src/main/res/menu/share_menu.xml
+++ b/app/src/main/res/menu/share_menu.xml
@@ -6,5 +6,5 @@
         android:icon="@android:drawable/ic_menu_share"
         android:title="Share"
         app:showAsAction="always"
-        app:actionProviderClass="android.support.v4.view.ActionProvider" />
+        app:actionProviderClass="androidx.core.view.ActionProvider" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors-night.xml b/app/src/main/res/values-night/colors-night.xml
new file mode 100644
index 00000000..0d6b364e
--- /dev/null
+++ b/app/src/main/res/values-night/colors-night.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#7367ee</color>
+    <color name="colorPrimaryDark">#6c60a9</color>
+    <color name="colorAccent">#26a69a</color>
+    <color name="colorControlHighlight">#191818</color>
+    <color name="launcher_btn_txt_clr">#0E0E0E</color>
+    <color name="color_view_background">#dad</color>
+    <color name="color_white_background">#121111</color>
+    <color name="home_activity_background">#F2F2F2</color>
+    <color name="on_boarding_activity_indicator_on">#FFFFFF</color>
+    <color name="on_boarding_activity_indicator_off">#FFFFFF</color>
+    <color name="on_boarding_activity_bg_color">#ffffff</color>
+    <color name="seperator_color">#FFFFFF</color>
+    <color name="yantra_one_color">#FFF852</color>
+    <color name="yantra_two_color">#6DFBFB</color>
+    <color name="divider_color">#E0E0E0</color>
+    <color name="calm_green">#76FF03</color>
+    <color name="focus_screen_bg">#FFFCFC</color>
+    <color name="side_nav_start_color">#6c60a9</color>
+    <color name="side_nav_end_color">#7367ee</color>
+    <color name="white_trans">#99FFFFFF</color>
+    <color name="memory_graph_background">#673AB7</color>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/drawable-night.xml b/app/src/main/res/values-night/drawable-night.xml
new file mode 100644
index 00000000..f7f737c5
--- /dev/null
+++ b/app/src/main/res/values-night/drawable-night.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="ic_menu_camera" type="drawable">@android:drawable/ic_menu_camera</item>
+    <item name="ic_menu_gallery" type="drawable">@android:drawable/ic_menu_gallery</item>
+    <item name="ic_menu_slideshow" type="drawable">@android:drawable/ic_menu_slideshow</item>
+    <item name="ic_menu_manage" type="drawable">@android:drawable/ic_menu_manage</item>
+    <item name="ic_menu_share" type="drawable">@android:drawable/ic_menu_share</item>
+    <item name="ic_menu_send" type="drawable">@android:drawable/ic_menu_send</item>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v29/styles.xml b/app/src/main/res/values-v29/styles.xml
new file mode 100644
index 00000000..b2308630
--- /dev/null
+++ b/app/src/main/res/values-v29/styles.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorControlHighlight">@color/colorControlHighlight</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="android:fontFamily">@font/montserrat</item>
+        <item name="android:forceDarkAllowed">true</item>
+
+    </style>
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3ce0e29d..e5b02558 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,16 +1,18 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="colorControlHighlight">@color/colorControlHighlight</item>
+        <item name="colorControlHighlight">@color/focus_screen_bg</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="android:fontFamily">@font/montserrat</item>
     </style>
 
+
+
     <style name="EditTextPrefTheme" parent="@style/PreferenceFixTheme.Light.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/build.gradle b/build.gradle
index 2d2c7ff3..68431563 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
+    ext.kotlin_version = '1.5.30'
+
     repositories {
         google()
         jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.3'
-        
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index aac7c9b4..9e6fce10 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/gradlew b/gradlew
old mode 100755
new mode 100644
diff --git a/gradlew.bat b/gradlew.bat
index aec99730..8a0b282a 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/neurolab-android.zip b/neurolab-android.zip
new file mode 100644
index 00000000..bb11e18f
Binary files /dev/null and b/neurolab-android.zip differ