diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
index 62ed3da9c..4b4921801 100644
--- a/Android/app/src/main/AndroidManifest.xml
+++ b/Android/app/src/main/AndroidManifest.xml
@@ -1,35 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="emu.project64">
-    
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="26" />
-    
-    <uses-permission android:name="com.android.vending.BILLING" />
+    xmlns:tools="http://schemas.android.com/tools"
+    package="emu.project64">
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:name="emu.project64.Project64Application"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:isGame="true"
         android:hardwareAccelerated="true"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
+        android:banner="@drawable/banner"
         android:theme="@style/Theme.Project64" >
         <activity
             android:name="emu.project64.SplashActivity"
             android:label="@string/SplashActivity_title"
             android:theme="@style/Theme.Project64.Splash"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:noHistory="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="tv.ouya.intent.category.GAME" />
             </intent-filter>
         </activity>
         <activity
@@ -37,40 +33,20 @@
             android:exported="false"
             android:label="@string/GalleryActivity_title"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.Project64.Apearance" >
+            android:theme="@style/Theme.Project64.Gallery" >
         </activity>
         <activity
             android:name="emu.project64.ScanRomsActivity"
             android:exported="false"
             android:label="@string/ScanRomsActivity_title"
-            android:theme="@style/Theme.AppCompat" >
-        </activity>
-        <activity
-            android:name="emu.project64.profile.ControllerProfileActivity"
-            android:exported="false"
-            android:label="@string/ControllerProfileActivity_title"
             android:theme="@style/Theme.Project64.Apearance" >
-            <intent-filter>
-                <action android:name=".profile.ControllerProfileActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
-
         <activity
             android:name="emu.project64.game.GameActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/GameActivity_title"
             android:theme="@style/Theme.Project64.GameActivity" >
         </activity>
-        <activity
-            android:name="emu.project64.game.GameActivityXperiaPlay"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/GameActivity_title"
-            android:theme="@style/Theme.Project64.GameActivity" >
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="xperia-touchpad" />
-        </activity>
         <activity
             android:name="emu.project64.AboutActivity"
             android:theme="@style/Theme.Project64.About" />
@@ -80,6 +56,5 @@
          <activity
             android:name="emu.project64.settings.GameSettingsActivity"
             android:theme="@style/Theme.Project64.Settings" />
-
      </application>
 </manifest>
