diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 96cc43e..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e58ca7a..8fc5d4c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="D:\Android\android-studio\gradle\gradle-2.14.1" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..a3cd4cb
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://dl.bintray.com/kotlin/kotlin-eap" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7158618..1b88011 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,43 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.2703125" />
+        <entry key="app/src/main/res/layout/content_main.xml" value="0.2703125" />
+      </map>
+    </option>
   </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="9" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="11" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="11">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="5" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a7c0bf4..fd1f9fe 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/AdBlockWebViewDemo.iml" filepath="$PROJECT_DIR$/AdBlockWebViewDemo.iml" />
-      <module fileurl="file://$PROJECT_DIR$/adblockwebview/adblockwebview.iml" filepath="$PROJECT_DIR$/adblockwebview/adblockwebview.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/AdBlockedWebView-Android.iml" filepath="$PROJECT_DIR$/.idea/modules/AdBlockedWebView-Android.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/adblockwebview/AdBlockedWebView-Android.adblockwebview.iml" filepath="$PROJECT_DIR$/.idea/modules/adblockwebview/AdBlockedWebView-Android.adblockwebview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/AdBlockedWebView-Android.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/AdBlockedWebView-Android.app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/adblockwebview/build.gradle b/adblockwebview/build.gradle
index 660684c..48c851e 100644
--- a/adblockwebview/build.gradle
+++ b/adblockwebview/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdk 31
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 24
+        minSdk 21
+        targetSdk 31
         versionCode 1
         versionName "1.0.0"
         vectorDrawables.useSupportLibrary = true
@@ -21,8 +21,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:design:24.2.1'
-    compile 'com.android.support:cardview-v7:24.2.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
diff --git a/adblockwebview/src/main/AndroidManifest.xml b/adblockwebview/src/main/AndroidManifest.xml
index 196cf2b..aac5f5f 100644
--- a/adblockwebview/src/main/AndroidManifest.xml
+++ b/adblockwebview/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
         <activity
             android:name=".ui.AdBlocksWebViewActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:configChanges="orientation|screenSize" />
+            android:configChanges="orientation|screenSize"
+            android:exported="true"/>
     </application>
 
 </manifest>
diff --git a/adblockwebview/src/main/java/com/amnix/adblockwebview/presenter/IWebViewPresenter.java b/adblockwebview/src/main/java/com/amnix/adblockwebview/presenter/IWebViewPresenter.java
index 2434189..ce3e48d 100644
--- a/adblockwebview/src/main/java/com/amnix/adblockwebview/presenter/IWebViewPresenter.java
+++ b/adblockwebview/src/main/java/com/amnix/adblockwebview/presenter/IWebViewPresenter.java
@@ -1,6 +1,6 @@
 package com.amnix.adblockwebview.presenter;
 
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.webkit.WebView;
 import android.widget.PopupWindow;
 
diff --git a/adblockwebview/src/main/java/com/amnix/adblockwebview/presenter/WebViewPresenterImpl.java b/adblockwebview/src/main/java/com/amnix/adblockwebview/presenter/WebViewPresenterImpl.java
index 3d3b2d5..c963b1c 100644
--- a/adblockwebview/src/main/java/com/amnix/adblockwebview/presenter/WebViewPresenterImpl.java
+++ b/adblockwebview/src/main/java/com/amnix/adblockwebview/presenter/WebViewPresenterImpl.java
@@ -6,8 +6,8 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Vibrator;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Log;
 import android.webkit.URLUtil;
diff --git a/adblockwebview/src/main/java/com/amnix/adblockwebview/ui/AdBlocksWebViewActivity.java b/adblockwebview/src/main/java/com/amnix/adblockwebview/ui/AdBlocksWebViewActivity.java
index e5fec94..bb902ab 100644
--- a/adblockwebview/src/main/java/com/amnix/adblockwebview/ui/AdBlocksWebViewActivity.java
+++ b/adblockwebview/src/main/java/com/amnix/adblockwebview/ui/AdBlocksWebViewActivity.java
@@ -19,14 +19,14 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.AppCompatImageButton;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatImageButton;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
@@ -114,8 +114,7 @@ public static void startWebViewForResult(Activity context, @NonNull final String
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
-            getWindow().setStatusBarColor(getIntent().getIntExtra(EXTRA_COLOR, Color.BLACK));
+        getWindow().setStatusBarColor(getIntent().getIntExtra(EXTRA_COLOR, Color.BLACK));
         super.onCreate(savedInstanceState);
 
         //noinspection ConstantConditions
@@ -185,9 +184,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     if (filePathCallbackLollipop == null) {
                         return;
                     }
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        filePathCallbackLollipop.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(resultCode, data));
-                    }
+                    filePathCallbackLollipop.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(resultCode, data));
                     filePathCallbackLollipop = null;
                     break;
                 }
