diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java
index 64cb413ac2..478239d7d8 100644
--- a/app/src/main/java/com/gh/common/util/LibaoUtils.java
+++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java
@@ -151,28 +151,27 @@ public class LibaoUtils {
                 });
     }
 
-    public static void initLibaoBtn(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity,
-                                    final boolean isInstallRequired, final LibaoDetailAdapter adapter, final String entrance) {
-
+    public static void setLiBaoBtnStatus(final TextView libaoBtn, String status, Context context) {
         libaoBtn.setTextColor(Color.WHITE);
-        final String status = libaoEntity.getStatus();
         if (TextUtils.isEmpty(status)) return;
         switch (status) {
-            case "coming":
-                libaoBtn.setText(R.string.libao_coming);
-                libaoBtn.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
             case "ling":
                 libaoBtn.setText(R.string.libao_ling);
-                libaoBtn.setBackgroundResource(R.drawable.textview_green_style);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_style);
                 break;
             case "tao":
                 libaoBtn.setText(R.string.libao_tao);
-                libaoBtn.setBackgroundResource(R.drawable.textview_orange_style);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_style);
+                break;
+            case "coming":
+                libaoBtn.setText(R.string.libao_coming);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.theme));
                 break;
             case "used_up":
                 libaoBtn.setText(R.string.libao_used_up);
-                libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.theme));
                 break;
             case "finish":
                 libaoBtn.setText(R.string.libao_finish);
@@ -180,44 +179,51 @@ public class LibaoUtils {
                 break;
             case "linged":
                 libaoBtn.setText(R.string.libao_linged);
-                libaoBtn.setBackgroundResource(R.drawable.libao_linged_style);
-                libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_linged_selector));
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.theme));
                 break;
             case "taoed":
                 libaoBtn.setText(R.string.libao_taoed);
-                libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
-                libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector));
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.theme));
                 break;
             case "copy":
                 libaoBtn.setText(R.string.libao_copy);
-                libaoBtn.setBackgroundResource(R.drawable.textview_blue_style);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_style);
                 break;
             case "repeatLing":
                 libaoBtn.setText(R.string.libao_repeat_ling);
-                libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.theme));
                 break;
             case "repeatLinged":
                 libaoBtn.setText(R.string.libao_repeat_ling);
-                libaoBtn.setBackgroundResource(R.drawable.textview_green_style);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_style);
                 break;
-
             case "repeatTao":
                 libaoBtn.setText(R.string.libao_repeat_tao);
-                libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_border);
+                libaoBtn.setTextColor(context.getResources().getColor(R.color.theme));
                 break;
             case "repeatTaoed":
                 libaoBtn.setText(R.string.libao_repeat_tao);
-                libaoBtn.setBackgroundResource(R.drawable.textview_orange_style);
+                libaoBtn.setBackgroundResource(R.drawable.button_normal_style);
                 break;
             case "unshelve":
-                libaoBtn.setBackgroundResource(R.drawable.textview_cancel_style);
+                libaoBtn.setBackgroundResource(R.drawable.button_border_gray);
                 libaoBtn.setText(R.string.libao_unshelve);
                 break;
             default:
-                libaoBtn.setBackgroundResource(R.drawable.textview_cancel_style);
+                libaoBtn.setBackgroundResource(R.drawable.button_border_gray);
                 libaoBtn.setText("异常");
                 break;
         }
