diff --git a/src/main/aidl/com/github/shadowsocks/aidl/Config.aidl b/src/main/aidl/com/github/shadowsocks/aidl/Config.aidl
new file mode 100644
index 00000000..667e8d16
--- /dev/null
+++ b/src/main/aidl/com/github/shadowsocks/aidl/Config.aidl
@@ -0,0 +1,3 @@
+package com.github.shadowsocks.aidl;
+
+parcelable Config;
\ No newline at end of file
diff --git a/src/main/aidl/com/github/shadowsocks/aidl/Config.java b/src/main/aidl/com/github/shadowsocks/aidl/Config.java
new file mode 100644
index 00000000..f0afc982
--- /dev/null
+++ b/src/main/aidl/com/github/shadowsocks/aidl/Config.java
@@ -0,0 +1,88 @@
+package com.github.shadowsocks.aidl;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class Config implements Parcelable {
+
+  public boolean isGlobalProxy = true;
+  public boolean isGFWList = true;
+  public boolean isBypassApps = false;
+  public boolean isTrafficStat = false;
+  public boolean isUdpDns = false;
+
+  public String profileName = "Untitled";
+  public String proxy = "127.0.0.1";
+  public String sitekey = "null";
+
+  public String encMethod = "rc4";
+  public String proxiedAppString = "";
+
+  public int remotePort = 1984;
+  public int localPort = 1080;
+
+  public static final Parcelable.Creator<Config> CREATOR = new Parcelable.Creator<Config>() {
+    public Config createFromParcel(Parcel in) {
+      return new Config(in);
+    }
+
+    public Config[] newArray(int size) {
+      return new Config[size];
+    }
+  };
+
+  public Config(boolean isGlobalProxy, boolean isGFWList, boolean isBypassApps,
+      boolean isTrafficStat, boolean isUdpDns, String profileName, String proxy, String sitekey,
+      String encMethod, String proxiedAppString, int remotePort, int localPort) {
+    this.isGlobalProxy = isGlobalProxy;
+    this.isGFWList = isGFWList;
+    this.isBypassApps = isBypassApps;
+    this.isTrafficStat = isTrafficStat;
+    this.isUdpDns = isUdpDns;
+    this.profileName = profileName;
+    this.proxy = proxy;
+    this.sitekey = sitekey;
+    this.encMethod = encMethod;
+    this.proxiedAppString = proxiedAppString;
+    this.remotePort = remotePort;
+    this.localPort = localPort;
+  }
+
+  private Config(Parcel in) {
+    readFromParcel(in);
+  }
+
+  public void readFromParcel(Parcel in) {
+    isGlobalProxy = in.readInt() == 1;
+    isGFWList = in.readInt() == 1;
+    isBypassApps = in.readInt() == 1;
+    isTrafficStat = in.readInt() == 1;
+    isUdpDns = in.readInt() == 1;
+    profileName = in.readString();
+    proxy = in.readString();
+    sitekey = in.readString();
+    encMethod = in.readString();
+    proxiedAppString = in.readString();
+    remotePort = in.readInt();
+    localPort = in.readInt();
+  }
+
+  @Override public int describeContents() {
+    return 0;
+  }
+
+  @Override public void writeToParcel(Parcel out, int flags) {
+    out.writeInt(isGlobalProxy ? 1 : 0);
+    out.writeInt(isGFWList ? 1 : 0);
+    out.writeInt(isBypassApps ? 1 : 0);
+    out.writeInt(isTrafficStat ? 1 : 0);
+    out.writeInt(isUdpDns ? 1 : 0);
+    out.writeString(profileName);
+    out.writeString(proxy);
+    out.writeString(sitekey);
+    out.writeString(encMethod);
+    out.writeString(proxiedAppString);
+    out.writeInt(remotePort);
+    out.writeInt(localPort);
+  }
+}
diff --git a/src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksService.aidl b/src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksService.aidl
new file mode 100644
index 00000000..70667310
--- /dev/null
+++ b/src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksService.aidl
@@ -0,0 +1,15 @@
+package com.github.shadowsocks.aidl;
+
+import com.github.shadowsocks.aidl.Config;
+import com.github.shadowsocks.aidl.IShadowsocksServiceCallback;
+
+interface IShadowsocksService {
+  int getMode();
+  int getState();
+
+  oneway void registerCallback(IShadowsocksServiceCallback cb);
+  oneway void unregisterCallback(IShadowsocksServiceCallback cb);
+
+  oneway void start(in Config config);
+  oneway void stop();
+}
diff --git a/src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksServiceCallback.aidl b/src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksServiceCallback.aidl
new file mode 100644
index 00000000..d079a20c
--- /dev/null
+++ b/src/main/aidl/com/github/shadowsocks/aidl/IShadowsocksServiceCallback.aidl
@@ -0,0 +1,5 @@
+package com.github.shadowsocks.aidl;
+
+interface IShadowsocksServiceCallback {
+  oneway void stateChanged(int state, String msg);
+}
diff --git a/src/main/res/xml/pref_all.xml b/src/main/res/xml/pref_all.xml
new file mode 100644
index 00000000..031f9550
--- /dev/null
+++ b/src/main/res/xml/pref_all.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <PreferenceCategory 
+      android:title="@string/proxy_cat">
+
+  <com.github.shadowsocks.preferences.ProfileEditTextPreference
+      android:defaultValue="Default"
+      android:key="profileName"
+      android:summary="@string/profile_summary"
+      android:title="@string/profile">
+  </com.github.shadowsocks.preferences.ProfileEditTextPreference>
+  <com.github.shadowsocks.preferences.SummaryEditTextPreference
+      android:defaultValue="198.199.101.152"
+      android:key="proxy"
+      android:summary="@string/proxy_summary"
+      android:title="@string/proxy">
+  </com.github.shadowsocks.preferences.SummaryEditTextPreference>
+  <com.github.shadowsocks.preferences.SummaryEditTextPreference
+      android:defaultValue="443"
+      android:key="remotePort"
+      android:summary="@string/remote_port_summary"
+      android:title="@string/remote_port">
+  </com.github.shadowsocks.preferences.SummaryEditTextPreference>
+  <com.github.shadowsocks.preferences.SummaryEditTextPreference
+      android:defaultValue="1080"
+      android:key="port"
+      android:summary="@string/port_summary"
+      android:title="@string/port">
+  </com.github.shadowsocks.preferences.SummaryEditTextPreference>
+  <com.github.shadowsocks.preferences.PasswordEditTextPreference
+      android:inputType="textPassword"
+      android:defaultValue="u1rRWTssNv0p"
+      android:key="sitekey"
+      android:summary="@string/sitekey_summary"
+      android:title="@string/sitekey">
+  </com.github.shadowsocks.preferences.PasswordEditTextPreference>
+  <ListPreference
+      android:defaultValue="rc4"
+      android:key="encMethod"
+      android:entries="@array/enc_method_entry"
+      android:entryValues="@array/enc_method_value"
+      android:title="@string/enc_method">
+  </ListPreference>
+
+ </PreferenceCategory>
+
+ <PreferenceCategory 
+      android:title="@string/feature_cat">
+
+  <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="isGFWList"
+      android:summary="@string/auto_set_gfwlist_summary"
+      android:title="@string/auto_set_gfwlist">
+  </CheckBoxPreference>
+  <CheckBoxPreference
+      android:defaultValue="true"
+      android:key="isGlobalProxy"
+      android:disableDependentsState="true"
+      android:summary="@string/auto_set_proxy_summary"
+      android:title="@string/auto_set_proxy">
+  </CheckBoxPreference>
+  <Preference
+      android:key="proxyedApps"
+      android:dependency="isGlobalProxy"
+      android:summary="@string/proxied_apps_summary"
+      android:title="@string/proxied_apps">
+    <intent android:action="com.github.shadowsocks.AppManager"/>
+  </Preference>
+  <CheckBoxPreference
+    android:key="isTrafficStat"
+    android:defaultValue="true"
+    android:summary="@string/traffic_stat_summary"
+    android:title="@string/traffic_stat">
+  </CheckBoxPreference>
+  <CheckBoxPreference
+      android:key="isUdpDns"
+      android:defaultValue="false"
+      android:summary="@string/udp_dns_summary"
+      android:title="@string/udp_dns">
+  </CheckBoxPreference>
+  <CheckBoxPreference
+      android:key="isAutoConnect"
+      android:summary="@string/auto_connect_summary"
+      android:title="@string/auto_connect">
+  </CheckBoxPreference>
+
+ </PreferenceCategory>
+
+</PreferenceScreen>