diff --git a/Android/app/src/main/res/drawable-hdpi/banner.png b/Android/app/src/main/res/drawable-hdpi/banner.png
new file mode 100644
index 000000000..e9306b53c
Binary files /dev/null and b/Android/app/src/main/res/drawable-hdpi/banner.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_bug.png b/Android/app/src/main/res/drawable-hdpi/ic_bug.png
index ed2e48f17..fdef8c53c 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_bug.png and b/Android/app/src/main/res/drawable-hdpi/ic_bug.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_controller.png b/Android/app/src/main/res/drawable-hdpi/ic_controller.png
index 8b1968413..27d817fbb 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_controller.png and b/Android/app/src/main/res/drawable-hdpi/ic_controller.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_debug.png b/Android/app/src/main/res/drawable-hdpi/ic_debug.png
index 0e63adb6e..8d8134fc7 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_debug.png and b/Android/app/src/main/res/drawable-hdpi/ic_debug.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_discord.png b/Android/app/src/main/res/drawable-hdpi/ic_discord.png
index 8b2bdc84d..284e1a0f0 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_discord.png and b/Android/app/src/main/res/drawable-hdpi/ic_discord.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_folder.png b/Android/app/src/main/res/drawable-hdpi/ic_folder.png
index 6f441b41d..968fa90d8 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_folder.png and b/Android/app/src/main/res/drawable-hdpi/ic_folder.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_menu.png b/Android/app/src/main/res/drawable-hdpi/ic_menu.png
new file mode 100644
index 000000000..238cfd66b
Binary files /dev/null and b/Android/app/src/main/res/drawable-hdpi/ic_menu.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_picture.png b/Android/app/src/main/res/drawable-hdpi/ic_picture.png
index 0f650ee25..f72e2e5e7 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_picture.png and b/Android/app/src/main/res/drawable-hdpi/ic_picture.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_refresh.png b/Android/app/src/main/res/drawable-hdpi/ic_refresh.png
index c271b21f4..fb1391d6c 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_refresh.png and b/Android/app/src/main/res/drawable-hdpi/ic_refresh.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_speaker.png b/Android/app/src/main/res/drawable-hdpi/ic_speaker.png
index 7b69ea56b..c259ff9d7 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_speaker.png and b/Android/app/src/main/res/drawable-hdpi/ic_speaker.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_storage.png b/Android/app/src/main/res/drawable-hdpi/ic_storage.png
index e00c51602..af84014b4 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_storage.png and b/Android/app/src/main/res/drawable-hdpi/ic_storage.png differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_undo.png b/Android/app/src/main/res/drawable-hdpi/ic_undo.png
index 9e719c9cf..e70d89922 100644
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_undo.png and b/Android/app/src/main/res/drawable-hdpi/ic_undo.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/banner.png b/Android/app/src/main/res/drawable-mdpi/banner.png
new file mode 100644
index 000000000..e9306b53c
Binary files /dev/null and b/Android/app/src/main/res/drawable-mdpi/banner.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_about.png b/Android/app/src/main/res/drawable-mdpi/ic_about.png
index d7b7e6986..ce2614f58 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_about.png and b/Android/app/src/main/res/drawable-mdpi/ic_about.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_bug.png b/Android/app/src/main/res/drawable-mdpi/ic_bug.png
index ccff78da2..b720e0de5 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_bug.png and b/Android/app/src/main/res/drawable-mdpi/ic_bug.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_controller.png b/Android/app/src/main/res/drawable-mdpi/ic_controller.png
index 9377c2d21..531afd55c 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_controller.png and b/Android/app/src/main/res/drawable-mdpi/ic_controller.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_debug.png b/Android/app/src/main/res/drawable-mdpi/ic_debug.png
index 58653ab9e..eb4ce6520 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_debug.png and b/Android/app/src/main/res/drawable-mdpi/ic_debug.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_discord.png b/Android/app/src/main/res/drawable-mdpi/ic_discord.png
index 9d152f39a..116779cf9 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_discord.png and b/Android/app/src/main/res/drawable-mdpi/ic_discord.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_folder.png b/Android/app/src/main/res/drawable-mdpi/ic_folder.png
index cc81e57f7..541c1107b 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_folder.png and b/Android/app/src/main/res/drawable-mdpi/ic_folder.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_menu.png b/Android/app/src/main/res/drawable-mdpi/ic_menu.png
new file mode 100644
index 000000000..d3cec0564
Binary files /dev/null and b/Android/app/src/main/res/drawable-mdpi/ic_menu.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_picture.png b/Android/app/src/main/res/drawable-mdpi/ic_picture.png
index d6235554b..d2076219c 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_picture.png and b/Android/app/src/main/res/drawable-mdpi/ic_picture.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_refresh.png b/Android/app/src/main/res/drawable-mdpi/ic_refresh.png
index 7f82ad3a9..7ca0f5b00 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_refresh.png and b/Android/app/src/main/res/drawable-mdpi/ic_refresh.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_settings.png b/Android/app/src/main/res/drawable-mdpi/ic_settings.png
index 1a2a5cafe..d0639161e 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_settings.png and b/Android/app/src/main/res/drawable-mdpi/ic_settings.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_speaker.png b/Android/app/src/main/res/drawable-mdpi/ic_speaker.png
index f8dd8469c..3d8cbc156 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_speaker.png and b/Android/app/src/main/res/drawable-mdpi/ic_speaker.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_storage.png b/Android/app/src/main/res/drawable-mdpi/ic_storage.png
index 539bad7d7..d82f9bd3e 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_storage.png and b/Android/app/src/main/res/drawable-mdpi/ic_storage.png differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_undo.png b/Android/app/src/main/res/drawable-mdpi/ic_undo.png
index 8b8f9edfc..7e6a2ac55 100644
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_undo.png and b/Android/app/src/main/res/drawable-mdpi/ic_undo.png differ
diff --git a/Android/app/src/main/res/drawable-nodpi/publisherlogo.9.png b/Android/app/src/main/res/drawable-nodpi/publisherlogo.9.png
index e9306b53c..206407455 100644
Binary files a/Android/app/src/main/res/drawable-nodpi/publisherlogo.9.png and b/Android/app/src/main/res/drawable-nodpi/publisherlogo.9.png differ
diff --git a/Android/app/src/main/res/drawable-nodpi/publisherlogo_ouya.9.png b/Android/app/src/main/res/drawable-nodpi/publisherlogo_ouya.9.png
index e9306b53c..206407455 100644
Binary files a/Android/app/src/main/res/drawable-nodpi/publisherlogo_ouya.9.png and b/Android/app/src/main/res/drawable-nodpi/publisherlogo_ouya.9.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/banner.png b/Android/app/src/main/res/drawable-xhdpi/banner.png
new file mode 100644
index 000000000..e9306b53c
Binary files /dev/null and b/Android/app/src/main/res/drawable-xhdpi/banner.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_about.png b/Android/app/src/main/res/drawable-xhdpi/ic_about.png
index 4ee903f07..949ce96a6 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_about.png and b/Android/app/src/main/res/drawable-xhdpi/ic_about.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_bug.png b/Android/app/src/main/res/drawable-xhdpi/ic_bug.png
index ee4efb986..b943f5f00 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_bug.png and b/Android/app/src/main/res/drawable-xhdpi/ic_bug.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_controller.png b/Android/app/src/main/res/drawable-xhdpi/ic_controller.png
index 9e2b794ca..b965a4ecd 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_controller.png and b/Android/app/src/main/res/drawable-xhdpi/ic_controller.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_debug.png b/Android/app/src/main/res/drawable-xhdpi/ic_debug.png
index 3d8ae0ff4..abf0e087c 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_debug.png and b/Android/app/src/main/res/drawable-xhdpi/ic_debug.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_discord.png b/Android/app/src/main/res/drawable-xhdpi/ic_discord.png
index a5e1bb35b..bb22c3c73 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_discord.png and b/Android/app/src/main/res/drawable-xhdpi/ic_discord.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_menu.png b/Android/app/src/main/res/drawable-xhdpi/ic_menu.png
new file mode 100644
index 000000000..193185fd8
Binary files /dev/null and b/Android/app/src/main/res/drawable-xhdpi/ic_menu.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_picture.png b/Android/app/src/main/res/drawable-xhdpi/ic_picture.png
index 3f93e4f65..7dd6d0e34 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_picture.png and b/Android/app/src/main/res/drawable-xhdpi/ic_picture.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png b/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png
index 7ef9ddf64..93a51a040 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png and b/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_settings.png b/Android/app/src/main/res/drawable-xhdpi/ic_settings.png
index 0a2436b84..a6705d299 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_settings.png and b/Android/app/src/main/res/drawable-xhdpi/ic_settings.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_speaker.png b/Android/app/src/main/res/drawable-xhdpi/ic_speaker.png
index dfd2b33c7..a35eb894b 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_speaker.png and b/Android/app/src/main/res/drawable-xhdpi/ic_speaker.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_storage.png b/Android/app/src/main/res/drawable-xhdpi/ic_storage.png
index 2caf74c95..2202d0ae1 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_storage.png and b/Android/app/src/main/res/drawable-xhdpi/ic_storage.png differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_undo.png b/Android/app/src/main/res/drawable-xhdpi/ic_undo.png
index 99967f2fb..ec4e0cc75 100644
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_undo.png and b/Android/app/src/main/res/drawable-xhdpi/ic_undo.png differ
diff --git a/Android/app/src/main/res/layout/about_activity.xml b/Android/app/src/main/res/layout/about_activity.xml
index b0c4d2a10..86c247d0b 100644
--- a/Android/app/src/main/res/layout/about_activity.xml
+++ b/Android/app/src/main/res/layout/about_activity.xml
@@ -1,35 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-  	>
-    <android.support.v7.widget.Toolbar
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/background_actionbar"
-        android:theme="@style/Project64.Toolbar" />
-    <android.support.design.widget.TabLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/sliding_tabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/background_actionbar"
-        app:tabMode="scrollable"
-        app:tabSelectedTextColor="?attr/font_actionbar_selected"
-        app:tabTextColor="?attr/font_actionbar"
-        app:tabIndicatorColor="?attr/font_actionbar_selected"/>
-    <android.support.v4.view.ViewPager
+        android:theme="@style/Theme.Project64.ToolBar"
+        />
+	<com.google.android.material.tabs.TabLayout
+		android:id="@+id/sliding_tabs"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		app:tabTextColor="@color/TabInactive"
+		app:tabSelectedTextColor="@color/TabActive"
+		app:tabIndicatorColor="@color/TabActive"
+		app:tabMode="scrollable" />
+	<androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
 