@@ -222,9 +219,7 @@ private void bindView() {
         WebSettings webSettings = mWebView.getSettings();
         webSettings.setJavaScriptEnabled(true);
         webSettings.setJavaScriptCanOpenWindowsAutomatically(true);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            webSettings.setDisplayZoomControls(false);
-        }
+        webSettings.setDisplayZoomControls(false);
         webSettings.setBuiltInZoomControls(true);
         webSettings.setSupportZoom(true);
         webSettings.setDomStorageEnabled(true);
diff --git a/adblockwebview/src/main/java/com/amnix/adblockwebview/util/AdBlocker.java b/adblockwebview/src/main/java/com/amnix/adblockwebview/util/AdBlocker.java
index fa7a6ef..0781e8a 100644
--- a/adblockwebview/src/main/java/com/amnix/adblockwebview/util/AdBlocker.java
+++ b/adblockwebview/src/main/java/com/amnix/adblockwebview/util/AdBlocker.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.WorkerThread;
 import android.text.TextUtils;
 import android.util.Log;
 import android.webkit.WebResourceResponse;
diff --git a/adblockwebview/src/main/java/com/amnix/adblockwebview/util/ClipboardUtils.java b/adblockwebview/src/main/java/com/amnix/adblockwebview/util/ClipboardUtils.java
index b50b065..2efdfb3 100644
--- a/adblockwebview/src/main/java/com/amnix/adblockwebview/util/ClipboardUtils.java
+++ b/adblockwebview/src/main/java/com/amnix/adblockwebview/util/ClipboardUtils.java
@@ -16,44 +16,29 @@ private ClipboardUtils() {
     public static void copyText(Context context, String text) {
         ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            ClipData clip = ClipData.newPlainText("", text);
-            cm.setPrimaryClip(clip);
-        } else {
-            //noinspection deprecation
-            cm.setText(text);
-        }
+        ClipData clip = ClipData.newPlainText("", text);
+        cm.setPrimaryClip(clip);
     }
 
     public static boolean hasText(Context context) {
         ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            ClipDescription description = cm.getPrimaryClipDescription();
-            ClipData clipData = cm.getPrimaryClip();
-            return clipData != null
-                    && description != null
-                    && (description.hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN));
-        } else {
-            //noinspection deprecation
-            return cm.hasText();
-        }
+        ClipDescription description = cm.getPrimaryClipDescription();
+        ClipData clipData = cm.getPrimaryClip();
+        return clipData != null
+                && description != null
+                && (description.hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN));
     }
 
     public static CharSequence getText(Context context) {
         ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            ClipDescription description = cm.getPrimaryClipDescription();
-            ClipData clipData = cm.getPrimaryClip();
-            if (clipData != null && description != null && description.hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
-                return clipData.getItemAt(0).getText();
-            } else {
-                return "";
-            }
+        ClipDescription description = cm.getPrimaryClipDescription();
+        ClipData clipData = cm.getPrimaryClip();
+        if (clipData != null && description != null && description.hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
+            return clipData.getItemAt(0).getText();
         } else {
-            //noinspection deprecation
-            return cm.getText();
+            return "";
         }
     }
 }
