diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 80d03fb..96b75c9 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index ae304eb..8870e5f 100644
Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..573d1df
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,9 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="ConstantConditions" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
+      <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5686276..657fa43 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,5 +22,5 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
 }
diff --git a/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java b/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
index 1555893..29e3db7 100644
--- a/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/AlarmActivity.java
@@ -8,7 +8,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.TimePicker;
diff --git a/app/src/main/java/com/example/yink/amadeus/AlarmBootReceiver.java b/app/src/main/java/com/example/yink/amadeus/AlarmBootReceiver.java
index d3d0349..fe38a3e 100644
--- a/app/src/main/java/com/example/yink/amadeus/AlarmBootReceiver.java
+++ b/app/src/main/java/com/example/yink/amadeus/AlarmBootReceiver.java
@@ -7,7 +7,7 @@
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
-import android.support.v4.content.WakefulBroadcastReceiver;
+import androidx.legacy.content.WakefulBroadcastReceiver;
 import android.util.Log;
 
 public class AlarmBootReceiver extends WakefulBroadcastReceiver {
diff --git a/app/src/main/java/com/example/yink/amadeus/AlarmService.java b/app/src/main/java/com/example/yink/amadeus/AlarmService.java
index ca5ef4d..1e767b4 100644
--- a/app/src/main/java/com/example/yink/amadeus/AlarmService.java
+++ b/app/src/main/java/com/example/yink/amadeus/AlarmService.java
@@ -5,7 +5,7 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 public class AlarmService extends IntentService {
 
diff --git a/app/src/main/java/com/example/yink/amadeus/Amadeus.java b/app/src/main/java/com/example/yink/amadeus/Amadeus.java
index 2d52bcc..197e96c 100644
--- a/app/src/main/java/com/example/yink/amadeus/Amadeus.java
+++ b/app/src/main/java/com/example/yink/amadeus/Amadeus.java
@@ -1,5 +1,6 @@
 package com.example.yink.amadeus;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -13,7 +14,7 @@
 import android.media.audiofx.Visualizer;
 import android.net.Uri;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -21,6 +22,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Random;
 
 class Amadeus {
@@ -28,7 +30,6 @@ class Amadeus {
     static Boolean isSpeaking = false;
     static Boolean isLoop = false;
     static MediaPlayer m;
-    private static String TAG = "Amadeus";
     private static int shaman_girls = -1;
     private static VoiceLine[] voiceLines = VoiceLine.Line.getLines();
     private static HashMap<Bundle<Integer>, Bundle<VoiceLine>> responseInputMap = new HashMap<>();
@@ -120,8 +121,8 @@ class Amadeus {
 
     static void speak(VoiceLine line, final Activity activity) {
         final AnimationDrawable animation;
-        final TextView subtitles = (TextView) activity.findViewById(R.id.textView_subtitles);
-        final ImageView kurisu = (ImageView) activity.findViewById(R.id.imageView_kurisu);
+        final TextView subtitles = activity.findViewById(R.id.textView_subtitles);
+        final ImageView kurisu = activity.findViewById(R.id.imageView_kurisu);
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
 
         try {
@@ -199,6 +200,7 @@ public void onFftDataCapture(Visualizer visualizer, byte[] bytes, int samplingRa
         }
     }
 
+    @SuppressLint("NewApi")
     static void responseToInput(String input, Context context, Activity activity) {
         VoiceLine[] specificLines = null;
         input = input.toLowerCase();
@@ -237,7 +239,7 @@ static void responseToInput(String input, Context context, Activity activity) {
             for (Bundle<Integer> input_bundle : responseInputMap.keySet()) {
                 for (Integer input_code : input_bundle) {
                     if (containInput(input, context.getString(input_code))) {
-                        specificLines = responseInputMap.get(input_bundle).toArray();
+                        specificLines = Objects.requireNonNull(responseInputMap.get(input_bundle)).toArray();
                         break;
                     }
                 }
@@ -272,8 +274,8 @@ static void openApp(String[] input, Activity activity) {
 
         HashMap<String, Integer> dictionary = new HashMap<>();
         String corrected;
-        Boolean found;
-        /* TODO: Dictionary for other language equivalents. To be reworked. */
+        boolean found;
+
         dictionary.put("хром", 0);
         dictionary.put("календарь", 1);
         dictionary.put("часы", 2);
@@ -285,7 +287,7 @@ static void openApp(String[] input, Activity activity) {
         };
 
         for (ApplicationInfo packageInfo : packages) {
-            /* TODO: Needs to be adjusted probably. */
+
             found = true;
             /* Look up words in dictionary and correct the input since we can't open some apps in other langs */
             for (String word: input) {
@@ -301,6 +303,7 @@ static void openApp(String[] input, Activity activity) {
             }
 
             if (found) {
+                String TAG = "Amadeus";
                 Log.d(TAG, "Found app!");
                 Intent app;
                 Amadeus.speak(voiceLines[VoiceLine.Line.OK], activity);
@@ -338,18 +341,19 @@ private static class Bundle<T> implements Iterable<T> {
 
         private T[] list;
 
-        public Bundle(T... list) {
+        @SafeVarargs
+        Bundle(T... list) {
             this.list = list;
         }
 
-        public T[] toArray() {
+        T[] toArray() {
             return list;
         }
 
         @NonNull
         @Override
         public Iterator<T> iterator() {
-            Iterator<T> iterator = new Iterator<T>() {
+            return new Iterator<T>() {
                 int index = 0;
 
                 @Override
@@ -362,7 +366,6 @@ public T next() {
                     return list[index++];
                 }
             };
-            return iterator;
         }
     }
 
diff --git a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java b/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
index 14c62b1..7bbcb0e 100644
--- a/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/LaunchActivity.java
@@ -10,10 +10,10 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.TaskStackBuilder;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.TaskStackBuilder;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
diff --git a/app/src/main/java/com/example/yink/amadeus/MainActivity.java b/app/src/main/java/com/example/yink/amadeus/MainActivity.java
index 8f35b5e..752d7ab 100644
--- a/app/src/main/java/com/example/yink/amadeus/MainActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/MainActivity.java
@@ -17,9 +17,9 @@
 import android.speech.RecognitionListener;
 import android.speech.RecognizerIntent;
 import android.speech.SpeechRecognizer;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/app/src/main/java/com/example/yink/amadeus/SettingsActivity.java b/app/src/main/java/com/example/yink/amadeus/SettingsActivity.java
index 17f4490..2b37534 100644
--- a/app/src/main/java/com/example/yink/amadeus/SettingsActivity.java
+++ b/app/src/main/java/com/example/yink/amadeus/SettingsActivity.java
@@ -7,7 +7,7 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 
 public class SettingsActivity extends FragmentActivity {
     @Override
diff --git a/app/src/main/java/com/example/yink/amadeus/SettingsFragment.java b/app/src/main/java/com/example/yink/amadeus/SettingsFragment.java
index 84e4790..5bb9c77 100644
--- a/app/src/main/java/com/example/yink/amadeus/SettingsFragment.java
+++ b/app/src/main/java/com/example/yink/amadeus/SettingsFragment.java
@@ -4,7 +4,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 
 /**
  * Created by Yink on 05.03.2017.
diff --git a/gradle.properties b/gradle.properties
index 743d692..8de5058 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # 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.
 # This option should only be used with decoupled projects. More details, visit