-            <include layout="@layout/about_main" />
-            <include layout="@layout/about_licence" />
-        </android.support.v4.view.ViewPager>
+        <include layout="@layout/about_main" />
+        <include layout="@layout/about_licence" />
+	</androidx.viewpager.widget.ViewPager>
 </LinearLayout>
diff --git a/Android/app/src/main/res/layout/about_main.xml b/Android/app/src/main/res/layout/about_main.xml
index 9531d3c35..f4fb51719 100644
--- a/Android/app/src/main/res/layout/about_main.xml
+++ b/Android/app/src/main/res/layout/about_main.xml
@@ -54,25 +54,29 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="22dp"
-            android:layout_weight="0.12"
             android:gravity="center|top"
-            android:text="@string/about_copyright"
+            android:text="Special Thanks to previous members"
             android:textSize="14sp" />
 
       <TextView
-          android:id="@+id/Project64_authors"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
           android:gravity="center"
+          android:text="Jabo, Smiff, Gent"
           android:textSize="12sp" />
-      <TextView
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="22dp"
+            android:gravity="center|top"
+            android:text="Thanks also goes to:"
+            android:textSize="14sp" />
+        <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
             android:gravity="center"
-            android:text="@string/authors"
+            android:text="Jahra!n, Witten, RadeonUser, Azimer, Shygoo, Frank, LuigiBlood, theboy181, Gonetz, BlueToonYoshi, Kimbjo, Melchior, retroben, AIO, and krom"
             android:textSize="12sp" />
-
         <TextView
             android:id="@+id/main_link"
             android:layout_width="fill_parent"
diff --git a/Android/app/src/main/res/layout/controller_profile_activity.xml b/Android/app/src/main/res/layout/controller_profile_activity.xml
index 7bff6c237..fb8ab95a7 100644
--- a/Android/app/src/main/res/layout/controller_profile_activity.xml
+++ b/Android/app/src/main/res/layout/controller_profile_activity.xml
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/background_actionbar"
-        android:theme="@style/Project64.Toolbar" />    
+        android:theme="@style/Theme.Project64.ToolBar" />
 
 <!--
     ***********************************************************************************
diff --git a/Android/app/src/main/res/layout/controller_profile_activity_port.xml b/Android/app/src/main/res/layout/controller_profile_activity_port.xml
index c1af510f9..ed92f1a4b 100644
--- a/Android/app/src/main/res/layout/controller_profile_activity_port.xml
+++ b/Android/app/src/main/res/layout/controller_profile_activity_port.xml
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/background_actionbar"
-        android:theme="@style/Project64.Toolbar" />    
+        android:theme="@style/Theme.Project64.ToolBar" />
 
 <!--
     ***********************************************************************************
diff --git a/Android/app/src/main/res/layout/gallery_activity.xml b/Android/app/src/main/res/layout/gallery_activity.xml
index 5b6605d93..b0cbeae4e 100644
--- a/Android/app/src/main/res/layout/gallery_activity.xml
+++ b/Android/app/src/main/res/layout/gallery_activity.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawerLayout"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true" >
+    android:layout_height="match_parent" >
 
-    <!-- activity view -->
     <WebView
         android:id="@+id/screen_wait"
         android:layout_width="match_parent"
@@ -19,14 +17,27 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/background_actionbar"
-            android:minHeight="?attr/actionBarSize" />
+            android:layout_height="@dimen/toolbar_height"
+            app:theme="@style/Theme.Project64.ToolBar">
+            <ImageView
+                android:id="@+id/toolbar_icon"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                app:srcCompat="@drawable/icon" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="16dp"
+                android:paddingEnd="16dp"
+                android:text="@string/app_name"
+                style="@style/Theme.Project64.ToolBar.TitleText"
+                />
+        </com.google.android.material.appbar.MaterialToolbar>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/gridview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -39,22 +50,4 @@
             android:background="#F3F3F3"
             android:scrollbars="vertical" />
     </LinearLayout>
-
-    <!-- navigation drawer -->
-
-    <RelativeLayout
-        android:layout_width="280dip"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true" >
-
-        <emu.project64.MenuListView
-            android:id="@+id/drawerNavigation"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="?attr/actionBarSize"
-            android:background="?attr/background_gallerymenu"
-            />
-    </RelativeLayout>
-
-</android.support.v4.widget.DrawerLayout>
+</LinearLayout>
diff --git a/Android/app/src/main/res/layout/game_activity.xml b/Android/app/src/main/res/layout/game_activity.xml
index 279f28276..d17128e96 100644
--- a/Android/app/src/main/res/layout/game_activity.xml
+++ b/Android/app/src/main/res/layout/game_activity.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><merge xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
@@ -25,4 +26,4 @@
         android:background="@android:color/transparent"
         android:src="@drawable/ic_menu_moreoverflow_normal_holo_dark"
         />
-</merge>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/list_item_menu.xml b/Android/app/src/main/res/layout/list_item_menu.xml
index 5f296a483..245cafd27 100644
--- a/Android/app/src/main/res/layout/list_item_menu.xml
+++ b/Android/app/src/main/res/layout/list_item_menu.xml
@@ -36,17 +36,6 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="?attr/textMenuColor"
             android:textIsSelectable="false" />
-
-        <TextView
-            android:id="@+id/text2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/text1"
-            android:layout_alignStart="@id/text1"
-            android:layout_below="@id/text1"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textIsSelectable="false" />
     </RelativeLayout>
 
     <ImageView
@@ -56,7 +45,7 @@
         android:layout_gravity="center" />
 
     <LinearLayout
