diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index c7d1c5a..e7bedf3 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +1,3 @@
-<component name="CopyrightManager">
-  <settings default="" />
+<component name="CopyrightManager">
+  <settings default="" />
 </component>
\ No newline at end of file
diff --git a/.idea/dictionaries/haruue.xml b/.idea/dictionaries/haruue.xml
new file mode 100644
index 0000000..3a5b217
--- /dev/null
+++ b/.idea/dictionaries/haruue.xml
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="haruue">
+    <words>
+      <w>wadb</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fe72da5..7ac24c7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/README-zh_rCN.md b/README-zh_rCN.md
index 50e7fc6..5c8d071 100644
--- a/README-zh_rCN.md
+++ b/README-zh_rCN.md
@@ -33,7 +33,7 @@ start adbd
 Apache License 2.0
 
 ```License
-Copyright 2016 Haruue Icymoon
+Copyright 2016 Haruue Icymoon, PinkD
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 9cd50fa..98de920 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Support us in Play Store：
 Apache License 2.0
 
 ```License
-Copyright 2016 Haruue Icymoon
+Copyright 2016 Haruue Icymoon, PinkD
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/app/app-release.apk b/app/app-release.apk
index 2703ac6..f7d4f42 100644
Binary files a/app/app-release.apk and b/app/app-release.apk differ
diff --git a/app/build.gradle b/app/build.gradle
index 8369290..65a736c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
+    compileSdkVersion 25
     buildToolsVersion "24.0.3"
     defaultConfig {
         applicationId "moe.haruue.wadb"
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 11
-        versionName "2.2.0"
+        versionCode 12
+        versionName "2.3.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         jackOptions {
             enabled true
@@ -37,14 +37,13 @@ repositories {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
+    compile 'com.android.support:appcompat-v7:25.2.0'
     testCompile 'junit:junit:4.12'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
     androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support:support-annotations:24.2.1'
-    compile 'com.android.support:design:24.2.1'
-    compile 'eu.chainfire:libsuperuser:1.0.0.+'
+    androidTestCompile 'com.android.support:support-annotations:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+    compile 'eu.chainfire:libsuperuser:1.0.0.201608240809'
     compile 'moe.haruue:haruueutils:1.1.1-preview'
     compile 'com.jude:easyrecyclerview:4.0.5'
 }
diff --git a/app/src/main/java/moe/haruue/wadb/data/Commands.java b/app/src/main/java/moe/haruue/wadb/data/Commands.java
index 561cbe8..1534dc7 100644
--- a/app/src/main/java/moe/haruue/wadb/data/Commands.java
+++ b/app/src/main/java/moe/haruue/wadb/data/Commands.java
@@ -24,6 +24,24 @@ public interface CommandsListener {
         void onWadbStopListener(boolean isSuccess);
     }
 
+    public static abstract class AbstractCommandsListener implements CommandsListener {
+
+        @Override
+        public void onGetSUAvailable(boolean isAvailable) {}
+
+        @Override
+        public void onGetAdbState(boolean isWadb, int port) {}
+
+        @Override
+        public void onGetAdbStateFailure() {}
+
+        @Override
+        public void onWadbStartListener(boolean isSuccess) {}
+
+        @Override
+        public void onWadbStopListener(boolean isSuccess) {}
+    }
+
     private static boolean isSUAvailable() {
         return Shell.SU.available();
     }
diff --git a/app/src/main/java/moe/haruue/wadb/ui/fragment/MainFragment.java b/app/src/main/java/moe/haruue/wadb/ui/fragment/MainFragment.java
index d5ac923..c892261 100644
--- a/app/src/main/java/moe/haruue/wadb/ui/fragment/MainFragment.java
+++ b/app/src/main/java/moe/haruue/wadb/ui/fragment/MainFragment.java
@@ -10,6 +10,7 @@
 
 import moe.haruue.util.StandardUtils;
 import moe.haruue.wadb.R;
+import moe.haruue.wadb.data.Commands;
 import moe.haruue.wadb.presenter.Commander;
 import moe.haruue.wadb.ui.activity.LaunchActivity;
 import moe.haruue.wadb.ui.service.NotificationService;
@@ -34,15 +35,10 @@ public void onCreate(Bundle savedInstanceState) {
         PreferenceManager.setDefaultValues(getActivity(), R.xml.preferences, false);
         wadbSwitchPreference = (SwitchPreference) findPreference("pref_key_wadb_switch");
         portPreference = (EditTextPreference) findPreference("pref_key_wadb_port");
-        init();
         Commander.checkWadbState();
     }
 
     private void init() {
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(StandardUtils.getApplication());
-        String port = sharedPreferences.getString("pref_key_wadb_port", "5555");
-        portPreference.setSummary(port);
-        portPreference.setText(port);
     }
 
     @Override
@@ -83,15 +79,25 @@ public void onOperateFailure() {
 
         @Override
         public void onWadbStart(String ip, int port) {
+            // refresh switch
             wadbSwitchPreference.setChecked(true);
             wadbSwitchPreference.setSummaryOn(ip + ":" + port);
+            // refresh port
+            portPreference.setText(port + "");
+            portPreference.setSummary(port + "");
             wadbSwitchPreference.setEnabled(true);
         }
 
         @Override
         public void onWadbStop() {
+            // refresh switch
             wadbSwitchPreference.setChecked(false);
             wadbSwitchPreference.getEditor().putBoolean("pref_key_wadb_switch", false).commit();
+            // refresh port
+            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(StandardUtils.getApplication());
+            String port = sharedPreferences.getString("pref_key_wadb_port", "5555");
+            portPreference.setSummary(port);
+            portPreference.setText(port);
             wadbSwitchPreference.setEnabled(true);
         }
 
@@ -149,6 +155,14 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
                     }
                     portPreference.setText(port);
                     portPreference.setSummary(port);
+                    Commands.getWadbState(new Commands.AbstractCommandsListener() {
+                        @Override
+                        public void onGetAdbState(boolean isWadb, int port) {
+                            if (isWadb) {
+                                Commander.startWadb();
+                            }
+                        }
+                    });
                     break;
             }
         }
