diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 8a5639cc..23bf4e9b 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -71,7 +71,7 @@
diff --git a/mobile/src/main/java/com/github/shadowsocks/VpnRequestActivity.kt b/mobile/src/main/java/com/github/shadowsocks/VpnRequestActivity.kt
index 03cf7642..2ce7837c 100644
--- a/mobile/src/main/java/com/github/shadowsocks/VpnRequestActivity.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/VpnRequestActivity.kt
@@ -20,7 +20,6 @@
package com.github.shadowsocks
-import android.app.Activity
import android.app.KeyguardManager
import android.content.BroadcastReceiver
import android.content.Context
@@ -28,13 +27,14 @@ import android.content.Intent
import android.content.IntentFilter
import android.net.VpnService
import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
import android.util.Log
import com.github.shadowsocks.App.Companion.app
import com.github.shadowsocks.aidl.IShadowsocksService
import com.github.shadowsocks.bg.BaseService
import com.github.shadowsocks.utils.broadcastReceiver
-class VpnRequestActivity : Activity(), ShadowsocksConnection.Interface {
+class VpnRequestActivity : AppCompatActivity(), ShadowsocksConnection.Interface {
companion object {
private const val TAG = "VpnRequestActivity"
private const val REQUEST_CONNECT = 1
diff --git a/mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt b/mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
index d10fe208..96512c9e 100644
--- a/mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/bg/LocalSocketListener.kt
@@ -41,7 +41,7 @@ abstract class LocalSocketListener(protected val tag: String) : Thread() {
* Inherited class do not need to close input/output streams as they will be closed automatically.
*/
protected abstract fun accept(socket: LocalSocket)
- override final fun run() {
+ final override fun run() {
socketFile.delete() // It's a must-have to close and reuse previous local socket.
LocalSocket().use { localSocket ->
val serverSocket = try {
diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml
index 027dd5af..fecb5e51 100644
--- a/mobile/src/main/res/values/styles.xml
+++ b/mobile/src/main/res/values/styles.xml
@@ -1,5 +1,15 @@
+