diff --git a/Android/app/src/main/res/layout/preference_category.xml b/Android/app/src/main/res/layout/preference_category.xml
new file mode 100644
index 000000000..41f37d8f3
--- /dev/null
+++ b/Android/app/src/main/res/layout/preference_category.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    >
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dip"
+        android:paddingStart="?attr/listPreferredItemPaddingStart"
+        android:paddingEnd="?attr/listPreferredItemPaddingEnd"
+        android:paddingTop="10dip"
+        android:textColor="?colorAccent"
+        android:textStyle="bold"
+        android:textSize="24dp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/scan_roms_activity.xml b/Android/app/src/main/res/layout/scan_roms_activity.xml
index bb76ea187..b86d34c3b 100644
--- a/Android/app/src/main/res/layout/scan_roms_activity.xml
+++ b/Android/app/src/main/res/layout/scan_roms_activity.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/scanRomsDialog_selectDir"
@@ -23,7 +24,10 @@
         android:id="@+id/ScanRecursively"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp" />
+        android:padding="10dp"
+        android:textColor="@color/TextColor"
+        app:buttonTint="@color/TextColor"
+        />
     <RelativeLayout
         android:id="@+id/linearLayoutButtons"
         android:layout_width="match_parent"
@@ -37,7 +41,8 @@
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@+id/buttonOk"
             android:layout_toStartOf="@+id/buttonOk"
-            android:text="@android:string/cancel" />
+            android:text="@android:string/cancel"
+            android:textColor="@color/ButtonTextColor" />
 
         <Button
             android:id="@+id/buttonOk"
@@ -45,6 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:text="@android:string/ok" />
+            android:text="@android:string/ok"
+            android:textColor="@color/ButtonTextColor" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/settings_activity.xml b/Android/app/src/main/res/layout/settings_activity.xml
index 01d2df0bc..42629b3f9 100644
--- a/Android/app/src/main/res/layout/settings_activity.xml
+++ b/Android/app/src/main/res/layout/settings_activity.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <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:theme="@style/Theme.Project64.ToolBar"
+        app:titleTextAppearance="@style/Theme.Project64.ToolBar.TitleText"
+        />
     <FrameLayout
         android:id="@+id/fragment_placeholder"
         android:layout_width="fill_parent"
diff --git a/Android/app/src/main/res/layout/splash_activity.xml b/Android/app/src/main/res/layout/splash_activity.xml
index 4e867f98a..94aee982d 100644
--- a/Android/app/src/main/res/layout/splash_activity.xml
+++ b/Android/app/src/main/res/layout/splash_activity.xml
@@ -5,17 +5,18 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:ignore="UseCompoundDrawables" >
-    
-    <ImageView android:id="@+id/mainImage" 
-        android:layout_width="wrap_content" 
-        android:layout_gravity="center" 
-        android:layout_height="match_parent" 
-        android:scaleType="fitXY" 
-        android:adjustViewBounds="true" 
-        android:contentDescription="@string/app_name" 
-        android:src="@drawable/publisherlogo" 
-        android:layout_weight="1"
-     />
+
+	<ImageView
+		android:id="@+id/mainImage"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_gravity="center"
+		android:layout_weight="1"
+		android:adjustViewBounds="true"
+		android:contentDescription="@string/app_name"
+		android:scaleType="fitXY"
+		android:src="@drawable/publisherlogo"
+		tools:src="@drawable/publisherlogo" />
     
     <LinearLayout
         android:layout_width="match_parent"