-        android:id="@+android:id/widget_frame"
+        android:id="@android:id/widget_frame"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
diff --git a/Android/app/src/main/res/layout/list_item_two_text_icon.xml b/Android/app/src/main/res/layout/list_item_two_text_icon.xml
index 0e2678f09..69f1e8925 100644
--- a/Android/app/src/main/res/layout/list_item_two_text_icon.xml
+++ b/Android/app/src/main/res/layout/list_item_two_text_icon.xml
@@ -52,7 +52,7 @@
     </RelativeLayout>
 
     <LinearLayout
-        android:id="@+android:id/widget_frame"
+        android:id="@android:id/widget_frame"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
diff --git a/Android/app/src/main/res/menu/gallery.xml b/Android/app/src/main/res/menu/gallery.xml
new file mode 100644
index 000000000..635c214c1
--- /dev/null
+++ b/Android/app/src/main/res/menu/gallery.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/menuItem_GameDir"
+        android:icon="@drawable/ic_folder"
+        app:showAsAction="ifRoom|collapseActionView"
+        />
+	<item
+        android:id="@+id/menuItem_settings"
+        android:icon="@drawable/ic_settings"/>
+    <item
+        android:id="@+id/menuItem_discord"
+        android:icon="@drawable/ic_discord" />
+    <item
+        android:id="@+id/menuItem_about"
+        android:icon="@drawable/ic_about" />
+</menu>
\ No newline at end of file
diff --git a/Android/app/src/main/res/menu/gallery_activity.xml b/Android/app/src/main/res/menu/gallery_activity.xml
deleted file mode 100644
index 1fb70a750..000000000
--- a/Android/app/src/main/res/menu/gallery_activity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:project64="http://schemas.android.com/apk/res-auto" >
-   
-    <item
-        android:id="@+id/menuItem_gameDir"
-        android:icon="@drawable/ic_folder"
-        project64:showAsAction="always|collapseActionView"
-        tools:ignore="UnusedAttribute"/>
-</menu>
\ No newline at end of file
diff --git a/Android/app/src/main/res/menu/gallery_drawer.xml b/Android/app/src/main/res/menu/gallery_drawer.xml
deleted file mode 100644
index c2aa8e4d9..000000000
--- a/Android/app/src/main/res/menu/gallery_drawer.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:project64="http://schemas.android.com/apk/res-auto" >
-
-    <item
-        android:id="@+id/menuItem_settings"
-        android:icon="@drawable/ic_settings"/>
-    <item
-        android:id="@+id/menuItem_discord"
-        android:icon="@drawable/ic_discord" />
-    <item
-        android:id="@+id/menuItem_reportBug"
-        android:icon="@drawable/ic_bug" />
-    <item
-        android:id="@+id/menuItem_support"
-        android:icon="@drawable/ic_support" />
-    <item
-        android:id="@+id/menuItem_review"
-        android:icon="@drawable/ic_review" />
-    <item
-        android:id="@+id/menuItem_about"
-        android:icon="@drawable/ic_about" />
-</menu>
\ No newline at end of file
diff --git a/Android/app/src/main/res/values-es/strings.xml b/Android/app/src/main/res/values-es/strings.xml
deleted file mode 100644
index bf8694a93..000000000
--- a/Android/app/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>    
-    <!-- Something happening (typically use '-ing' and '…') -->
-    <string name="toast_canceling">Cancelando…</string>
-    <string name="toast_pleaseWait">Espere un momento…</string>
-    
-    <!-- Input Mapping -->
-    <string name="inputMapActivity_popupMessage">Pulsar botón, tecla, o mapear para joystick…\n\nBotón Actual:\n%1$s</string>
-    <string name="inputMapActivity_popupUnmap">Desmapear</string>
-    <string name="inputMapActivity_btnA">A</string>
-    <string name="inputMapActivity_btnB">B</string>
-    <string name="inputMapActivity_btnC">C</string>
-    <string name="inputMapActivity_btnL">L</string>
-    <string name="inputMapActivity_btnR">R</string>
-    <string name="inputMapActivity_btnZ">Z</string>
-    <string name="inputMapActivity_btnS">S</string>
-    <string name="inputMapActivity_btnCR">C-amarillo →</string>
-    <string name="inputMapActivity_btnCL">C-amarillo ←</string>
-    <string name="inputMapActivity_btnCD">C-amarillo ↓</string>
-    <string name="inputMapActivity_btnCU">C-amarillo ↑</string>
-    <string name="inputMapActivity_btnDR">D-cruz →</string>
-    <string name="inputMapActivity_btnDL">D-cruz ←</string>
-    <string name="inputMapActivity_btnDD">D-cruz ↓</string>
-    <string name="inputMapActivity_btnDU">D-cruz ↑</string>
-    <string name="inputMapActivity_btnAR">Análogo →</string>
-    <string name="inputMapActivity_btnAL">Análogo ←</string>
-    <string name="inputMapActivity_btnAD">Análogo ↓</string>
-    <string name="inputMapActivity_btnAU">Análogo ↑</string>
-    
-    <!-- Settings -->
-    <string name="Hardware">Hardware</string>
-    <string name="Other">Otros</string>
-    <string name="touch_screen_summary">Ajustes de mando en pantalla</string>
-    <string name="touch_screen_title">Pantalla táctil</string>
-    <string name="input_screen_summary">Ajustes de mando</string>
-    <string name="input_screen_title">Entrada</string>
-    <string name="video_screen_summary">Ajustes de gráficos</string>
-    <string name="video_screen_title">Video</string>
-    <string name="audio_screen_summary">Ajustes de audio</string>
-    <string name="audio_screen_title">Audio</string>
-    <string name="game_list_summary">Ajustes de lista de juegos</string>
-    <string name="game_list_title">Lista de juegos</string>
-    <string name="advanced_screen_summary">avanzado/opciones de depuración</string>
-    <string name="advanced_screen_title">Avanzado</string>
-    <string name="reset_summary"> Restablecer valores predeterminados</string>
-    <string name="reset_title">Reiniciar</string>
-    <string name="settings_title">Ajustes</string>
-    <string name="preferences">preferencias</string>
-    <string name="displayFps_title">Cuadros por segundo (FPS)</string>
-    <string name="displayFps_summary">Mostrar FPS en la pantalla</string>
-    <string name="audioEnabled_title">Habilitar Audio</string>
-    <string name="audioEnabled_summary">Habilitar/deshabilitar salida de audio</string>
-    <string name="advancedSettings_title">Ocultar ajustes avanzados</string>
-    <string name="advancedSettings_summary">Remover ajustes complejos que la mayoría de los usuarios no necesitan</string>
-    <string name="debuggerEnabled_title">Habilitar depurador</string>
-    <string name="debuggerEnabled_summary">habilitar/deshabilitar opciones adicionales para depurar el funcionamiento de los juegos</string>
-    <string name="BlockLinking_title">Enlance avanzado de bloques</string>
-    <string name="BlockLinking_summary">Precompilar bloques contiguamente</string>
-    <string name="RecordRecompilerAsm_title">Grabar Asm del recompilador</string>
-    <string name="RecordRecompilerAsm_summary">crear bitácora del Asm generado</string>
-    <string name="logging">Bitácoras</string>
-    <string name="project64core">Project64 Core</string>
-    <string name="AudioPlugin">Audio Plugin</string>
-    <string name="VideoPlugin">Video Plugin</string>
-    <string name="logging_project64core">Bitácora - Project64 Core</string>
-    <string name="logging_Audio">Bitácora - Audio</string>
-    <string name="logging_Video">Bitácora - Video</string>
-    <string name="TraceError">Error</string>
-    <string name="TraceWarning">Advertencia</string>
-    <string name="TraceNotice">Aviso</string>
-    <string name="TraceInfo">Info</string>
-    <string name="TraceDebug">Depurar</string>
-    <string name="TraceVerbose">Detallado</string>
-    <string name="TraceMD5">MD5</string>
-    <string name="TraceThread">Hilo</string>
-    <string name="TracePath">Path</string>
-    <string name="TraceSettings">Ajustes</string>
-    <string name="TraceUnknown">Desconocido</string>
-    <string name="TraceAppInit">App Init</string>
-    <string name="TraceAppCleanup">Limpieza</string>
-    <string name="TraceN64System">N64 System</string>
-    <string name="TracePlugins">Plugins</string>
-    <string name="TraceGFXPlugin">GFX Plugin</string>
-    <string name="TraceAudioPlugin">Audio Plugin</string>
-    <string name="TraceControllerPlugin">Plugin del mando</string>
-    <string name="TraceRSPPlugin">Plugin de RSP</string>
-    <string name="TraceRSP">RSP</string>
-    <string name="TraceAudio">Audio</string>
-    <string name="TraceRegisterCache">Registros de Caché</string>
-    <string name="TraceRecompiler">Recompilador</string>
-    <string name="TraceTLB">TLB</string>
-    <string name="TraceProtectedMem">Memoria protegida</string>
-    <string name="TraceUserInterface">Interfaz de usuario</string>
-    <string name="TraceRomList">Lista de ROMs</string>
-    <string name="TraceExceptionHandler">Manejador de excepciones</string>
-    <string name="TraceVideoMD5">MD5</string>
-    <string name="TraceVideoPath">Path</string>
-    <string name="TraceVideoSettings">Ajustes</string>
-    <string name="TraceVideoUnknown">Desconocido</string>
-    <string name="TraceVideoGlide64">Glide64</string>
-    <string name="TraceVideoInterface">Interfaz</string>
-    <string name="TraceVideoResolution">Resolución</string>
-    <string name="TraceVideoGlitch">Glitch</string>
-    <string name="TraceVideoTLUT">TLUT</string>
-    <string name="TraceVideoPNG">PNG</string>
-    <string name="TraceVideoOGLWrapper">OGL Wrapper</string>
-    <string name="TraceVideoRDP">RDP</string>
-    <string name="TraceAudioInitShutdown">Arranque/Apagado</string>
-    <string name="TraceAudioAudioInterface">Interfaz</string>
-    <string name="CpuType">Tipo de núcleo del CPU</string>
-    <string name="Interpreter">Interpreter</string>
-    <string name="Recompiler">Recompiler</string>
-    <string name="SyncCores">Synchronize Cores</string>
-    <string name="Advanced">Avanzado</string>
-    <string name="CpuUsage_title">Uso de CPU</string>
-    <string name="CpuUsage_summary">Mostrar el uso de CPU por componente</string>
-    <string name="LimitFPS_summary">Limitar la velocidad de ejecución</string>
-    <string name="LimitFPS_title">Limitar FPS</string>
-    <string name="screenResolution_title">Resolución de trazo</string>
-    <string name="screenResolution_summary">¿¿debería mostrar valor???</string>
-    <string name="AspectRatio_title">Relación de aspecto</string>
-    <string name="AspectRatio_summary">Selecionar relación de aspecto</string>
-    <string name="AspectRatio_4x3">4:3 (predeterminado)</string>
-    <string name="AspectRatio_16x9">Forzar 16:9</string>
-    <string name="AspectRatio_Stretch">Estirar</string>
-    <string name="AspectRatio_Original">Original</string>
-    <string name="DisplaySpeed_title">Mostrar velocidad</string>
-    <string name="DisplaySpeed_summary">Mostrar velocidad de emulación</string>
-    <string name="DisplaySpeedDisplay">Mostrar velocidad en pantalla</string>
-    <string name="DListPerSecond">Mostrar listas por segundo</string>
-    <string name="PercentageOfSpeed">Porcentaje de la velocidad máxima</string>
-    <string name="VerticalInterruptsPerSecond">Interrupciones verticales por segundo</string>
-    <string name="RecordExecutionTimes_title">Registrar tiempos de ejecución</string>
-    <string name="RecordExecutionTimes_summary">Registrar tiempo de ejecución de cada bloque</string>
-    <string name="DebugLanguage_title">Lenguaje de depuración</string>
-    <string name="DebugLanguage_summary">Mostrar identificador numérico para el texto traducido</string>
-    <string name="touchscreenScale_title">Escala del botón</string>
-    <string name="touchscreenLayout_title">Acomodo de la pantalla táctil</string>
-    <string name="gamepad_summary">Configurar mando utilizado</string>
-    <string name="gamepad_title">Ajustes de mando</string>
-    <string name="settings_reset_title">Reestablecer Ajustes</string>
-    <string name="settings_reset_message">¿Restablecer todos los ajustes a sus valores predeterminados?</string>
-    <string name="MaxRomsRemembered_title">Máximo # de juegos recordados</string>
-
-    <string-array name="DisplaySpeed_list">
-        <item>@string/DListPerSecond</item>
-        <item>@string/PercentageOfSpeed</item>
-        <item>@string/VerticalInterruptsPerSecond</item>
-    </string-array>
-    <string-array name="DisplaySpeed_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-        <item>0</item>
-    </string-array>
-    <string-array name="AspectRatio_list">
-        <item>@string/AspectRatio_4x3</item>
-        <item>@string/AspectRatio_16x9</item>
-        <item>@string/AspectRatio_Stretch</item>
-        <item>@string/AspectRatio_Original</item>
-    </string-array>
-    <string-array name="AspectRatio_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-    <string-array name="cpu_core_list">
-        <item>@string/Interpreter</item>
-        <item>@string/Recompiler</item>
-        <item>@string/SyncCores</item>
-    </string-array>
-    <string-array name="cpu_core_values" translatable="false">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-    
-    <string-array name="trace_severity_list">
-        <item>@string/TraceError</item>
-        <item>@string/TraceWarning</item>
-        <item>@string/TraceNotice</item>
-        <item>@string/TraceInfo</item>
-        <item>@string/TraceDebug</item>
-        <item>@string/TraceVerbose</item>
-    </string-array>
-
-    <!-- Confirmation Dialogs -->
-    <string name="confirmResetGame_title">¿Reiniciar el juego?</string>
-    <string name="confirmResetGame_message">El juego volverá a su estado inicial, todo progreso realizado se perderá.</string>
-   
-    <!-- Asset Extractor -->
-    <string name="assetExtractor_startingUp">Iniciando …</string>
-    <string name="assetExtractor_version">versión</string>
-    <string name="assetExtractor_progress">%1$.0f%% finalizado: extrayendo - %2$s</string>
-    <string name="assetExtractor_finished">Finalizado</string>
-    <string name="assetExtractor_error">Error</string>
-    <string name="assetExtractor_failed">Error extrayendo datos de aplicación.\nPor favor desconecte el cable USB, reinicie el dispositivo y reiniciar aplicación.\nPara obtener ayuda, visite %1$s.</string>
-    <string name="assetExtractor_failed_permissions">Esta aplicación no puede continuar sin estos permisos</string>
-    <string name="assetExtractor_permissions_title">Permisos</string>
-    <string name="assetExtractor_permissions_rationale">Project64 necesita poder: \nLeer tu almacenamiento para leer los archivos del juego, guardar estados y ajustes.\nEscribir en el almacenamiento para guardar ajustes datos.</string>
-
-    <!-- Review -->
-    <string name="review_title">Por favor, valore Project64 con 5 estrellas</string>
-    <string name="review_decription">Por favor, valore Project64 con 5 estrellas si lo ha disfrutado. Su apoyo y comentarios ayudan a mejorar Project64.</string>
-    <string name="review_cancel">No Calificar</string>
-    <string name="review_ok">Calificar con 5 Estrellas</string>
-
-    <!-- Game Directory Dialog -->
-    <string name="scanning_title">Escaneado…</string>
-</resources>
diff --git a/Android/app/src/main/res/values-v11/styles.xml b/Android/app/src/main/res/values-v11/styles.xml
deleted file mode 100644
index d4ce6ff3f..000000000
--- a/Android/app/src/main/res/values-v11/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.Project64" parent="@android:style/Theme.Holo" />
-</resources>
diff --git a/Android/app/src/main/res/values-v23/styles.xml b/Android/app/src/main/res/values-v23/styles.xml
new file mode 100644
index 000000000..79cd48dd7
--- /dev/null
+++ b/Android/app/src/main/res/values-v23/styles.xml
@@ -0,0 +1,7 @@
+<resources>
+    <style name="Theme.Project64.Base" parent="Theme.Project64.Base.7">
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/Android/app/src/main/res/values-v27/styles.xml b/Android/app/src/main/res/values-v27/styles.xml
new file mode 100644
index 000000000..aee4519b2
--- /dev/null
+++ b/Android/app/src/main/res/values-v27/styles.xml
@@ -0,0 +1,9 @@
+<resources>
+    <style name="Theme.Project64.Base" parent="Theme.Project64.Base.7">
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:navigationBarColor">@color/white</item>
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/Android/app/src/main/res/values/attrs.xml b/Android/app/src/main/res/values/attrs.xml
index b69257744..e4025da0c 100644
--- a/Android/app/src/main/res/values/attrs.xml
+++ b/Android/app/src/main/res/values/attrs.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <attr name="LogLevelPreferenceStyle" format="reference" />
+    <attr name="ListPreferenceStyle" format="reference" />
     <attr name="toolbar_popup_style" format="reference" />
     <attr name="background_actionbar" format="reference|color" />
     <attr name="background_gallerymenu" format="reference|color" />