diff --git a/app/src/main/res/raw/license.html b/app/src/main/res/raw/license.html
index f185e38..365e0ce 100644
--- a/app/src/main/res/raw/license.html
+++ b/app/src/main/res/raw/license.html
@@ -1,7 +1,7 @@
 <h2>WADB</h2>
-<p>Author: Haruue Icymoon<br>
+<p>Author: Haruue Icymoon, PinkD<br>
 Link: https://github.com/haruue/WADB</p>
-<pre>Copyright 2016 Haruue Icymoon<br>
+<pre>Copyright 2016 Haruue Icymoon, PinkD<br>
 <br>
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);<br>
 you may not use this file except in compliance with the License.<br>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index a93b042..f0804ec 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -34,6 +34,6 @@
     <string name="wake_lock">屏幕常亮</string>
     <string name="wake_lock_on">啟用調試時屏幕常亮</string>
     <string name="wake_lock_off">不啟用調試時屏幕常亮</string>
-    <string name="port">端口</string>
-    <string name="bad_port_number">端口只能在1025–65535之間 \n已重置為5555</string>
+    <string name="port">埠</string>
+    <string name="bad_port_number">埠只能在1025–65535之間 \n已重置為5555</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 47e3c81..5d8dc76 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -34,6 +34,6 @@
     <string name="wake_lock">屏幕常亮</string>
     <string name="wake_lock_on">啟用調試時屏幕常亮</string>
     <string name="wake_lock_off">不啟用調試時屏幕常亮</string>
-    <string name="port">端口</string>
-    <string name="bad_port_number">端口只能在1025–65535之間 \n已重置為5555</string>
+    <string name="port">埠</string>
+    <string name="bad_port_number">埠只能在1025–65535之間 \n已重置為5555</string>
 </resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 04d89d8..2058815 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,4 @@
 systemProp.http.proxyHost=127.0.0.1
 systemProp.http.nonProxyHosts=dl.google.com
 org.gradle.jvmargs=-Xmx1536m
-systemProp.http.proxyPort=1080
+systemProp.http.proxyPort=41080