diff --git a/adblockwebview/src/main/java/com/amnix/adblockwebview/util/PermissionUtils.java b/adblockwebview/src/main/java/com/amnix/adblockwebview/util/PermissionUtils.java
index 2523b34..a87ce32 100644
--- a/adblockwebview/src/main/java/com/amnix/adblockwebview/util/PermissionUtils.java
+++ b/adblockwebview/src/main/java/com/amnix/adblockwebview/util/PermissionUtils.java
@@ -2,8 +2,8 @@
 
 import android.app.Activity;
 import android.content.pm.PackageManager;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 public class PermissionUtils {
 
diff --git a/adblockwebview/src/main/res/layout/a_web_viewer.xml b/adblockwebview/src/main/res/layout/a_web_viewer.xml
index f07b493..136117e 100644
--- a/adblockwebview/src/main/res/layout/a_web_viewer.xml
+++ b/adblockwebview/src/main/res/layout/a_web_viewer.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"
     android:id="@+id/a_web_viewer_coordinatorlayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -19,7 +19,7 @@
             android:indeterminate="false"
             android:progressDrawable="@drawable/progress_drawable" />
 
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/a_web_viewer_srl"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -29,6 +29,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scrollbars="none" />
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </LinearLayout>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/adblockwebview/src/main/res/layout/popup_menu.xml b/adblockwebview/src/main/res/layout/popup_menu.xml
index f93dbb0..993bc3e 100644
--- a/adblockwebview/src/main/res/layout/popup_menu.xml
+++ b/adblockwebview/src/main/res/layout/popup_menu.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:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -27,7 +27,7 @@
                 android:layout_gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.AppCompatImageButton
+                <androidx.appcompat.widget.AppCompatImageButton
                     android:id="@+id/popup_menu_btn_back"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/menuItemHeight"
@@ -40,7 +40,7 @@
                     android:layout_height="40dp"
                     android:background="@android:color/black" />
 
-                <android.support.v7.widget.AppCompatImageButton
+                <androidx.appcompat.widget.AppCompatImageButton
                     android:id="@+id/popup_menu_btn_forward"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/menuItemHeight"
@@ -104,4 +104,4 @@
             android:textColor="@android:color/black"
             android:textSize="@dimen/menuItemTextSize" />
     </LinearLayout>
-</android.support.v7.widget.CardView>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/adblockwebview/src/main/res/layout/toolbar.xml b/adblockwebview/src/main/res/layout/toolbar.xml
index 8d6082e..0fdcff3 100644
--- a/adblockwebview/src/main/res/layout/toolbar.xml
+++ b/adblockwebview/src/main/res/layout/toolbar.xml
@@ -11,7 +11,7 @@
         android:background="#00000000"
         android:layout_height="?attr/actionBarSize">
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/toolbar_btn_close"
             style="@style/Widget.AppCompat.ActionButton"
             android:layout_width="@android:dimen/app_icon_size"
@@ -58,7 +58,7 @@
                 android:textSize="14dp" />
         </LinearLayout>
 
-        <android.support.v7.widget.AppCompatImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/toolbar_btn_more"
             style="@style/Widget.AppCompat.ActionButton"
             android:layout_width="@android:dimen/app_icon_size"
diff --git a/app/build.gradle b/app/build.gradle
index adad7c3..cb9cd16 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdk 31
+    buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.newera.adblockwebviewdemo"
-        minSdkVersion 14
-        targetSdkVersion 24
+        minSdk 21
+        targetSdk 31
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -20,12 +20,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:design:24.2.1'
-    testCompile 'junit:junit:4.12'
-    compile project(path: ':adblockwebview')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation project(path: ':adblockwebview')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 268d317..e9f9b7e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/newera/adblockwebviewdemo/MainActivity.java b/app/src/main/java/com/newera/adblockwebviewdemo/MainActivity.java
index 8051cc9..dd9efac 100644
--- a/app/src/main/java/com/newera/adblockwebviewdemo/MainActivity.java
+++ b/app/src/main/java/com/newera/adblockwebviewdemo/MainActivity.java
@@ -1,8 +1,8 @@
 package com.newera.adblockwebviewdemo;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.EditText;
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 83d79a3..df39731 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.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"
@@ -7,21 +7,21 @@
     android:fitsSystemWindows="true"
     tools:context="com.newera.adblockwebviewdemo.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main" />
 
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 50b749a..62ae11b 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/edittext"
-        android:text="http://www."
+        android:text="https://www."
         android:hint="Website URL" />
 
     <Button
diff --git a/build.gradle b/build.gradle
index c20bca1..e6b93dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,10 +2,12 @@
 
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath "com.android.tools.build:gradle:7.0.3"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,7 +16,9 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
+        maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..ea7ed7c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Tue Nov 09 17:11:52 WIB 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+zipStoreBase=GRADLE_USER_HOME