diff --git a/Android/app/src/main/res/values/colors.xml b/Android/app/src/main/res/values/colors.xml
index ef2d818b0..dd57e68f2 100644
--- a/Android/app/src/main/res/values/colors.xml
+++ b/Android/app/src/main/res/values/colors.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="colorPrimary">#4683ec</color>
+    <color name="SettingsPrimary">#212121</color>
+    <color name="SettingsSecondary">#616161</color>
+    <color name="TextColor">#000000</color>
+    <color name="TabInactive">#000000</color>
+    <color name="TabActive">#4683ec</color>
+    <color name="ButtonTextColor">#ffffff</color>
 
     <color name="black">#000001</color>
     <color name="white">#ffffff</color>
diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml
index 6c7516d39..e1347af59 100644
--- a/Android/app/src/main/res/values/strings.xml
+++ b/Android/app/src/main/res/values/strings.xml
@@ -45,7 +45,7 @@
     <string name="reset_summary">Restore default settings</string>
     <string name="reset_title">Reset</string>
     <string name="settings_title">Settings</string>
-    <string name="preferences">preferences</string>
+    <string name="preferences">Preferences</string>
     <string name="displayFps_title">Framerate</string>
     <string name="displayFps_summary">Display FPS on screen</string>
     <string name="audioEnabled_title">Enable Audio</string>