+    }
+
+    public static void initLibaoBtn(final Context context, final TextView libaoBtn, final LibaoEntity libaoEntity,
+                                    final boolean isInstallRequired, final LibaoDetailAdapter adapter, final String entrance) {
+        String status = libaoEntity.getStatus();
+        setLiBaoBtnStatus(libaoBtn, status, context);
 
         libaoBtn.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/com/gh/common/util/PlatformUtils.java b/app/src/main/java/com/gh/common/util/PlatformUtils.java
index 8059be54aa..2bc7bf2d44 100644
--- a/app/src/main/java/com/gh/common/util/PlatformUtils.java
+++ b/app/src/main/java/com/gh/common/util/PlatformUtils.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.os.Handler;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.util.ArrayMap;
 import android.text.TextUtils;
 
@@ -207,7 +208,9 @@ public class PlatformUtils {
         if (color != null) {
             return color;
         }
-        return "#00B7FA";
+
+        int themeColor = ContextCompat.getColor(HaloApp.getInstance().getApplication(), R.color.theme);
+        return String.format("#%06X", 0xFFFFFF & themeColor);
     }
 
     public int getPlatformPic(String platform) {
diff --git a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java
index 6274a5ccd4..7d4e967f9d 100644
--- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java
+++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java
@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.widget.ProgressBar;
 
+import com.gh.common.util.DisplayUtils;
 import com.gh.gamecenter.R;
 
 public class DownloadProgressBar extends ProgressBar {
@@ -65,17 +66,16 @@ public class DownloadProgressBar extends ProgressBar {
         if (TextUtils.isEmpty(mText)) return;
 
         mPaint.setColor(mDefaultColor == 0 ? ContextCompat.getColor(getContext(), R.color.theme) : mDefaultColor); // 初始化颜色
-        mPaint.setTextSize(40f);
+        mPaint.setTextSize(DisplayUtils.sp2px(getContext(), 14));
         mPaint.setStyle(Paint.Style.FILL_AND_STROKE);
         mPaint.setXfermode(null);
         create();
 
-        Paint.FontMetrics fontMetrics = mPaint.getFontMetrics();
-        float mTextHeight = fontMetrics.bottom - fontMetrics.descent - fontMetrics.ascent;
-        float mTextWidth = mPaint.measureText(mText);
+        Paint.FontMetricsInt fontMetrics = mPaint.getFontMetricsInt();
+        int baseline = (getHeight() - fontMetrics.bottom - fontMetrics.top) / 2;
 
-        // todo 文字有点不居中
-        srcCanvas.drawText(mText, (getWidth() - mTextWidth) / 2, (getHeight() + mTextHeight) / 2, mPaint);
+        mPaint.setTextAlign(Paint.Align.CENTER);
+        srcCanvas.drawText(mText, getWidth() / 2, baseline, mPaint);
         mPaint.setXfermode(mDuffXFerMode);
         mPaint.setColor(Color.WHITE); // 反向颜色
 
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java
index 667771bb24..c8d7b7c213 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java
@@ -202,8 +202,6 @@ public class CleanApkAdapter extends BaseRecyclerAdapter<KcSelectGameViewHolder>
         DecimalFormat df = new DecimalFormat("#.00");
         String sizeName = df.format(size) + "MB";
 
-//            Spanned spanned = Html.fromHtml("大小：" + "<font color=\"#00B7FA\">" + sizeName + "</font>");
-//            holder.gameSize.setText(spanned);
         holder.checkBoxRl.setVisibility(View.VISIBLE);
         holder.selectCB.setVisibility(View.VISIBLE);
         if (mSelectPosition.get(position)) {
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java
index 4f73115ddf..195c731ee6 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java
@@ -1,6 +1,7 @@
 package com.gh.gamecenter.adapter;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
@@ -134,13 +135,13 @@ public class VoteAdapter extends BaseRecyclerAdapter<ViewHolder> {
             VersionVoteEntity versionVoteEntity = mVoteList.get(position);
             UserDataEntity userData = versionVoteEntity.getUserData();
             if (userData != null && userData.isVersionRequested()) {
-                viewHolder.voteBtn.setBackgroundResource(R.drawable.border_suggest_bg);
-                viewHolder.voteBtn.setTextColor(ContextCompat.getColor(mContext, R.color.content));
+                viewHolder.voteBtn.setBackgroundResource(R.drawable.button_normal_border);
+                viewHolder.voteBtn.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
                 viewHolder.voteBtn.setText(R.string.voted);
                 viewHolder.voteBtn.setEnabled(false);
             } else {
-                viewHolder.voteBtn.setBackgroundResource(R.drawable.comment_border_bg);
-                viewHolder.voteBtn.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
+                viewHolder.voteBtn.setBackgroundResource(R.drawable.button_normal_style);
+                viewHolder.voteBtn.setTextColor(Color.WHITE);
                 viewHolder.voteBtn.setText(R.string.vote);
                 viewHolder.voteBtn.setEnabled(true);
             }
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java
index cf7eb8182c..add0276684 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.text.TextUtils;
 import android.view.MenuItem;
@@ -289,11 +288,11 @@ public class GameDetailFragment extends NormalFragment {
 
         if (mGameDetailEntity.getUserData() != null && mGameDetailEntity.getUserData().isGameConcerned()) {
             mGameConcern.setText(getString(R.string.cancel_concern));
-            mGameConcern.setBackgroundResource(R.drawable.border_red_bg);
-            mGameConcern.setTextColor(ContextCompat.getColor(getContext(), R.color.red));
+            mGameConcern.setBackgroundResource(R.drawable.button_normal_border);
+            mGameConcern.setTextColor(getResources().getColor(R.color.theme));
         } else {
             mGameConcern.setText(getString(R.string.concern));
-            mGameConcern.setBackgroundResource(R.drawable.textview_concern_red_style);
+            mGameConcern.setBackgroundResource(R.drawable.button_normal_style);
             mGameConcern.setTextColor(0xffffffff);
         }
 
@@ -540,8 +539,8 @@ public class GameDetailFragment extends NormalFragment {
                                             DataCollectionUtils.uploadConcern(getContext(), mGameEntity.getName(), mGameEntity.getId(), "关注");
 
                                             mGameConcern.setText(R.string.cancel_concern);
-                                            mGameConcern.setBackgroundResource(R.drawable.border_red_bg);
-                                            mGameConcern.setTextColor(ContextCompat.getColor(getContext(), R.color.red));
+                                            mGameConcern.setBackgroundResource(R.drawable.button_normal_border);
+                                            mGameConcern.setTextColor(getResources().getColor(R.color.theme));
 
                                             toast(R.string.concern_success);
                                             mGameConcern.setEnabled(true);
@@ -574,7 +573,7 @@ public class GameDetailFragment extends NormalFragment {
                                                             mGameEntity.getName(), mGameEntity.getId(), "取消关注");
 
                                                     mGameConcern.setText(getString(R.string.concern));
-                                                    mGameConcern.setBackgroundResource(R.drawable.textview_concern_red_style);
+                                                    mGameConcern.setBackgroundResource(R.drawable.button_normal_style);
                                                     mGameConcern.setTextColor(0xffffffff);
                                                     mGameConcern.setEnabled(true);
                                                 }
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java
index 7b1e86b859..e0a2b22003 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java
@@ -1,12 +1,11 @@
 package com.gh.gamecenter.gamedetail;
 
 import android.content.Context;
-import android.graphics.Color;
-import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.gh.base.OnListClickListener;
+import com.gh.common.util.LibaoUtils;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.GameLibaoGalleryViewHolder;
 import com.gh.gamecenter.entity.LibaoEntity;
@@ -46,51 +45,7 @@ class GameLibaoGalleryAdapter extends BaseRecyclerAdapter<GameLibaoGalleryViewHo
         }
         holder.libaoDes.setText(content);
         if (libaoEntity.getStatus() == null) return;
-
-        holder.libaoBtn.setTextColor(Color.WHITE);
-        switch (libaoEntity.getStatus()) {
-            case "coming":
-                holder.libaoBtn.setText(R.string.libao_coming);
-                holder.libaoBtn.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "ling":
-                holder.libaoBtn.setText(R.string.libao_ling);
-                holder.libaoBtn.setBackgroundResource(R.drawable.textview_green_style);
-                break;
-            case "tao":
-                holder.libaoBtn.setText(R.string.libao_tao);
-                holder.libaoBtn.setBackgroundResource(R.drawable.textview_orange_style);
-                break;
-            case "used_up":
-                holder.libaoBtn.setText(R.string.libao_used_up);
-                holder.libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "finish":
-                holder.libaoBtn.setText(R.string.libao_finish);
-                holder.libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up);
-                break;
-            case "linged":
-                holder.libaoBtn.setText(R.string.libao_linged);
-                holder.libaoBtn.setBackgroundResource(R.drawable.libao_linged_style);
-                holder.libaoBtn.setTextColor(ContextCompat.getColorStateList(mContext, R.color.libao_linged_selector));
-                break;
-            case "taoed":
-                holder.libaoBtn.setText(R.string.libao_taoed);
-                holder.libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style);
-                holder.libaoBtn.setTextColor(ContextCompat.getColorStateList(mContext, R.color.libao_taoed_selector));
-                break;
-            case "copy":
-                holder.libaoBtn.setText(R.string.libao_copy);
-                holder.libaoBtn.setBackgroundResource(R.drawable.textview_blue_style);
-                break;
-            case "unshelve":
-                holder.libaoBtn.setBackgroundResource(R.drawable.textview_cancel_style);
-                holder.libaoBtn.setText(R.string.libao_unshelve);
-                break;
-            default:
-                holder.libaoBtn.setBackgroundResource(R.drawable.textview_cancel_style);
-                holder.libaoBtn.setText("异常");
-        }
+        LibaoUtils.setLiBaoBtnStatus(holder.libaoBtn, libaoEntity.getStatus(), mContext);
 
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
index 607917613f..26a69c8c11 100644
--- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
@@ -322,11 +322,11 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
         }
         if (mNewsDetailEntity.getUserData() != null && mNewsDetailEntity.getUserData().isGameConcerned()) {
             viewHolder.gamedetailConcern.setText(R.string.cancel_concern);
-            viewHolder.gamedetailConcern.setBackgroundResource(R.drawable.border_red_bg);
-            viewHolder.gamedetailConcern.setTextColor(ContextCompat.getColor(mContext, R.color.red));
+            viewHolder.gamedetailConcern.setBackgroundResource(R.drawable.button_normal_border);
+            viewHolder.gamedetailConcern.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
         } else {
             viewHolder.gamedetailConcern.setText(R.string.concern);
-            viewHolder.gamedetailConcern.setBackgroundResource(R.drawable.textview_concern_red_style);
+            viewHolder.gamedetailConcern.setBackgroundResource(R.drawable.button_normal_style);
             viewHolder.gamedetailConcern.setTextColor(Color.WHITE);
         }
         viewHolder.gamedetailConcern.setOnClickListener(new View.OnClickListener() {
@@ -355,8 +355,8 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                             DataCollectionUtils.uploadConcern(mContext, mGameEntity.getName(), mGameEntity.getId(), mContext.getString(R.string.concern));
 
                                             concern.setText(R.string.cancel_concern);
-                                            concern.setBackgroundResource(R.drawable.border_red_bg);
-                                            concern.setTextColor(ContextCompat.getColor(mContext, R.color.red));
+                                            concern.setBackgroundResource(R.drawable.button_normal_border);
+                                            concern.setTextColor(ContextCompat.getColor(mContext, R.color.theme));
 
                                             Utils.toast(mContext, R.string.concern_success);
                                             viewHolder.gamedetailConcern.setEnabled(true);
@@ -393,7 +393,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
                                                             mGameEntity.getName(), mGameEntity.getId(), mContext.getString(R.string.cancel_concern));
 
                                                     concern.setText(mContext.getString(R.string.concern));
-                                                    concern.setBackgroundResource(R.drawable.textview_concern_red_style);
+                                                    concern.setBackgroundResource(R.drawable.button_normal_style);
                                                     concern.setTextColor(Color.WHITE);
                                                     viewHolder.gamedetailConcern.setEnabled(true);
                                                 }
diff --git a/app/src/main/res/drawable/button_border_gray.xml b/app/src/main/res/drawable/button_border_gray.xml
new file mode 100644
index 0000000000..7b02131099
--- /dev/null
+++ b/app/src/main/res/drawable/button_border_gray.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android = "http://schemas.android.com/apk/res/android"
+    android:shape = "rectangle" >
+
+    <stroke
+        android:width = "0.6dp"
+        android:color = "@color/button_gray" />
+
+    <corners android:radius = "2dp" />
+
+    <solid android:color = "@android:color/transparent" />
+
+</shape >
\ No newline at end of file
diff --git a/app/src/main/res/drawable/border_red_bg.xml b/app/src/main/res/drawable/button_normal_border.xml
similarity index 87%
rename from app/src/main/res/drawable/border_red_bg.xml
rename to app/src/main/res/drawable/button_normal_border.xml
index ff03a18ee3..2579cb1ac8 100644
--- a/app/src/main/res/drawable/border_red_bg.xml
+++ b/app/src/main/res/drawable/button_normal_border.xml
@@ -4,7 +4,7 @@
 
     <stroke
         android:width = "0.6dp"
-        android:color = "#ff4147" />
+        android:color = "@color/theme" />
 
     <corners android:radius = "2dp" />
 
diff --git a/app/src/main/res/drawable/textview_concern_red_style.xml b/app/src/main/res/drawable/button_normal_style.xml
similarity index 100%
rename from app/src/main/res/drawable/textview_concern_red_style.xml
rename to app/src/main/res/drawable/button_normal_style.xml
diff --git a/app/src/main/res/drawable/news_detail_comment.xml b/app/src/main/res/drawable/news_detail_comment.xml
index 59584bff6e..9aaed6d4f7 100644
--- a/app/src/main/res/drawable/news_detail_comment.xml
+++ b/app/src/main/res/drawable/news_detail_comment.xml
@@ -4,7 +4,7 @@
 
     <stroke
         android:width = "1dp"
-        android:color = "@color/hint" />
+        android:color = "@color/button_gray" />
 
     <corners android:radius = "999dp" />
 
diff --git a/app/src/main/res/drawable/textview_concern_red_dn.xml b/app/src/main/res/drawable/textview_concern_red_dn.xml
index dcd51f502b..ae4c1e48c2 100644
--- a/app/src/main/res/drawable/textview_concern_red_dn.xml
+++ b/app/src/main/res/drawable/textview_concern_red_dn.xml
@@ -3,7 +3,7 @@
 
     <item >
         <shape android:shape = "rectangle" >
-            <solid android:color = "#D43237" />
+            <solid android:color = "@color/theme" />
 
             <corners android:radius = "2dp" />
         </shape >
diff --git a/app/src/main/res/drawable/textview_concern_red_up.xml b/app/src/main/res/drawable/textview_concern_red_up.xml
index 1f95b8dfb3..55f901d086 100644
--- a/app/src/main/res/drawable/textview_concern_red_up.xml
+++ b/app/src/main/res/drawable/textview_concern_red_up.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android = "http://schemas.android.com/apk/res/android"
     android:shape = "rectangle" >
 
-    <solid android:color = "#ff4147" />
+    <solid android:color = "@color/theme" />
 
     <corners android:radius = "2dp" />
 
diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml
index 0a8915ec5e..9068182a82 100644
--- a/app/src/main/res/layout/activity_news_detail.xml
+++ b/app/src/main/res/layout/activity_news_detail.xml
@@ -62,7 +62,7 @@
                             android:layout_marginLeft = "10dp"
                             android:layout_toRightOf = "@+id/comment_icon"
                             android:text = "@string/news_detail_send_comment"
-                            android:textColor = "@color/theme"
+                            android:textColor = "@color/button_gray"
                             android:textSize = "14sp" />
 
                     </RelativeLayout >
diff --git a/app/src/main/res/layout/detail_download_item.xml b/app/src/main/res/layout/detail_download_item.xml
index f9103ab83d..26967ecac0 100644
--- a/app/src/main/res/layout/detail_download_item.xml
+++ b/app/src/main/res/layout/detail_download_item.xml
@@ -6,7 +6,7 @@
     android:layout_alignParentBottom = "true"
     android:layout_marginTop = "-7dp"
     android:orientation = "vertical"
-    android:visibility = "visible" >
+    android:visibility = "gone" >
 
     <View
         android:layout_width = "match_parent"
diff --git a/app/src/main/res/layout/gamedetail_body.xml b/app/src/main/res/layout/gamedetail_body.xml
index b04010debc..97cb0ef8c1 100644
--- a/app/src/main/res/layout/gamedetail_body.xml
+++ b/app/src/main/res/layout/gamedetail_body.xml
@@ -99,7 +99,7 @@
                 android:id = "@+id/gamedetail_tv_concern"
                 android:layout_width = "60dp"
                 android:layout_height = "28.5dp"
-                android:background = "@drawable/textview_concern_red_style"
+                android:background = "@drawable/button_normal_style"
                 android:gravity = "center"
                 android:text = "@string/game_detail_favorite"
                 android:textColor = "@android:color/white"
diff --git a/app/src/main/res/layout/gamedetail_item_fuli.xml b/app/src/main/res/layout/gamedetail_item_fuli.xml
index 90148eae43..0ed3aec6d5 100644
--- a/app/src/main/res/layout/gamedetail_item_fuli.xml
+++ b/app/src/main/res/layout/gamedetail_item_fuli.xml
@@ -82,14 +82,14 @@
             android:layout_height = "23dp"
             android:layout_alignParentRight = "true"
             android:layout_centerVertical = "true"
-            android:background = "@drawable/libao_taoed_style"
+            android:background = "@drawable/button_normal_style"
             android:gravity = "center"
             android:paddingBottom = "4dp"
             android:paddingLeft = "5dp"
             android:paddingRight = "5dp"
             android:paddingTop = "4dp"
             android:text = "@string/fuli_wanna_consult"
-            android:textColor = "@color/fuli_detail"
+            android:textColor = "@android:color/white"
             android:textSize = "11sp" />
     </RelativeLayout >
 
@@ -122,14 +122,14 @@
             android:layout_height = "23dp"
             android:layout_alignParentRight = "true"
             android:layout_centerVertical = "true"
-            android:background = "@drawable/libao_taoed_style"
+            android:background = "@drawable/button_normal_style"
             android:gravity = "center"
             android:paddingBottom = "4dp"
             android:paddingLeft = "5dp"
             android:paddingRight = "5dp"
             android:paddingTop = "4dp"
             android:text = "@string/fuli_wanna_join"
-            android:textColor = "@color/fuli_detail"
+            android:textColor = "@android:color/white"
             android:textSize = "11sp" />
     </RelativeLayout >
 
diff --git a/app/src/main/res/layout/news_text_item.xml b/app/src/main/res/layout/news_text_item.xml
index afaa20b1f6..714208ec2c 100644
--- a/app/src/main/res/layout/news_text_item.xml
+++ b/app/src/main/res/layout/news_text_item.xml
@@ -25,7 +25,7 @@
             android:id = "@+id/news_text_type"
             android:layout_width = "26dp"
             android:layout_height = "15dp"
-            android:background = "@drawable/border_red_bg"
+            android:background = "@drawable/button_normal_border"
             android:gravity = "center"
             android:paddingLeft = "1dp"
             android:paddingRight = "1dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3c32c2cab6..6cac993489 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,7 +2,7 @@
 <resources >
 
     <!-- 主题颜色 -->
-    <color name = "theme" >#00B7FA</color >
+    <color name = "theme" >#1A7BD5</color >
     <!-- 系统沉浸色 -->
     <color name = "system_bar" >#000000</color >
     <!-- 标题颜色 -->
@@ -15,13 +15,13 @@
     <color name = "background" >#f5f5f5</color >
     <!--<color name="background">#ECF4F4</color>-->
     <!-- 分割线颜色 -->
-    <color name = "cutting_line" >#ededed</color >
+    <color name = "cutting_line" >@color/background</color >
     <!-- item点击颜色 -->
     <!--<color name="select">#E7E7E7</color>-->
     <color name = "select" >#EBEBEB</color >
 
     <!-- 按钮颜色 -->
-    <color name = "btn_download" >#00B7FA</color >
+    <color name = "btn_download" >@color/theme</color >
     <color name = "btn_plugin" >#06D0A8</color >
     <color name = "btn_open" >#FFB13C</color >
     <color name = "btn_pause" >@color/c7c7c7</color >
@@ -75,6 +75,8 @@
 
     <color name = "black" >@android:color/black</color >
 
+    <color name = "button_gray">#b3b3b3</color>
+
     <!-- 默认红 -->
     <color name = "red" >#ff4147</color >
     <color name = "aaaaaa" >#aaaaaa</color >
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f048de20bb..eac7592cfc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -317,13 +317,13 @@
     <string name = "updating" >更新中</string >
 
     <string name = "taoed_code" >已淘号：<Data ><![CDATA[<font color="#ffb13c">%1$s</font>]]></Data ></string >
-    <string name = "linged_code" >已领取：<Data ><![CDATA[<font color="#00B7FA">%1$s</font>]]></Data ></string >
-    <string name = "linged_copy_dialog" >礼包码：<Data ><![CDATA[<font color="#00B7FA">%1$s</font>复制成功<br/>请尽快进入游戏兑换]]></Data ></string >
+    <string name = "linged_code" >已领取：<Data ><![CDATA[<font color="#1a7bd5">%1$s</font>]]></Data ></string >
+    <string name = "linged_copy_dialog" >礼包码：<Data ><![CDATA[<font color="#1a7bd5">%1$s</font>复制成功<br/>请尽快进入游戏兑换]]></Data ></string >
     <string name = "taoed_copy_dialog" >礼包码：<Data ><![CDATA[<font color="#ffb13c">%1$s</font>复制成功<br/>淘号礼包不保证可用，请尽快进入游戏尝试兑换]]></Data ></string >
     <string name = "libao_delete_dialog" >礼包码删除之后<Data ><![CDATA[<font color="#ff0000">不可恢复</font>，请确定您已经兑换过该礼包]]></Data ></string >
     <string name = "ling_rules_dialog" >请先<Data ><![CDATA[<font color="#06D0A8">安装《%1$s》 %2$s</font>]]></Data ></string >
     <string name = "taoed_dialog" >礼包码：<Data ><![CDATA[<font color="#ffb13c">%1$s</font><br/>淘号礼包不保证可用，请尽快进入游戏尝试兑换]]></Data ></string >
-    <string name = "linged_dialog" >礼包码：<Data ><![CDATA[<font color="#00B7FA">%1$s</font><br/>请尽快使用，礼包码将于60分钟后进入淘号池]]></Data ></string >
+    <string name = "linged_dialog" >礼包码：<Data ><![CDATA[<font color="#1a7bd5">%1$s</font><br/>请尽快使用，礼包码将于60分钟后进入淘号池]]></Data ></string >
     <string name = "libao_install_hint" ><Data ><![CDATA[领取条件：<font color="#06D0A8">安装《%1$s》</font>]]></Data ></string >
     <string name = "libao_install_hint_platform" ><Data ><![CDATA[领取条件：<font color="#06D0A8">安装《%1$s》%2$s版</font>]]></Data ></string >
 
@@ -332,9 +332,9 @@
     <string name = "delete_apk_hint" ><Data ><![CDATA[你选择的安装包中包含 <font color="#ff0000">未安装</font> 的应用，确定删除吗？]]></Data ></string >
     <string name = "clean_apk_count" >找到%1$d个安装包，占用<Data ><![CDATA[<font color="#ff4147">%2$s</font>空间]]></Data ></string >
     <string name = "create_hotspot" ><Data ><![CDATA[成功创建热点：<font color="#fff500">%1$s</font>]]></Data ></string >
-    <string name = "create_hotspot_blue" ><Data ><![CDATA[成功创建热点：<font color="#00B7FA">%1$s</font>]]></Data ></string >
-    <string name = "kc_conn_hint" ><Data ><![CDATA[请好友打开Wi-Fi设置，连接我的热点：<font color="#00B7FA">%1$s</font>]]></Data ></string >
-    <string name = "kc_game_size" ><Data ><![CDATA[大小：<font color="#00B7FA">%1$s</font>]]></Data ></string >
+    <string name = "create_hotspot_blue" ><Data ><![CDATA[成功创建热点：<font color="#1a7bd5">%1$s</font>]]></Data ></string >
+    <string name = "kc_conn_hint" ><Data ><![CDATA[请好友打开Wi-Fi设置，连接我的热点：<font color="#1a7bd5">%1$s</font>]]></Data ></string >
+    <string name = "kc_game_size" ><Data ><![CDATA[大小：<font color="#1a7bd5">%1$s</font>]]></Data ></string >
     <string name = "kc_game_version" >"版本：V%1$s</string >
     <string name = "kc_share_gh_hint" ><Data ><![CDATA[<u>好友还没安装光环助手？请点这里</u>]]></Data ></string >
     <string name = "kc_clean_apk_hint" ><Data ><![CDATA[手机空间不足？试试<font color="#05c400">安装包清理</font>]]></Data ></string >
@@ -380,7 +380,7 @@
     <string name = "kc_installed_count" >已安装的游戏（%1$d）</string >
     <string name = "message_comment_vote_count" >收到%1$d个赞</string >
     <string name = "toast_upload_latest" >已是最新版本</string >
-    <string name = "vote_reply" ><Data ><![CDATA[<font color="#00B7FA">小编回复:</font>%1$s]]></Data ></string >
+    <string name = "vote_reply" ><Data ><![CDATA[<font color="#1a7bd5">小编回复:</font>%1$s]]></Data ></string >
     <string name = "vote_count" >%1$d票</string >
     <string name = "kefu_default_name" >光环客服</string >
     <string name = "text_holder" >I\'m a Text</string >
@@ -488,7 +488,7 @@
     <string name = "answer_post" >发布</string >
     <string name = "answer_placeholder" >请撰写回答...</string >
 
-    <string name = "message_answer_content" ><Data ><![CDATA[<font color="#00B7FA">%1$s：</font>%2$s]]></Data ></string >
+    <string name = "message_answer_content" ><Data ><![CDATA[<font color="#1a7bd5">%1$s：</font>%2$s]]></Data ></string >
     <string name = "message_myanswer_content" >我的回答：%1$s</string >
     <string name = "message_questions_title" >问题：%1$s</string >
     <string name = "message_article_title" >文章：%1$s</string >