diff --git a/app/src/main/java/com/hippo/ehviewer/ehclient/EhInfo.java b/app/src/main/java/com/hippo/ehviewer/ehclient/EhInfo.java
index 293f76dc8..a694bc1ce 100644
--- a/app/src/main/java/com/hippo/ehviewer/ehclient/EhInfo.java
+++ b/app/src/main/java/com/hippo/ehviewer/ehclient/EhInfo.java
@@ -21,6 +21,7 @@ import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
 
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.util.Config;
@@ -76,6 +77,11 @@ public class EhInfo {
     private String mPreviewMode;
     private int mExculdeTagGroup;
     private String mExculdeLanguage;
+
+    private String mHAHIp;
+    private String mHAHPort;
+    private String mHAHPasskey;
+
     private static EhInfo sInstance;
 
     private BitmapDrawable getAvatarFromFile() {
@@ -110,16 +116,28 @@ public class EhInfo {
         mPreviewMode = Config.getPreviewMode();
         mExculdeTagGroup = Config.getExculdeTagGroup();
         mExculdeLanguage = Config.getExculdeLanguage();
+        mHAHIp = Config.getHAHIp();
+        mHAHPort = Config.getHAHPort();
+        mHAHPasskey = Config.getHAHPasskey();
         updateUconfig();
-    };
+    }
 
     private String getUconfigString(String previewMode) {
-        return new StringBuilder().append("cats_").append(mDefaultCat)
-                .append("-ts_").append(previewMode == null ? mPreviewMode : previewMode)
-                .append("-xns_").append(mExculdeTagGroup)
-                .append("-xl_").append(mExculdeLanguage)
-                .append("-tl_m-uh_y-tr_2-prn_n-dm_l-ar_0-rc_0-rx_0-ry_0-sa_y-oi_n-qb_n-tf_n-hp_-hk_-ms_n-mt_n")
-                .toString();
+        String proxy;
+        if (TextUtils.isEmpty(mHAHIp) || TextUtils.isEmpty(mHAHPort)) {
+            proxy = "";
+        } else {
+            proxy = mHAHIp + "%3A" + mHAHPort;
+        }
+
+        return "cats_" + mDefaultCat
+                + "-ts_" + (previewMode == null ? mPreviewMode : previewMode)
+                + "-xns_" + mExculdeTagGroup
+                + "-xl_" + mExculdeLanguage
+                + "-hp_" + proxy
+                + "-hk_" + mHAHPasskey
+                + "-prn_" + (TextUtils.isEmpty(proxy) ? "n" : "y")
+                + "-tl_m-uh_y-tr_2-dm_l-ar_0-rc_0-rx_0-ry_0-sa_y-oi_n-qb_n-tf_n-ms_n-mt_n";
     }
 
     private void updateUconfig() {
@@ -186,6 +204,7 @@ public class EhInfo {
         // Fake
         sb.append("; igneous=");
         sb.append("; lv=");
+
         conn.setRequestProperty("Cookie", sb.toString());
     }
 
@@ -266,4 +285,11 @@ public class EhInfo {
         mExculdeLanguage = exculdeLanguage;
         updateUconfig();
     }
+
+    public void setHAHProxy(String ip, String port, String passkey) {
+        mHAHIp = ip;
+        mHAHPort = port;
+        mHAHPasskey = passkey;
+        updateUconfig();
+    }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java
index ec19a61f7..fa5dca2b0 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/SettingsActivity.java
@@ -198,6 +198,7 @@ public class SettingsActivity extends AbsPreferenceActivity {
         private static final String KEY_CLEAR_SUGGESTIONS = "clear_suggestions";
         private static final String KEY_PREVIEW_MODE = "preview_mode";
         private static final String KEY_DEFAULT_FAVORITE = "default_favorite";
+        private static final String KEY_HAH_PROXY = "hah_proxy";
 
         private Preference mListDefaultCategory;
         private Preference mExculdeTagGroup;
@@ -205,6 +206,7 @@ public class SettingsActivity extends AbsPreferenceActivity {
         private Preference mClearSuggestions;
         private ListPreference mPreviewMode;
         private ListPreference mDefaultFavorite;
+        private Preference mHAHProxy;
 
         @Override
         public void onCreate(Bundle savedInstanceState) {
@@ -222,6 +224,8 @@ public class SettingsActivity extends AbsPreferenceActivity {
             mPreviewMode = (ListPreference) findPreference(KEY_PREVIEW_MODE);
             mPreviewMode.setOnPreferenceChangeListener(this);
             mDefaultFavorite = (ListPreference) findPreference(KEY_DEFAULT_FAVORITE);
+            mHAHProxy = findPreference(KEY_HAH_PROXY);
+            mHAHProxy.setOnPreferenceClickListener(this);
 
             int i = 0;
             String[] entrise = new String[Favorite.FAVORITE_TITLES.length + 1];
@@ -274,9 +278,11 @@ public class SettingsActivity extends AbsPreferenceActivity {
                         .setButtonListener(new MaterialAlertDialog.OnClickListener() {
                             @Override
                             public boolean onClick(MaterialAlertDialog dialog, int which) {
-                                int newValue = getExculdeTagGroup(tl);
-                                Config.setExculdeTagGroup(newValue);
-                                EhInfo.getInstance(getActivity()).setExculdeTagGroup(newValue);
+                                if (which == MaterialAlertDialog.POSITIVE) {
+                                    int newValue = getExculdeTagGroup(tl);
+                                    Config.setExculdeTagGroup(newValue);
+                                    EhInfo.getInstance(getActivity()).setExculdeTagGroup(newValue);
+                                }
                                 return true;
                             }
                         }).show();
@@ -290,9 +296,11 @@ public class SettingsActivity extends AbsPreferenceActivity {
                         .setButtonListener(new MaterialAlertDialog.OnClickListener() {
                             @Override
                             public boolean onClick(MaterialAlertDialog dialog, int which) {
-                                String newValue = getExculdeLanguage(tl);
-                                Config.setExculdeLanguage(newValue);
-                                EhInfo.getInstance(getActivity()).setExculdeLanguage(newValue);
+                                if (which == MaterialAlertDialog.POSITIVE) {
+                                    String newValue = getExculdeLanguage(tl);
+                                    Config.setExculdeLanguage(newValue);
+                                    EhInfo.getInstance(getActivity()).setExculdeLanguage(newValue);
+                                }
                                 return true;
                             }
                         }).show();
@@ -301,6 +309,34 @@ public class SettingsActivity extends AbsPreferenceActivity {
                 SearchRecentSuggestions suggestions = SuggestionHelper.getInstance(getActivity(),
                         SimpleSuggestionProvider.AUTHORITY, SimpleSuggestionProvider.MODE);
                 suggestions.clearHistory();
+
+            } else if (KEY_HAH_PROXY.equals(key)) {
+                LinearLayout ll = (LinearLayout) ViewUtils.inflateDialogView(R.layout.hah_proxy, false);
+                final EditText hahIp = (EditText) ll.findViewById(R.id.hah_ip);
+                final EditText hahPort = (EditText) ll.findViewById(R.id.hah_port);
+                final EditText hahPasskey = (EditText) ll.findViewById(R.id.hah_passkey);
+
+                hahIp.setText(Config.getHAHIp());
+                hahPort.setText(Config.getHAHPort());
+                hahPasskey.setText(Config.getHAHPasskey());
+
+                new MaterialAlertDialog.Builder(getActivity()).setTitle(R.string.hah_proxy_title)
+                        .setView(ll, true).setPositiveButton(android.R.string.ok).setNegativeButton(android.R.string.cancel)
+                        .setButtonListener(new MaterialAlertDialog.OnClickListener() {
+                            @Override
+                            public boolean onClick(MaterialAlertDialog dialog, int which) {
+                                if (which == MaterialAlertDialog.POSITIVE) {
+                                    String ip = hahIp.getText().toString();
+                                    String port = hahPort.getText().toString();
+                                    String passkey = hahPasskey.getText().toString();
+                                    Config.setHAHIp(ip);
+                                    Config.setHAHPort(port);
+                                    Config.setHAHPasskey(passkey);
+                                    EhInfo.getInstance(getActivity()).setHAHProxy(ip, port, passkey);
+                                }
+                                return true;
+                            }
+                        }).show();
             }
             return true;
         }
diff --git a/app/src/main/java/com/hippo/ehviewer/util/Config.java b/app/src/main/java/com/hippo/ehviewer/util/Config.java
index 839055ed7..b780b6d1a 100644
--- a/app/src/main/java/com/hippo/ehviewer/util/Config.java
+++ b/app/src/main/java/com/hippo/ehviewer/util/Config.java
@@ -253,6 +253,15 @@ public final class Config {
     private static final String KEY_MAX_HISTORY_COUNT = "max_history_count";
     private static final int DEFAULT_MAX_HISTORY_COUNT = 100;
 
+    private static final String KEY_HAH_IP = "hah_ip";
+    private static final String DEFAULT_HAH_IP = "";
+
+    private static final String KEY_HAH_PORT = "hah_port";
+    private static final String DEFAULT_HAH_PORT = "";
+
+    private static final String KEY_HAH_PASSKEY = "hah_passkey";
+    private static final String DEFAULT_HAH_PASSKEY = "";
+
     public static int getDefaultCat() {
         return getInt(KEY_DEFAULT_CAT, DEFAULT_DEFAULT_CAT);
     }
@@ -293,6 +302,30 @@ public final class Config {
         return getIntFromStr(KEY_MAX_HISTORY_COUNT, DEFAULT_MAX_HISTORY_COUNT);
     }
 
+    public static void setHAHIp(String hahIp) {
+        setString(KEY_HAH_IP, hahIp);
+    }
+
+    public static String getHAHIp() {
+        return getString(KEY_HAH_IP, DEFAULT_HAH_IP);
+    }
+
+    public static void setHAHPort(String hahPort) {
+        setString(KEY_HAH_PORT, hahPort);
+    }
+
+    public static String getHAHPort() {
+        return getString(KEY_HAH_PORT, DEFAULT_HAH_PORT);
+    }
+
+    public static void setHAHPasskey(String hahPasskey) {
+        setString(KEY_HAH_PASSKEY, hahPasskey);
+    }
+
+    public static String getHAHPasskey() {
+        return getString(KEY_HAH_PASSKEY, DEFAULT_HAH_PASSKEY);
+    }
+
 
     /****** Read ******/
 
diff --git a/app/src/main/res/layout/hah_proxy.xml b/app/src/main/res/layout/hah_proxy.xml
new file mode 100644
index 000000000..1023b352d
--- /dev/null
+++ b/app/src/main/res/layout/hah_proxy.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 Hippo Seven
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.5"
+            android:text="@string/hah_ip"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=" "/>
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/hah_port"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/hah_ip"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2.5"
+            android:singleLine="true"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=":"/>
+
+        <EditText
+            android:id="@+id/hah_port"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:singleLine="true"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/hah_passkey"/>
+
+    <EditText
+        android:id="@+id/hah_passkey"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6c94c3942..1906ca393 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -223,6 +223,10 @@
     <string name="default_favorite">默认收藏夹</string>
     <string name="history_eh_settings_title">历史</string>
     <string name="max_history_count_title">最大历史记录条数</string>
+    <string name="hah_proxy_title">Hentai@Home 服务器</string>
+    <string name="hah_ip">IP 地址</string>
+    <string name="hah_port">端口</string>
+    <string name="hah_passkey">密钥（可选）</string>
 
     <string name="read_settings_title">阅读</string>
     <string name="reading_direction_title">开页方向</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index e443f5a51..38d940718 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -10,7 +10,7 @@
 
     <!-- Analyics -->
     <string name="dailog_analyics_title">數據統計</string>
-    <string name="dailog_analyics_plain">您是否願意將使用情況發送給開發者？這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分設備信息（譬如設備型號、系統版本、當前IP地址）（注意：某些設備信息可能可以推測出某些用戶信息，譬如當前IP地址可能可以大概推測出用戶當前的位置）。開發者承諾不收集任何個人身份信息數據（譬如姓名、電話號碼、電郵地址）或可永久性標識某臺設備的數據（譬如IMEI、MAC地址）。\n\n數據收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies\n\n您以後可以在設置中修改選擇</string>
+    <string name="dailog_analyics_plain">您是否願意將使用情況發送給開發者？這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分設備信息（譬如設備型號、系統版本、當前IP地址）（注意：某些設備信息可能可以推測出某些用户信息，譬如當前IP地址可能可以大概推測出用户當前的位置）。開發者承諾不收集任何個人身份信息數據（譬如姓名、電話號碼、電郵地址）或可永久性標識某台設備的數據（譬如IMEI、MAC地址）。\n\n數據收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies\n\n您以後可以在設置中修改選擇</string>
 
     <!-- Network -->
     <string name="dailog_network_mobile_title">您正在使用移動網絡，可能會消耗大量的資費，是否繼續使用？</string>
@@ -47,7 +47,7 @@
 
     <!-- Send Crash -->
     <string name="dialog_send_crash_title">這很重要</string>
-    <string name="dialog_send_crash_plain">上次該應用崩潰了。你願意把錯誤日誌發送給開發者以便以後得到更好的用戶體驗麼？（以電子郵件的形式發送）</string>
+    <string name="dialog_send_crash_plain">上次該應用崩潰了。你願意把錯誤日誌發送給開發者以便以後得到更好的用户體驗麼？（以電子郵件的形式發送）</string>
     <string name="add_description">你可以在下方添加一些信息，譬如應用崩潰前所作的操作。</string>
     <string name="dialog_wait_send_crash_msg">請在發送完日誌後關閉該窗口</string>
 
@@ -97,7 +97,7 @@
     <string name="delete_item">該下載項將被刪除</string>
     <string name="pic_included">包括圖片</string>
     <string name="notification_be_title">下載配額不足</string>
-    <string name="notification_be_mesg">錯誤碼 509，請稍後閱讀或完成下載</string>
+    <string name="notification_be_mesg">錯誤碼 509，請稍後閲讀或完成下載</string>
 
     <!-- ErrorMessage -->
     <string name="em_network_error">網絡錯誤</string>
@@ -109,8 +109,8 @@
     <string name="em_client_protocol">無效的請求或無效的響應</string>
     <string name="em_put_cache_error">存入緩存錯誤</string>
     <string name="em_url_format_error">網址錯誤</string>
-    <string name="em_login_error">用戶名或密碼錯誤</string>
-    <string name="em_check_login_error">獲取用戶信息錯誤</string>
+    <string name="em_login_error">用户名或密碼錯誤</string>
+    <string name="em_check_login_error">獲取用户信息錯誤</string>
     <string name="em_logout_error">退出錯誤</string>
     <string name="em_url_error">網址錯誤</string>
     <string name="em_retry">重試</string>
@@ -128,7 +128,7 @@
     <string name="em_invalid_request">無效的請求</string>
     <string name="em_no_sdcard">未掛載 SD卡</string>
     <string name="em_index_error">索引錯誤</string>
-    <string name="em_requst_null">請求內容爲空</string>
+    <string name="em_requst_null">請求內容為空</string>
 
     <!-- GalleryActivity -->
     <string name="ga_data_error">數據錯誤！</string>
@@ -163,7 +163,7 @@
     <string name="dst_src_same">目標與源相同</string>
     <string name="delete_successfully">刪除成功</string>
     <string name="failed_to_delete">刪除失敗</string>
-    <string name="set_default_favorite">設爲默認收藏夾</string>
+    <string name="set_default_favorite">設為默認收藏夾</string>
     <string name="favorite_warning">未檢測到登陸狀態，賬號收藏可被他人修改。而且由於開發者水平問題，本地收藏不可靠。</string>
 
     <!-- Popular -->
@@ -172,7 +172,7 @@
     <!-- History -->
     <string name="clear_history_message">所有歷史記錄將被清除</string>
     <string name="just_browse">僅瀏覽過</string>
-    <string name="have_read">已閱讀過</string>
+    <string name="have_read">已閲讀過</string>
 
     <!-- Settings -->
     <string name="display_settings_title">顯示</string>
@@ -211,8 +211,12 @@
     <string name="default_favorite">默認收藏夾</string>
     <string name="history_eh_settings_title">歷史</string>
     <string name="max_history_count_title">最大歷史記錄條數</string>
+    <string name="hah_proxy_title">Hentai@Home 服務器</string>
+    <string name="hah_ip">IP 地址</string>
+    <string name="hah_port">端口</string>
+    <string name="hah_passkey">密鑰（可選）</string>
 
-    <string name="read_settings_title">閱讀</string>
+    <string name="read_settings_title">閲讀</string>
     <string name="reading_direction_title">開頁方向</string>
     <string name="left_to_right">從左至右</string>
     <string name="right_to_Left">從右至左</string>
@@ -220,17 +224,17 @@
     <string name="bottom_to_top">從下至上</string>
     <string name="page_scaling_title">頁面縮放</string>
     <string name="start_position_title">開頁位置</string>
-    <string name="keep_screen_on_title">閱讀時屏幕常亮</string>
+    <string name="keep_screen_on_title">閲讀時屏幕常亮</string>
     <string name="gallery_show_clock_title">顯示時間</string>
     <string name="gallery_show_battery_title">顯示電量</string>
-    <string name="custom_lightness_title">閱讀時使用自定義屏幕亮度</string>
+    <string name="custom_lightness_title">閲讀時使用自定義屏幕亮度</string>
     <string name="custom_lightness_value_title">自定義屏幕亮度</string>
     <string name="custom_codec_title">自定義解碼</string>
     <string name="custom_codec_summary">自定義解碼可能會更使用更少內存，解碼更快</string>
     <string name="custom_codec_summary_not">自定義解碼暫不支持 x86, mips</string>
-    <string name="clean_redundancy_title">清理閱讀冗餘</string>
-    <string name="no_redundancy">未發現冗餘</string>
-    <string name="clean_redundancy">完成冗餘清理，共清理 %d 項</string>
+    <string name="clean_redundancy_title">清理閲讀宂餘</string>
+    <string name="no_redundancy">未發現宂餘</string>
+    <string name="clean_redundancy">完成宂餘清理，共清理 %d 項</string>
     <string name="decode_format_title">解碼格式</string>
     <string name="decode_format_auto">自動</string>
     <string name="decode_format_gray">黑白</string>
@@ -247,8 +251,8 @@
     <string name="download_origin_image_title">下載原圖</string>
     <string name="download_origin_image_summary">這很危險！勾選此項會導致下載配額迅速流失</string>
     <string name="keep_download_service_title">保持下載服務</string>
-    <string name="keep_download_service_summary_on">下載時，若應用被系統或用戶強制關閉，下載服務會重新啓動</string>
-    <string name="keep_download_service_summary_off">下載時，若應用被系統或用戶強制關閉，下載服務不會重新啓動</string>
+    <string name="keep_download_service_summary_on">下載時，若應用被系統或用户強制關閉，下載服務會重新啟動</string>
+    <string name="keep_download_service_summary_off">下載時，若應用被系統或用户強制關閉，下載服務不會重新啟動</string>
 
     <string name="advanced_settings_title">高級</string>
     <string name="http_advanced_settings_title">HTTP</string>
@@ -260,7 +264,7 @@
     <string name="eh_min_interval_title">EH 站點最小連接間隔 (ms)</string>
     <string name="eh_others_settings_title">其他</string>
     <string name="fix_dirname_title">修正下載文件夾名</string>
-    <string name="fix_dirname_title_summary">將下載文件夾名由 gid 改爲 gid-title，不進行修正不會影響使用</string>
+    <string name="fix_dirname_title_summary">將下載文件夾名由 gid 改為 gid-title，不進行修正不會影響使用</string>
     <string name="start_fixing">開始修正</string>
     <string name="no_need_fixing">未發現可修正項</string>
     <string name="fixing_over">共修正 %d 項</string>
@@ -276,18 +280,18 @@
     <string name="version_title">應用版本</string>
     <string name="update_about_settings_title">更新</string>
     <string name="auto_check_for_update_title">自動檢查更新</string>
-    <string name="auto_check_for_update_summary_on">每日第一次啓動時檢查更新</string>
+    <string name="auto_check_for_update_summary_on">每日第一次啟動時檢查更新</string>
     <string name="auto_check_for_update_summary_off">從不自動檢查更新</string>
     <string name="check_for_update_title">檢查更新</string>
     <string name="check_for_update_summary">點擊檢查更新</string>
     <string name="update_server_title">更新服務器</string>
     <string name="cloud_drive_title">如果更新失敗點擊此處</string>
     <string name="analytics_about_settings_title">數據統計</string>
-    <string name="allow_analyics_title">啓用數據統計</string>
+    <string name="allow_analyics_title">啟用數據統計</string>
     <string name="allow_analyics_summary_on">感謝您對本應用的支持</string>
     <string name="allow_analyics_summary_off">感謝您使用本應用</string>
     <string name="about_analyics_title">關於數據統計</string>
-    <string name="about_analyics_comment">若您啓用了數據統計，本應用會將您的使用情況發送給開發者。這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分設備信息（譬如設備型號、系統版本、當前IP地址）（注意：某些設備信息可能可以推測出某些用戶信息，譬如當前IP地址可能可以大概推測出用戶當前的位置）。開發者承諾不收集任何個人身份信息數據（譬如姓名、電話號碼、電郵地址）或可永久性標識某臺設備的數據（譬如IMEI、MAC地址）。\n\n數據收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies</string>
+    <string name="about_analyics_comment">若您啟用了數據統計，本應用會將您的使用情況發送給開發者。這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分設備信息（譬如設備型號、系統版本、當前IP地址）（注意：某些設備信息可能可以推測出某些用户信息，譬如當前IP地址可能可以大概推測出用户當前的位置）。開發者承諾不收集任何個人身份信息數據（譬如姓名、電話號碼、電郵地址）或可永久性標識某台設備的數據（譬如IMEI、MAC地址）。\n\n數據收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies</string>
     <string name="portrait">豎屏</string>
     <string name="landscape">橫屏</string>
     <string name="preference_settings_title">設置</string>
@@ -323,8 +327,8 @@
 
     <!-- Tag -->
     <string name="add_tag">添加標籤</string>
-    <string name="tag_name">標簽名稱：</string>
-    <string name="tag_name_empty">標簽名稱不能爲空</string>
+    <string name="tag_name">標籤名稱：</string>
+    <string name="tag_name_empty">標籤名稱不能為空</string>
     <string name="tag_change_name">修改名稱</string>
     <string name="new_tag_name">新名稱：%s</string>
 
@@ -345,7 +349,7 @@
     <string name="rate_succeeded">評分成功</string>
     <string name="rate_sensibly">理智評分</string>
     <string name="rate_failed">評分失敗</string>
-    <string name="gallery_of_he">該用戶上傳的內容</string>
+    <string name="gallery_of_he">該用户上傳的內容</string>
 
     <!-- rating -->
     <string name="rating10">根本把持不住</string>
@@ -377,7 +381,7 @@
     <string name="pages">頁面</string>
     <string name="size">大小</string>
     <string name="tip">提示</string>
-    <string name="not_started">未啓動</string>
+    <string name="not_started">未啟動</string>
     <string name="waiting">等待中</string>
     <string name="done">已完成</string>
     <string name="first_page">第一頁</string>
@@ -398,7 +402,7 @@
     <string name="comment">評論</string>
     <string name="info">信息</string>
     <string name="reply">回覆</string>
-    <string name="read">閱讀</string>
+    <string name="read">閲讀</string>
     <string name="rate">評價</string>
     <string name="last_page">最後一頁</string>
     <string name="unfinished">未完成的功能</string>
@@ -410,7 +414,7 @@
     <string name="login">登陸</string>
     <string name="logout">退出</string>
     <string name="wait">請稍後</string>
-    <string name="username">用戶名</string>
+    <string name="username">用户名</string>
     <string name="password">密碼</string>
     <string name="add">添加</string>
     <string name="what_to_do">你想做什麼？</string>
@@ -447,7 +451,7 @@
     <string name="thanks">感謝</string>
     <string name="develop">開發</string>
     <string name="advance_search_left">左劃更多</string>
-    <string name="restart_to_take_effect">重啓應用以便生效</string>
+    <string name="restart_to_take_effect">重啟應用以便生效</string>
     <string name="cur_dir_not_writable">當前文件夾不可寫</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 7aabb3c31..33aba2eed 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -10,10 +10,10 @@
 
     <!-- Analyics -->
     <string name="dailog_analyics_title">資料統計</string>
-    <string name="dailog_analyics_plain">您是否願意將使用情況發送給開發者？這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分裝置資訊（譬如裝置型號、系統版本、當前IP地址）（注意：某些裝置資訊可能可以推測出某些使用者資訊，譬如當前IP地址可能可以大概推測出使用者當前的位置）。開發者承諾不收集任何個人身份資訊資料（譬如姓名、電話號碼、電郵地址）或可永久性標識某臺裝置的資料（譬如IMEI、MAC地址）。\n\n資料收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies\n\n您以後可以在設定中修改選擇</string>
+    <string name="dailog_analyics_plain">您是否願意將使用情況傳送給開發者？這對開發者維護該應用有很大幫助。在傳送使用情況的同時也會發送部分裝置資訊（譬如裝置型號、系統版本、當前IP地址）（注意：某些裝置資訊可能可以推測出某些使用者資訊，譬如當前IP地址可能可以大概推測出使用者當前的位置）。開發者承諾不收集任何個人身份資訊資料（譬如姓名、電話號碼、電郵地址）或可永久性標識某臺裝置的資料（譬如IMEI、MAC地址）。\n\n資料收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies\n\n您以後可以在設定中修改選擇</string>
 
     <!-- Network -->
-    <string name="dailog_network_mobile_title">您正在使用移動網路，可能會消耗大量的資費，是否繼續使用？</string>
+    <string name="dailog_network_mobile_title">您正在使用行動網路，可能會消耗大量的資費，是否繼續使用？</string>
     <string name="dailog_network_none_title">未檢測到網路連線，是否繼續使用？</string>
 
     <!-- Exit -->
@@ -27,17 +27,17 @@
     <string name="hint_no_keyword">沒關鍵字也行</string>
     <string name="checkbox_uploader">指定上傳者</string>
     <string name="checkbox_advance">高階選項</string>
-    <string name="checkbox_sname">搜索本子</string>
-    <string name="checkbox_stags">搜索本子標籤</string>
-    <string name="checkbox_sdesc">搜索本子描述</string>
-    <string name="checkbox_storr">搜索種子檔名</string>
-    <string name="checkbox_sto">僅搜索有種子的本子</string>
-    <string name="checkbox_sdt1">搜索 Low-Power 標籤</string>
-    <string name="checkbox_sdt2">搜索差評標籤</string>
-    <string name="checkbox_sh">搜索被遺棄的資源</string>
+    <string name="checkbox_sname">搜尋本子</string>
+    <string name="checkbox_stags">搜尋本子標籤</string>
+    <string name="checkbox_sdesc">搜尋本子描述</string>
+    <string name="checkbox_storr">搜尋種子檔名</string>
+    <string name="checkbox_sto">僅搜尋有種子的本子</string>
+    <string name="checkbox_sdt1">搜尋 Low-Power 標籤</string>
+    <string name="checkbox_sdt2">搜尋差評標籤</string>
+    <string name="checkbox_sh">搜尋被遺棄的資源</string>
     <string name="checkbox_sr">最低評分：</string>
-    <string name="use_similarity_scan">使用相似搜索</string>
-    <string name="only_search_covers">只搜索封面</string>
+    <string name="use_similarity_scan">使用相似搜尋</string>
+    <string name="only_search_covers">只搜尋封面</string>
     <string name="show_expunged">顯示被遺棄的資源</string>
 
     <!-- Jump -->
@@ -47,21 +47,21 @@
 
     <!-- Send Crash -->
     <string name="dialog_send_crash_title">這很重要</string>
-    <string name="dialog_send_crash_plain">上次該應用崩潰了。你願意把錯誤日誌發送給開發者以便以後得到更好的使用者體驗麼？（以電子郵件的形式發送）</string>
-    <string name="add_description">你可以在下方添加一些資訊，譬如應用崩潰前所作的操作。</string>
-    <string name="dialog_wait_send_crash_msg">請在發送完日誌後關閉該視窗</string>
+    <string name="dialog_send_crash_plain">上次該應用崩潰了。你願意把錯誤日誌傳送給開發者以便以後得到更好的使用者體驗麼？（以電子郵件的形式傳送）</string>
+    <string name="add_description">你可以在下方新增一些資訊，譬如應用崩潰前所作的操作。</string>
+    <string name="dialog_wait_send_crash_msg">請在傳送完日誌後關閉該視窗</string>
 
     <!-- List item long click -->
-    <string name="toast_add_favourite">已添加到收藏</string>
-    <string name="toast_add_download">已添加到下載列表</string>
+    <string name="toast_add_favourite">已新增到收藏</string>
+    <string name="toast_add_download">已新增到下載列表</string>
 
     <!-- GalleryListActivity -->
     <string name="no_found">未找到</string>
     <string name="none">無</string>
-    <string name="quick_search_tip">您可以在左側欄搜索項中添加快速搜索</string>
+    <string name="quick_search_tip">您可以在左側欄搜尋項中新增快速搜尋</string>
     <string name="no_avatar">無頭像</string>
     <string name="get_avatar_error">獲取頭像失敗</string>
-    <string name="image_search">影象搜索</string>
+    <string name="image_search">影象搜尋</string>
     <string name="image_not_exist">影象不存在</string>
     <string name="image_not_readable">影象不可讀</string>
 
@@ -154,8 +154,8 @@
     <!-- Favorite -->
     <string name="local_favorite">本地收藏</string>
     <string name="select_item">選擇項目</string>
-    <string name="where_to_add">添加至何處？</string>
-    <string name="failed_to_add">添加失敗</string>
+    <string name="where_to_add">新增至何處？</string>
+    <string name="failed_to_add">新增失敗</string>
     <string name="where_to_move">移動至何處？</string>
     <string name="moving">正在移動…</string>
     <string name="move_successful">移動成功</string>
@@ -163,7 +163,7 @@
     <string name="dst_src_same">目標與源相同</string>
     <string name="delete_successfully">刪除成功</string>
     <string name="failed_to_delete">刪除失敗</string>
-    <string name="set_default_favorite">設為默認收藏夾</string>
+    <string name="set_default_favorite">設為預設收藏夾</string>
     <string name="favorite_warning">未檢測到登陸狀態，賬號收藏可被他人修改。而且由於開發者水平問題，本地收藏不可靠。</string>
 
     <!-- Popular -->
@@ -179,7 +179,7 @@
     <string name="theme_display_settings_title">主題</string>
     <string name="custom_theme_color_title">自定義主題顏色</string>
     <string name="custom_theme_color_summary_on">在下方指定主題顏色</string>
-    <string name="custom_theme_color_summary_off">使用默認主題顏色</string>
+    <string name="custom_theme_color_summary_off">使用預設主題顏色</string>
     <string name="theme_color_title">主題顏色</string>
     <string name="screen_display_settings_title">螢幕</string>
     <string name="screen_orientation_title">螢幕方向</string>
@@ -194,23 +194,27 @@
 
     <string name="eh_settings_title">EH</string>
     <string name="list_eh_settings_title">列表</string>
-    <string name="list_default_category_title">列表默認分類</string>
-    <string name="list_default_category_summary">首頁顯示的默認分類</string>
+    <string name="list_default_category_title">列表預設分類</string>
+    <string name="list_default_category_summary">首頁顯示的預設分類</string>
     <string name="exculde_tag_group_title">排除標籤類別</string>
-    <string name="exculde_tag_group_summary">在標籤搜索中排除特定標籤類別</string>
+    <string name="exculde_tag_group_summary">在標籤搜尋中排除特定標籤類別</string>
     <string name="exculde_language_title">排除語言</string>
-    <string name="exculde_language_summary">在列表與搜索中排除特定語言</string>
-    <string name="search_eh_settings_title">搜索</string>
-    <string name="clear_suggestions_title">清除搜索記錄</string>
-    <string name="clear_suggestions_summary">刪除您已執行的所有搜索</string>
+    <string name="exculde_language_summary">在列表與搜尋中排除特定語言</string>
+    <string name="search_eh_settings_title">搜尋</string>
+    <string name="clear_suggestions_title">清除搜尋記錄</string>
+    <string name="clear_suggestions_summary">刪除您已執行的所有搜尋</string>
     <string name="detail_eh_settings_title">詳情</string>
     <string name="preview_mode_title">預覽圖模式</string>
     <string name="preview_mode_normal">正常預覽圖</string>
     <string name="preview_mode_large">大預覽圖</string>
     <string name="favorite_eh_settings_title">收藏</string>
-    <string name="default_favorite">默認收藏夾</string>
+    <string name="default_favorite">預設收藏夾</string>
     <string name="history_eh_settings_title">歷史</string>
     <string name="max_history_count_title">最大歷史記錄條數</string>
+    <string name="hah_proxy_title">Hentai@Home 伺服器</string>
+    <string name="hah_ip">IP 地址</string>
+    <string name="hah_port">埠</string>
+    <string name="hah_passkey">金鑰（可選）</string>
 
     <string name="read_settings_title">閱讀</string>
     <string name="reading_direction_title">開頁方向</string>
@@ -226,7 +230,7 @@
     <string name="custom_lightness_title">閱讀時使用自定義螢幕亮度</string>
     <string name="custom_lightness_value_title">自定義螢幕亮度</string>
     <string name="custom_codec_title">自定義解碼</string>
-    <string name="custom_codec_summary">自定義解碼可能會更使用更少內存，解碼更快</string>
+    <string name="custom_codec_summary">自定義解碼可能會更使用更少記憶體，解碼更快</string>
     <string name="custom_codec_summary_not">自定義解碼暫不支援 x86, mips</string>
     <string name="clean_redundancy_title">清理閱讀冗餘</string>
     <string name="no_redundancy">未發現冗餘</string>
@@ -241,8 +245,8 @@
     <string name="download_settings_title">下載</string>
     <string name="download_path_title">下載路徑</string>
     <string name="media_scan_title">允許媒體掃描</string>
-    <string name="media_scan_summary_on">請避免他人翻看你的圖庫應用</string>
-    <string name="media_scan_summary_off">大多數圖庫應用將不會顯示下載目錄中的圖片</string>
+    <string name="media_scan_summary_on">請避免他人翻看你的相簿應用</string>
+    <string name="media_scan_summary_off">大多數相簿應用將不會顯示下載目錄中的圖片</string>
     <string name="download_thread_title">下載執行緒數</string>
     <string name="download_origin_image_title">下載原圖</string>
     <string name="download_origin_image_summary">這很危險！勾選此項會導致下載配額迅速流失</string>
@@ -287,7 +291,7 @@
     <string name="allow_analyics_summary_on">感謝您對本應用的支援</string>
     <string name="allow_analyics_summary_off">感謝您使用本應用</string>
     <string name="about_analyics_title">關於資料統計</string>
-    <string name="about_analyics_comment">若您啟用了資料統計，本應用會將您的使用情況發送給開發者。這對開發者維護該應用有很大幫助。在發送使用情況的同時也會發送部分裝置資訊（譬如裝置型號、系統版本、當前IP地址）（注意：某些裝置資訊可能可以推測出某些使用者資訊，譬如當前IP地址可能可以大概推測出使用者當前的位置）。開發者承諾不收集任何個人身份資訊資料（譬如姓名、電話號碼、電郵地址）或可永久性標識某臺裝置的資料（譬如IMEI、MAC地址）。\n\n資料收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies</string>
+    <string name="about_analyics_comment">若您啟用了資料統計，本應用會將您的使用情況傳送給開發者。這對開發者維護該應用有很大幫助。在傳送使用情況的同時也會發送部分裝置資訊（譬如裝置型號、系統版本、當前IP地址）（注意：某些裝置資訊可能可以推測出某些使用者資訊，譬如當前IP地址可能可以大概推測出使用者當前的位置）。開發者承諾不收集任何個人身份資訊資料（譬如姓名、電話號碼、電郵地址）或可永久性標識某臺裝置的資料（譬如IMEI、MAC地址）。\n\n資料收集過程採用 Google Analytics。\nGOOGLE ANALYTICS（分析）服務條款：http://www.google.com/analytics/terms/cn.html\nGoogle隱私權和條款：http://www.google.com/intl/zh-CN/policies</string>
     <string name="portrait">豎屏</string>
     <string name="landscape">橫屏</string>
     <string name="preference_settings_title">設定</string>
@@ -322,9 +326,9 @@
     <string name="update_server_qiniu">七牛</string>
 
     <!-- Tag -->
-    <string name="add_tag">添加標籤</string>
-    <string name="tag_name">標簽名稱：</string>
-    <string name="tag_name_empty">標簽名稱不能為空</string>
+    <string name="add_tag">新增標籤</string>
+    <string name="tag_name">標籤名稱：</string>
+    <string name="tag_name_empty">標籤名稱不能為空</string>
     <string name="tag_change_name">修改名稱</string>
     <string name="new_tag_name">新名稱：%s</string>
 
@@ -393,7 +397,7 @@
     <string name="local">本地</string>
     <string name="tag">標籤</string>
     <string name="copyed">已複製</string>
-    <string name="send">發送</string>
+    <string name="send">傳送</string>
     <string name="detail">詳情</string>
     <string name="comment">評論</string>
     <string name="info">資訊</string>
@@ -412,11 +416,11 @@
     <string name="wait">請稍後</string>
     <string name="username">使用者名</string>
     <string name="password">密碼</string>
-    <string name="add">添加</string>
+    <string name="add">新增</string>
     <string name="what_to_do">你想做什麼？</string>
     <string name="jump">跳頁</string>
     <string name="some_page">第 %d 頁</string>
-    <string name="_default">默認</string>
+    <string name="_default">預設</string>
     <string name="delete">刪除</string>
     <string name="move">移動</string>
     <string name="list">列表</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cedcaae74..04b5e759d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -227,6 +227,11 @@
     <string name="default_favorite">Default Favorite</string>
     <string name="history_eh_settings_title">History</string>
     <string name="max_history_count_title">The maximum number of history records</string>
+    <string name="hah_eh_settings_title" translatable="false">H@H</string>
+    <string name="hah_proxy_title">Hentai@Home Proxy</string>
+    <string name="hah_ip">IP Address</string>
+    <string name="hah_port">Port</string>
+    <string name="hah_passkey">Passkey (Optional)</string>
 
     <string name="read_settings_title">Reading</string>
     <string name="reading_direction_title">Reading direction</string>
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index f19981e1a..26f0d0f92 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -78,4 +78,4 @@
             android:summary="@string/fix_dirname_title_summary" />
 
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/eh_settings.xml b/app/src/main/res/xml/eh_settings.xml
index e4abedd7d..29ae349b0 100644
--- a/app/src/main/res/xml/eh_settings.xml
+++ b/app/src/main/res/xml/eh_settings.xml
@@ -78,4 +78,12 @@
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+    <PreferenceCategory android:title="@string/hah_eh_settings_title" >
+
+        <Preference
+            android:key="hah_proxy"
+            android:title="@string/hah_proxy_title"/>
+
+    </PreferenceCategory>
+
+</PreferenceScreen>