@@ -189,7 +189,7 @@
     <string name="confirmResetGame_message">The game will go back to a clear state, all progress made will be lost.</string>
    
     <!-- Asset Extractor -->
-    <string name="assetExtractor_startingUp">Starting Up …</string>
+    <string name="assetExtractor_startingUp">Starting Up ...</string>
     <string name="assetExtractor_version">version</string>
     <string name="assetExtractor_progress">%1$.0f%% done: extracting - %2$s</string>
     <string name="assetExtractor_finished">Finished</string>
diff --git a/Android/app/src/main/res/values/styles.xml b/Android/app/src/main/res/values/styles.xml
index dc29a0601..e8d8021ba 100644
--- a/Android/app/src/main/res/values/styles.xml
+++ b/Android/app/src/main/res/values/styles.xml
@@ -1,60 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Theme.Project64" parent="@android:style/Theme">
         <item name="android:alertDialogTheme">@style/Theme.Project64.Dialog</item>
     </style>
 
-    <style name="Theme.Project64.Apearance" parent="Theme.AppCompat.NoActionBar">
-        <item name="background_actionbar">#4683ec</item>
-        <item name="background_gallerymenu">@color/black</item>
-        <item name="android:textColor">@color/black</item>
-        <item name="font_actionbar">@color/grey600</item>
-        <item name="font_actionbar_selected">@color/grey200</item>
-        <item name="textMenuColor">@color/white</item>
-        <item name="preferenceTheme">@style/Theme.Project64.Preference</item>
-        <item name="android:alertDialogTheme">@style/Theme.Project64.Dialog</item>
+    <style name="Theme.Project64.Base" parent="Theme.Project64.Base.7" />
+
+    <style name="Theme.Project64.Base.7" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:colorBackground">@android:color/white</item>
+        <item name="android:textColorPrimary">@color/TextColor</item>
+        <item name="android:textColor">@color/TextColor</item>
     </style>
 
-    <style name="Theme.Project64.GameActivity">
+    <style name="Theme.Project64.Apearance" parent="Theme.Project64.Base">
+    </style>
+
+    <style name="Theme.Project64.ToolBar" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
+        <item name="colorControlNormal">@color/grey700</item>
+        <item name="android:textColorPrimary">@color/grey700</item>
+        <item name="android:textColor">@color/grey700</item>
+        <item name="android:layout_marginTop">4dp</item>
+        <item name="android:layout_marginBottom">4dp</item>
+    </style>
+
+    <style name="Theme.Project64.ToolBar.TitleText" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">26sp</item>
+    </style>
+
+    <style name="Theme.Project64.About" parent="Theme.Project64.Base">
+        <item name="colorControlNormal">@color/grey700</item>
+        <item name="android:textColorPrimary">@color/grey700</item>
+        <item name="android:textColor">@color/grey700</item>
+    </style>
+
+    <style name="Theme.Project64.Dialog">
+    </style>
+
+    <style name="Theme.Project64.GameActivity" parent="Theme.Project64.Base">
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
     </style>
 
-    <style name="Theme.Project64.Splash" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@android:color/white</item>
-        <item name="android:colorBackground">@android:color/white</item>
-        <item name="android:textColor">#000000</item>
-    </style>
-
-    <style name="Theme.Project64.Preference" parent="PreferenceThemeOverlay" />
-
-    <style name="Theme.Project64.About" parent="Theme.Project64.Apearance">
+    <style name="Theme.Project64.Gallery" parent="Theme.Project64.Base">
         <item name="android:windowBackground">@android:color/white</item>
         <item name="android:colorBackground">@android:color/white</item>
     </style>
-    <style name="Theme.Project64.Dialog">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowTitleStyle">@style/Theme.Project64.DialogWindowTitle</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
-        <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
+
+    <style name="Theme.Project64.PreferenceCategory" parent="Preference.Material">
+        <item name="iconSpaceReserved">false</item>
+        <item name="android:layout">@layout/preference_category</item>
+        <item name="android:shouldDisableView">false</item>
+        <item name="android:selectable">false</item>
     </style>
 
-    <style name="Theme.Project64.DialogWindowTitle">
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textAppearance">@style/Theme.Project64.DialogWindowTitleStyle</item>
+    <style name="Theme.Project64.PreferenceCheckBox" parent="Preference.CheckBoxPreference.Material">
+        <item name="iconSpaceReserved">false</item>
     </style>
-    
-    <style name="Theme.Project64.DialogWindowTitleStyle">
-        <item name="android:textSize">25sp</item>
+
+    <style name="Theme.Project64.PreferenceLogLevel" parent="Preference.Material">
+        <item name="iconSpaceReserved">false</item>
     </style>
-    
-    <style name="Project64.Toolbar" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="Theme.Project64.PreferenceList" parent="Preference.Material">
+        <item name="iconSpaceReserved">false</item>
+    </style>
+
+    <style name="Theme.Project64.PreferenceNoIcon" parent="Preference.Material">
+        <item name="iconSpaceReserved">false</item>
+    </style>
+
+    <style name="Theme.Project64.Settings" parent="Theme.Project64.Base">
+        <item name="android:textColor">@color/SettingsPrimary</item>
+        <item name="android:textColorPrimary">@color/SettingsPrimary</item>
+        <item name="android:textColorSecondary">@color/SettingsSecondary</item>
+        <item name="preferenceCategoryStyle">@style/Theme.Project64.PreferenceCategory</item>
+        <item name="checkBoxPreferenceStyle">@style/Theme.Project64.PreferenceCheckBox</item>
+        <item name="LogLevelPreferenceStyle">@style/Theme.Project64.PreferenceLogLevel</item>
+        <item name="ListPreferenceStyle">@style/Theme.Project64.PreferenceList</item>
+        <item name="colorAccent">@color/colorPrimary</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="Theme.Project64.Splash" parent="Theme.Project64.Base">
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:colorBackground">@android:color/white</item>
+        <item name="android:textColor">@color/TextColor</item>
+    </style>
+
     <style name="btnMappable" parent="@android:style/Widget.Button">
         <item name="android:layout_width">@dimen/inputMapPreferenceButtonSize</item>
         <item name="android:layout_height">@dimen/inputMapPreferenceButtonSize</item>
diff --git a/Android/app/src/main/res/xml/analytics.xml b/Android/app/src/main/res/xml/analytics.xml
deleted file mode 100644
index fe3206016..000000000
--- a/Android/app/src/main/res/xml/analytics.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="ga_trackingId">UA-1193407-3</string>
-    <bool name="ga_autoActivityTracking">true</bool>
-    <bool name="ga_reportUncaughtExceptions">true</bool> 
-</resources>
\ No newline at end of file
diff --git a/Android/app/src/main/res/xml/game_settings.xml b/Android/app/src/main/res/xml/game_settings.xml
index cf3f608fe..0d0e283d7 100644
--- a/Android/app/src/main/res/xml/game_settings.xml
+++ b/Android/app/src/main/res/xml/game_settings.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/preferences">
 
-    <ListPreference
-        android:entries="@array/cpu_core_list"
-        android:entryValues="@array/cpu_core_values"
+    <emu.project64.settings.ListPreference
+        app:entries="@array/cpu_core_list"
+        app:entryValues="@array/cpu_core_values"
         android:key="Game_CpuType"
-        android:title="@string/CpuType" />
+        android:title="@string/CpuType"
+        />
     
     <CheckBoxPreference
         android:key="Game_BlockLinking"
diff --git a/Android/app/src/main/res/xml/setting_gamelist.xml b/Android/app/src/main/res/xml/setting_gamelist.xml
index 508c363ee..5afbfd03c 100644
--- a/Android/app/src/main/res/xml/setting_gamelist.xml
+++ b/Android/app/src/main/res/xml/setting_gamelist.xml
@@ -7,10 +7,6 @@
         android:defaultValue="10"
         android:key="MaxRomsRemembered"
         android:title="@string/MaxRomsRemembered_title"
-        project64:maximumValue="20"
-        project64:minimumValue="0"
-        project64:stepSize="1"
-        project64:units=""
-    /> 
+    />
 
 	</PreferenceScreen>
diff --git a/Android/app/src/main/res/xml/setting_touch_screen.xml b/Android/app/src/main/res/xml/setting_touch_screen.xml
index 62c0fe25d..294ff52f0 100644
--- a/Android/app/src/main/res/xml/setting_touch_screen.xml
+++ b/Android/app/src/main/res/xml/setting_touch_screen.xml
@@ -7,11 +7,7 @@
         android:defaultValue="100"
         android:key="touchscreenScale"
         android:title="@string/touchscreenScale_title"
-        project64:maximumValue="400"
-        project64:minimumValue="50"
-        project64:stepSize="1"
-        project64:units="%"
-    /> 
+    />
 
     <emu.project64.settings.TwoLinesListPreference
         android:defaultValue="0"
diff --git a/Android/app/src/main/res/xml/settings.xml b/Android/app/src/main/res/xml/settings.xml
index 40d2e2649..5fc319a71 100644
--- a/Android/app/src/main/res/xml/settings.xml
+++ b/Android/app/src/main/res/xml/settings.xml
@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/preferences">
+<androidx.preference.PreferenceScreen
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:title="@string/preferences">
 
-    <PreferenceCategory android:title="@string/Hardware" >
+    <PreferenceCategory app:title="@string/Hardware">
         <Preference
-            android:summary="@string/input_screen_summary"
-            android:title="@string/input_screen_title"
-            android:key="settings_input" 
-            android:icon="@drawable/ic_controller"
+            app:key="settings_input"
+            app:title="@string/input_screen_title"
+            app:summary="@string/input_screen_summary"
+            app:icon="@drawable/ic_controller"
             />
         <Preference
-            android:summary="@string/video_screen_summary"
-            android:title="@string/video_screen_title"
-            android:key="settings_video" 
-            android:icon="@drawable/ic_picture"
+            app:key="settings_video"
+            app:title="@string/video_screen_title"
+            app:summary="@string/video_screen_summary"
+            app:icon="@drawable/ic_picture"
             />
         <Preference
-            android:summary="@string/audio_screen_summary"
-            android:title="@string/audio_screen_title"
-            android:key="settings_audio" 
-            android:icon="@drawable/ic_speaker"
+            app:key="settings_audio"
+            app:title="@string/audio_screen_title"
+            app:summary="@string/audio_screen_summary"
+            app:icon="@drawable/ic_speaker"
             />
-      <Preference
-          android:summary="@string/game_list_summary"
-          android:title="@string/game_list_title"
-          android:key="settings_game_list"
-          android:icon="@drawable/ic_storage"
+        <Preference
+            app:key="settings_game_list"
+            app:title="@string/game_list_title"
+            app:summary="@string/game_list_summary"
+            app:icon="@drawable/ic_storage"
             />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/Other" >
+    <PreferenceCategory app:title="@string/Other">
         <Preference
-            android:summary="@string/advanced_screen_summary"
-            android:title="@string/advanced_screen_title"
-            android:key="settings_advanced" 
-            android:icon="@drawable/ic_debug"
+            app:key="settings_advanced"
+            app:title="@string/advanced_screen_title"
+            app:summary="@string/advanced_screen_summary"
+            app:icon="@drawable/ic_debug"
             />
         <Preference
-            android:summary="@string/reset_summary"
-            android:title="@string/reset_title"
-            android:key="settings_reset" 
-            android:icon="@drawable/ic_undo"
+            app:key="settings_reset"
+            app:title="@string/reset_title"
+            app:summary="@string/reset_summary"
+            app:icon="@drawable/ic_undo"
             />
     </PreferenceCategory>
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/Android/app/src/main/res/xml/settings_advanced.xml b/Android/app/src/main/res/xml/settings_advanced.xml
index 32a4f7f20..004a454a7 100644
--- a/Android/app/src/main/res/xml/settings_advanced.xml
+++ b/Android/app/src/main/res/xml/settings_advanced.xml
@@ -32,12 +32,15 @@
       android:title="@string/DebugLanguage_title" />
   <PreferenceCategory android:title="@string/logging" >
       <Preference
+          style="@style/Theme.Project64.PreferenceNoIcon"
           android:title="@string/project64core"
           android:key="logging_core" />
       <Preference
+          style="@style/Theme.Project64.PreferenceNoIcon"
           android:title="@string/VideoPlugin"
           android:key="logging_video" />
       <Preference
+          style="@style/Theme.Project64.PreferenceNoIcon"
           android:title="@string/AudioPlugin"
           android:key="logging_audio" />
     </PreferenceCategory>