diff --git a/twidere/build.gradle b/twidere/build.gradle
index c02d4ad23..a70aebd44 100644
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@@ -91,7 +91,6 @@ dependencies {
     kapt 'com.hannesdorfmann.parcelableplease:processor:1.0.2'
     kapt 'com.google.dagger:dagger-compiler:2.8'
     kapt 'com.github.mariotaku.ObjectCursor:processor:0.9.12'
-    kapt 'nz.bradcampbell:paperparcel-compiler:2.0.0-beta2'
 
     compile project(':twidere.component.common')
     compile project(':twidere.component.nyan')
@@ -179,7 +178,6 @@ dependencies {
     compile 'nl.komponents.kovenant:kovenant-android:3.3.0'
     compile 'nl.komponents.kovenant:kovenant-functional:3.3.0'
     compile 'nl.komponents.kovenant:kovenant-combine:3.3.0'
-    compile 'nz.bradcampbell:paperparcel:2.0.0-beta2'
 }
 
 task svgToDrawable(type: SvgDrawableTask) {
diff --git a/twidere/src/google/kotlin/org/mariotaku/twidere/activity/GooglePlayInAppPurchaseActivity.kt b/twidere/src/google/kotlin/org/mariotaku/twidere/activity/GooglePlayInAppPurchaseActivity.kt
index 39e4913a5..c24aee931 100644
--- a/twidere/src/google/kotlin/org/mariotaku/twidere/activity/GooglePlayInAppPurchaseActivity.kt
+++ b/twidere/src/google/kotlin/org/mariotaku/twidere/activity/GooglePlayInAppPurchaseActivity.kt
@@ -15,6 +15,7 @@ import nl.komponents.kovenant.ui.successUi
 import org.mariotaku.twidere.Constants
 import org.mariotaku.twidere.activity.premium.AbsExtraFeaturePurchaseActivity
 import org.mariotaku.twidere.fragment.ProgressDialogFragment
+import org.mariotaku.twidere.model.premium.PurchaseResult
 import org.mariotaku.twidere.util.premium.GooglePlayExtraFeaturesService
 import java.lang.ref.WeakReference
 
@@ -82,7 +83,10 @@ class GooglePlayInAppPurchaseActivity : AbsExtraFeaturePurchaseActivity(),
     }
 
     private fun handlePurchased(sku: SkuDetails, transaction: TransactionDetails) {
-        val result = PurchaseResult(requestingFeature, sku.priceValue, sku.currency)
+        val result = PurchaseResult()
+        result.feature = requestingFeature
+        result.price = sku.priceValue
+        result.currency = sku.currency
         finishWithResult(result)
     }
 
diff --git a/twidere/src/main/AndroidManifest.xml b/twidere/src/main/AndroidManifest.xml
index 428c6b3dc..0d3fdeb74 100644
--- a/twidere/src/main/AndroidManifest.xml
+++ b/twidere/src/main/AndroidManifest.xml
@@ -297,7 +297,7 @@
         <activity
             android:name=".activity.LinkHandlerActivity"
             android:parentActivityName=".activity.HomeActivity"
-            android:theme="@style/Theme.Twidere"
+            android:theme="@style/Theme.Twidere.Content"
             android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/DividerItemDecoration.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/DividerItemDecoration.java
index 7e2a6f35a..204005af4 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/DividerItemDecoration.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/decorator/DividerItemDecoration.java
@@ -17,7 +17,6 @@
 package org.mariotaku.twidere.adapter.decorator;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -26,6 +25,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.Adapter;
 import android.support.v7.widget.RecyclerView.State;
+import android.support.v7.widget.TintTypedArray;
 import android.view.View;
 
 public class DividerItemDecoration extends RecyclerView.ItemDecoration {
@@ -46,7 +46,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
     private int mDecorationStart = -1, mDecorationEnd = -1, mDecorationEndOffset;
 
     public DividerItemDecoration(Context context, int orientation) {
-        final TypedArray a = context.obtainStyledAttributes(ATTRS);
+        final TintTypedArray a = TintTypedArray.obtainStyledAttributes(context, null, ATTRS);
         mDivider = a.getDrawable(0);
         a.recycle();
         setOrientation(orientation);
diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/premium/PurchaseResult.java b/twidere/src/main/java/org/mariotaku/twidere/model/premium/PurchaseResult.java
new file mode 100644
index 000000000..f4231220f
--- /dev/null
+++ b/twidere/src/main/java/org/mariotaku/twidere/model/premium/PurchaseResult.java
@@ -0,0 +1,63 @@
+package org.mariotaku.twidere.model.premium;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.hannesdorfmann.parcelableplease.annotation.ParcelablePlease;
+
+/**
+ * Created by mariotaku on 2017/1/17.
+ */
+
+@ParcelablePlease
+public class PurchaseResult implements Parcelable {
+    String feature;
+    double price;
+    String currency;
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
+    public String getFeature() {
+        return feature;
+    }
+
+    public void setFeature(String feature) {
+        this.feature = feature;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        PurchaseResultParcelablePlease.writeToParcel(this, dest, flags);
+    }
+
+    public static final Creator<PurchaseResult> CREATOR = new Creator<PurchaseResult>() {
+        public PurchaseResult createFromParcel(Parcel source) {
+            PurchaseResult target = new PurchaseResult();
+            PurchaseResultParcelablePlease.readFromParcel(target, source);
+            return target;
+        }
+
+        public PurchaseResult[] newArray(int size) {
+            return new PurchaseResult[size];
+        }
+    };
+}
diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/tab/TabConfiguration.java b/twidere/src/main/java/org/mariotaku/twidere/model/tab/TabConfiguration.java
index 23e37d9aa..0c7c86b07 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/model/tab/TabConfiguration.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/model/tab/TabConfiguration.java
@@ -132,6 +132,8 @@ public abstract class TabConfiguration {
         private final String key;
         private StringHolder title;
         @Nullable
+        private StringHolder summary;
+        @Nullable
         private StringHolder headerTitle;
         private int position;
         private boolean mutable;
@@ -155,16 +157,35 @@ public abstract class TabConfiguration {
             this.title = title;
         }
 
+        @Nullable
+        public StringHolder getSummary() {
+            return summary;
+        }
+
+        public void setSummary(@Nullable StringHolder summary) {
+            this.summary = summary;
+        }
+
         public ExtraConfiguration title(StringHolder title) {
             setTitle(title);
             return this;
         }
 
+        public ExtraConfiguration summary(StringHolder summary) {
+            setSummary(summary);
+            return this;
+        }
+
         public ExtraConfiguration title(@StringRes int titleRes) {
             setTitle(StringHolder.resource(titleRes));
             return this;
         }
 
+        public ExtraConfiguration summary(@StringRes int summaryRes) {
+            setSummary(StringHolder.resource(summaryRes));
+            return this;
+        }
+
         @Nullable
         public StringHolder getHeaderTitle() {
             return headerTitle;
diff --git a/twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/InteractionsTabConfiguration.java b/twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/InteractionsTabConfiguration.java
index 10b5e6347..dc0a39ab7 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/InteractionsTabConfiguration.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/model/tab/impl/InteractionsTabConfiguration.java
@@ -119,14 +119,19 @@ public class InteractionsTabConfiguration extends TabConfiguration {
             final View view = getView();
             final CheckBox checkBox = (CheckBox) view.findViewById(android.R.id.checkbox);
             final TextView titleView = (TextView) view.findViewById(android.R.id.title);
+            final TextView summaryView = (TextView) view.findViewById(android.R.id.summary);
             view.setEnabled(hasOfficial);
             titleView.setEnabled(hasOfficial);
+            summaryView.setEnabled(hasOfficial);
             checkBox.setEnabled(hasOfficial);
             if (hasOfficial) {
                 checkBox.setChecked(valueBackup);
+                summaryView.setVisibility(View.GONE);
             } else {
                 valueBackup = checkBox.isChecked();
                 checkBox.setChecked(true);
+                summaryView.setText(R.string.summary_interactions_not_available);
+                summaryView.setVisibility(View.VISIBLE);
             }
         }
 
diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/CardPreviewPreference.java b/twidere/src/main/java/org/mariotaku/twidere/preference/CardPreviewPreference.java
deleted file mode 100644
index ef04e0440..000000000
--- a/twidere/src/main/java/org/mariotaku/twidere/preference/CardPreviewPreference.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 				Twidere - Twitter client for Android
- * 
- *  Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
- * 
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- * 
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- * 
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.mariotaku.twidere.preference;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.support.v7.widget.RecyclerView;
-import android.util.AttributeSet;
-
-import org.mariotaku.twidere.R;
-import org.mariotaku.twidere.adapter.DummyItemAdapter;
-import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable;
-import org.mariotaku.twidere.view.holder.StatusViewHolder;
-import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder;
-
-import static org.mariotaku.twidere.TwidereConstants.SHARED_PREFERENCES_NAME;
-
-public class CardPreviewPreference extends Preference implements OnSharedPreferenceChangeListener {
-
-    private StatusViewHolder mHolder;
-    private DummyItemAdapter mAdapter;
-
-    public CardPreviewPreference(final Context context) {
-        this(context, null);
-    }
-
-    public CardPreviewPreference(final Context context, final AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public CardPreviewPreference(final Context context, final AttributeSet attrs, final int defStyle) {
-        super(context, attrs, defStyle);
-        final SharedPreferences preferences = context.getSharedPreferences(SHARED_PREFERENCES_NAME,
-                Context.MODE_PRIVATE);
-        setLayoutResource(R.layout.layout_preferences_card_preview_compact);
-        preferences.registerOnSharedPreferenceChangeListener(this);
-        mAdapter = new DummyItemAdapter(context);
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(final SharedPreferences preferences, final String key) {
-        mAdapter.updateOptions();
-        mHolder = null;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        if (mHolder == null) {
-            mHolder = new StatusViewHolder(mAdapter, holder.itemView);
-        }
-        mHolder.setupViewOptions();
-        mHolder.displaySampleStatus();
-        mHolder.setStatusClickListener(new IStatusViewHolder.SimpleStatusClickListener() {
-            @Override
-            public void onItemActionClick(@NonNull RecyclerView.ViewHolder holder, int id, int position) {
-                if (id == R.id.favorite) {
-                    ((StatusViewHolder) holder).playLikeAnimation(new LikeAnimationDrawable.OnLikedListener() {
-                        @Override
-                        public boolean onLiked() {
-                            return false;
-                        }
-                    });
-                }
-            }
-        });
-        super.onBindViewHolder(holder);
-    }
-
-}
diff --git a/twidere/src/main/java/org/mariotaku/twidere/preference/CardPreviewPreference.kt b/twidere/src/main/java/org/mariotaku/twidere/preference/CardPreviewPreference.kt
new file mode 100644
index 000000000..b9c99ca73
--- /dev/null
+++ b/twidere/src/main/java/org/mariotaku/twidere/preference/CardPreviewPreference.kt
@@ -0,0 +1,76 @@
+/*
+ * 				Twidere - Twitter client for Android
+ * 
+ *  Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
+ * 
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ * 
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mariotaku.twidere.preference
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.support.v7.preference.Preference
+import android.support.v7.preference.PreferenceViewHolder
+import android.support.v7.widget.RecyclerView
+import android.util.AttributeSet
+import org.mariotaku.twidere.R
+import org.mariotaku.twidere.TwidereConstants.SHARED_PREFERENCES_NAME
+import org.mariotaku.twidere.adapter.DummyItemAdapter
+import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable
+import org.mariotaku.twidere.view.holder.StatusViewHolder
+import org.mariotaku.twidere.view.holder.iface.IStatusViewHolder
+
+class CardPreviewPreference(
+        context: Context,
+        attrs: AttributeSet? = null
+) : Preference(context, attrs), OnSharedPreferenceChangeListener {
+
+    private var holder: StatusViewHolder? = null
+    private val adapter: DummyItemAdapter = DummyItemAdapter(context)
+
+    init {
+        val preferences = context.getSharedPreferences(SHARED_PREFERENCES_NAME,
+                Context.MODE_PRIVATE)
+        layoutResource = R.layout.layout_preferences_card_preview_compact
+        preferences.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onSharedPreferenceChanged(preferences: SharedPreferences, key: String) {
+        adapter.updateOptions()
+        holder = null
+        notifyChanged()
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        if (this.holder == null) {
+            this.holder = StatusViewHolder(adapter, holder.itemView).apply {
+                setStatusClickListener(object : IStatusViewHolder.StatusClickListener {
+                    override fun onItemActionClick(holder: RecyclerView.ViewHolder, id: Int, position: Int) {
+                        if (id == R.id.favorite) {
+                            (holder as StatusViewHolder).playLikeAnimation(LikeAnimationDrawable.OnLikedListener { false })
+                        }
+                    }
+                })
+            }
+        }
+        this.holder?.let {
+            it.setupViewOptions()
+            it.displaySampleStatus()
+        }
+        super.onBindViewHolder(holder)
+    }
+
+}
diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/ThemeUtils.java b/twidere/src/main/java/org/mariotaku/twidere/util/ThemeUtils.java
index 1c04434ca..ff5a34568 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/util/ThemeUtils.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/ThemeUtils.java
@@ -169,7 +169,12 @@ public class ThemeUtils implements Constants {
     }
 
     public static Drawable getSelectableItemBackgroundDrawable(final Context context) {
-        final TypedArray a = context.obtainStyledAttributes(new int[]{android.R.attr.selectableItemBackground});
+        return getDrawableFromThemeAttribute(context, android.R.attr.selectableItemBackground);
+    }
+
+
+    public static Drawable getDrawableFromThemeAttribute(final Context context, int attr) {
+        final TypedArray a = context.obtainStyledAttributes(new int[]{attr});
         try {
             return a.getDrawable(0);
         } finally {
diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/ShortTimeView.java b/twidere/src/main/java/org/mariotaku/twidere/view/ShortTimeView.java
index 63f7e42d3..f37482d7e 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/view/ShortTimeView.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/view/ShortTimeView.java
@@ -23,15 +23,12 @@ import android.content.Context;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.support.v7.widget.AppCompatTextView;
-import android.text.format.DateUtils;
 import android.util.AttributeSet;
 
 import org.mariotaku.twidere.Constants;
-import org.mariotaku.twidere.R;
 
 import java.lang.ref.WeakReference;
 
-import static android.text.format.DateUtils.getRelativeTimeSpanString;
 import static org.mariotaku.twidere.util.Utils.formatSameDayTime;
 
 public class ShortTimeView extends AppCompatTextView implements Constants {
@@ -83,10 +80,10 @@ public class ShortTimeView extends AppCompatTextView implements Constants {
         } else {
             final long current = System.currentTimeMillis();
             if (Math.abs(current - mTime) > 60 * 1000) {
-                setText(getRelativeTimeSpanString(mTime, System.currentTimeMillis(),
-                        DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_ALL));
+//                setText(getRelativeTimeSpanString(mTime, System.currentTimeMillis(),
+//                        DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_ALL));
             } else {
-                setText(R.string.just_now);
+//                setText(R.string.just_now);
             }
         }
     }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt
index 03868edbf..f840da85f 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/HomeActivity.kt
@@ -94,7 +94,8 @@ import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallb
 import org.mariotaku.twidere.view.HomeDrawerLayout
 import org.mariotaku.twidere.view.TabPagerIndicator
 
-class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, SupportFragmentCallback, OnLongClickListener, DrawerLayout.DrawerListener {
+class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, SupportFragmentCallback,
+        OnLongClickListener, DrawerLayout.DrawerListener {
 
     private val accountUpdatedListener = AccountUpdatedListener(this)
 
@@ -338,7 +339,7 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp
         drawerToggle = ActionBarDrawerToggle(this, homeMenu, R.string.open_accounts_dashboard,
                 R.string.close_accounts_dashboard)
         homeContent.setOnFitSystemWindowsListener(this)
-        pagerAdapter = SupportTabsAdapter(this, supportFragmentManager, mainTabs, tabColumns)
+        pagerAdapter = SupportTabsAdapter(this, supportFragmentManager, mainTabs)
         mainPager.adapter = pagerAdapter
         mainTabs.setViewPager(mainPager)
         mainTabs.setOnPageChangeListener(this)
@@ -533,7 +534,6 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp
     }
 
     override fun onDestroy() {
-
         stopService(Intent(this, StreamingService::class.java))
 
         // Delete unused items in databases.
@@ -795,12 +795,14 @@ class HomeActivity : BaseActivity(), OnClickListener, OnPageChangeListener, Supp
         val hasNoTab = pagerAdapter.count == 0
         emptyTabHint.visibility = if (hasNoTab) View.VISIBLE else View.GONE
         mainPager.visibility = if (hasNoTab) View.GONE else View.VISIBLE
-        if (pagerAdapter.getPageWidth(0) < 1) {
+        if (resources.getBoolean(R.bool.home_tab_has_multiple_columns)) {
             mainPager.pageMargin = resources.getDimensionPixelOffset(R.dimen.home_page_margin)
-            mainPager.setPageMarginDrawable(R.color.home_page_margin_color)
+            mainPager.setPageMarginDrawable(ThemeUtils.getDrawableFromThemeAttribute(this, R.attr.dividerVertical))
+            pagerAdapter.pageWidth = resources.getDimension(R.dimen.preferred_tab_column_width) / resources.displayMetrics.widthPixels
         } else {
             mainPager.pageMargin = 0
             mainPager.setPageMarginDrawable(null)
+            pagerAdapter.pageWidth = 1f
         }
     }
 
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt
index 236e4fb6c..cb667caba 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt
@@ -34,6 +34,7 @@ import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.MenuItem
 import android.view.Window
+import kotlinx.android.synthetic.main.activity_link_handler.*
 import org.mariotaku.kpreferences.get
 import org.mariotaku.ktextension.convert
 import org.mariotaku.ktextension.set
@@ -65,7 +66,8 @@ import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallb
 import org.mariotaku.twidere.util.Utils.LINK_ID_FILTERS_IMPORT_BLOCKS
 import org.mariotaku.twidere.util.Utils.matchLinkId
 
-class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IControlBarActivity, SupportFragmentCallback {
+class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IControlBarActivity,
+        SupportFragmentCallback {
 
     private lateinit var multiSelectHandler: MultiSelectEventHandler
     private lateinit var controlBarShowHideHelper: ControlBarShowHideHelper
@@ -74,17 +76,15 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro
     private var subtitle: CharSequence? = null
     private var hideOffsetNotSupported: Boolean = false
 
-
     override val currentVisibleFragment: Fragment?
-        get() {
-            return supportFragmentManager.findFragmentById(android.R.id.content)
-        }
+        get() = supportFragmentManager.findFragmentByTag("content_fragment")
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         multiSelectHandler = MultiSelectEventHandler(this)
         controlBarShowHideHelper = ControlBarShowHideHelper(this)
         multiSelectHandler.dispatchOnCreate()
+
         val uri = intent.data
         val linkId = matchLinkId(uri)
         intent.setExtrasClassLoader(classLoader)
@@ -107,17 +107,26 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowsInsetsCallback, IContro
             return
         }
 
+        val contentFragmentId: Int
+
         if (fragment is IToolBarSupportFragment) {
             if (!fragment.setupWindow(this)) {
                 supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
                 supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_MODE_OVERLAY)
             }
+            contentFragmentId = android.R.id.content
+        } else {
+            setContentView(R.layout.activity_link_handler)
+            toolbar?.let { toolbar ->
+                setSupportActionBar(toolbar)
+            }
+            contentFragmentId = R.id.contentFragment
         }
 
         setupActionBarOption()
         Utils.logOpenNotificationFromUri(this, uri)
         val ft = supportFragmentManager.beginTransaction()
-        ft.replace(android.R.id.content, fragment)
+        ft.replace(contentFragmentId, fragment, "content_fragment")
         ft.commit()
         setTitle(linkId, uri)
         finishOnly = java.lang.Boolean.parseBoolean(uri.getQueryParameter(QUERY_PARAM_FINISH_ONLY))
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/premium/AbsExtraFeaturePurchaseActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/premium/AbsExtraFeaturePurchaseActivity.kt
index b7c30ff15..8736d063c 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/premium/AbsExtraFeaturePurchaseActivity.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/premium/AbsExtraFeaturePurchaseActivity.kt
@@ -2,11 +2,9 @@ package org.mariotaku.twidere.activity.premium
 
 import android.content.Context
 import android.content.Intent
-import android.os.Parcel
-import android.os.Parcelable
 import org.mariotaku.twidere.activity.BaseActivity
 import org.mariotaku.twidere.constant.IntentConstants
-import paperparcel.PaperParcel
+import org.mariotaku.twidere.model.premium.PurchaseResult
 
 /**
  * Created by mariotaku on 2017/1/8.
@@ -25,19 +23,6 @@ abstract class AbsExtraFeaturePurchaseActivity : BaseActivity() {
         finish()
     }
 
-    @PaperParcel
-    data class PurchaseResult(val feature: String, val price: Double, val currency: String) : Parcelable {
-        companion object {
-            @JvmField val CREATOR = PaperParcelAbsExtraFeaturePurchaseActivity_PurchaseResult.CREATOR
-        }
-
-        override fun describeContents() = 0
-
-        override fun writeToParcel(dest: Parcel, flags: Int) {
-            PaperParcelAbsExtraFeaturePurchaseActivity_PurchaseResult.writeToParcel(this, dest, flags)
-        }
-    }
-
     companion object {
 
         const val RESULT_SERVICE_UNAVAILABLE = 1
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt
index da691c8da..ebe543cd7 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.kt
@@ -361,6 +361,8 @@ class ParcelableActivitiesAdapter(
 
         fun onStatusClick(holder: IStatusViewHolder, position: Int)
 
+        fun onQuotedStatusClick(holder: IStatusViewHolder, position: Int)
+
     }
 
     internal class StubViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@@ -417,29 +419,28 @@ class ParcelableActivitiesAdapter(
 
         override fun onStatusClick(holder: IStatusViewHolder, position: Int) {
             val adapter = adapterRef.get() ?: return
-            if (adapter.activityAdapterListener != null) {
-                adapter.activityAdapterListener!!.onStatusClick(holder, position)
-            }
+            adapter.activityAdapterListener?.onStatusClick(holder, position)
+        }
+
+
+        override fun onQuotedStatusClick(holder: IStatusViewHolder, position: Int) {
+            val adapter = adapterRef.get() ?: return
+            adapter.activityAdapterListener?.onQuotedStatusClick(holder, position)
         }
 
         override fun onMediaClick(holder: IStatusViewHolder, view: View, media: ParcelableMedia, statusPosition: Int) {
             val adapter = adapterRef.get() ?: return
-            if (adapter.activityAdapterListener != null) {
-                adapter.activityAdapterListener!!.onMediaClick(holder, view, media, statusPosition)
-            }
+            adapter.activityAdapterListener?.onMediaClick(holder, view, media, statusPosition)
         }
 
         override fun onActivityClick(holder: ActivityTitleSummaryViewHolder, position: Int) {
             val adapter = adapterRef.get() ?: return
-            if (adapter.activityAdapterListener == null) return
-            adapter.activityAdapterListener!!.onActivityClick(holder, position)
+            adapter.activityAdapterListener?.onActivityClick(holder, position)
         }
 
         override fun onItemMenuClick(holder: RecyclerView.ViewHolder, menuView: View, position: Int) {
             val adapter = adapterRef.get() ?: return
-            if (adapter.activityAdapterListener != null) {
-                adapter.activityAdapterListener!!.onStatusMenuClick(holder as StatusViewHolder, menuView, position)
-            }
+            adapter.activityAdapterListener?.onStatusMenuClick(holder as StatusViewHolder, menuView, position)
         }
     }
 
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt
index 302c8a721..88bd2ea77 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/SupportTabsAdapter.kt
@@ -41,8 +41,7 @@ import java.util.*
 class SupportTabsAdapter @JvmOverloads constructor(
         private val context: Context,
         fm: FragmentManager,
-        private val indicator: PagerIndicator? = null,
-        private val columns: Int = 1
+        private val indicator: PagerIndicator? = null
 ) : SupportFixedFragmentStatePagerAdapter(fm), TabProvider, TabListener {
 
     private val tab = ArrayList<SupportTabSpec>()
@@ -92,7 +91,7 @@ class SupportTabsAdapter @JvmOverloads constructor(
     }
 
     override fun getPageWidth(position: Int): Float {
-        return 1.0f / columns
+        return pageWidth
     }
 
     override fun getItem(position: Int): Fragment {
@@ -153,4 +152,6 @@ class SupportTabsAdapter @JvmOverloads constructor(
 
         private val EXTRA_ADAPTER_POSITION = "adapter_position"
     }
+
+    var pageWidth: Float = 1f
 }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ContentCardClickListener.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ContentCardClickListener.kt
index 0017de5fd..fa142141f 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ContentCardClickListener.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/ContentCardClickListener.kt
@@ -26,7 +26,7 @@ import android.view.View
  * Created by mariotaku on 14/12/3.
  */
 interface ContentCardClickListener {
-    fun onItemActionClick(holder: ViewHolder, id: Int, position: Int)
+    fun onItemActionClick(holder: ViewHolder, id: Int, position: Int) {}
 
-    fun onItemMenuClick(holder: ViewHolder, menuView: View, position: Int)
+    fun onItemMenuClick(holder: ViewHolder, menuView: View, position: Int) {}
 }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/IGapSupportedAdapter.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/IGapSupportedAdapter.kt
index b6be59a30..2c885d003 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/IGapSupportedAdapter.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/adapter/iface/IGapSupportedAdapter.kt
@@ -37,13 +37,12 @@ interface IGapSupportedAdapter {
 
     interface GapClickListener {
 
-        fun onGapClick(holder: GapViewHolder, position: Int)
+        fun onGapClick(holder: GapViewHolder, position: Int) {}
 
     }
 
     companion object {
-
-        val ITEM_VIEW_TYPE_GAP = 1
+        const val ITEM_VIEW_TYPE_GAP = 1
     }
 
 
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt
index f496a7cf8..fa4fab3dc 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/ParcelableStatusExtensions.kt
@@ -6,4 +6,5 @@ import org.mariotaku.twidere.model.ParcelableStatus
  * Created by mariotaku on 2017/1/7.
  */
 val ParcelableStatus.media_type: Int
-    get() = media?.firstOrNull()?.type ?: 0
\ No newline at end of file
+    get() = media?.firstOrNull()?.type ?: 0
+
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt
index 84abc7884..9c3ce2431 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsActivitiesFragment.kt
@@ -358,6 +358,11 @@ abstract class AbsActivitiesFragment protected constructor() :
         IntentUtils.openStatus(context, status, null)
     }
 
+    override fun onQuotedStatusClick(holder: IStatusViewHolder, position: Int) {
+        val status = getActivityStatus(position) ?: return
+        IntentUtils.openStatus(context, status.account_key, status.quoted_id)
+    }
+
     private fun getActivityStatus(position: Int): ParcelableStatus? {
         return adapter.getActivity(position)?.getActivityStatus()
     }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
index 487ff4da8..08f5502f3 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsStatusesFragment.kt
@@ -399,7 +399,13 @@ abstract class AbsStatusesFragment protected constructor() :
     }
 
     override fun onStatusClick(holder: IStatusViewHolder, position: Int) {
-        IntentUtils.openStatus(activity, adapter.getStatus(position)!!, null)
+        val status = adapter.getStatus(position) ?: return
+        IntentUtils.openStatus(activity, status, null)
+    }
+
+    override fun onQuotedStatusClick(holder: IStatusViewHolder, position: Int) {
+        val status = adapter.getStatus(position) ?: return
+        IntentUtils.openStatus(activity, status.account_key, status.quoted_id)
     }
 
     override fun onStatusLongClick(holder: IStatusViewHolder, position: Int): Boolean {
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt
index 1e8612881..85885ad27 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/AbsToolbarTabPagesFragment.kt
@@ -45,7 +45,7 @@ abstract class AbsToolbarTabPagesFragment : BaseFragment(), RefreshScrollTopInte
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         val activity = activity
-        pagerAdapter = SupportTabsAdapter(activity, childFragmentManager, null, 1)
+        pagerAdapter = SupportTabsAdapter(activity, childFragmentManager, null)
         viewPager.adapter = pagerAdapter
         viewPager.offscreenPageLimit = 2
         viewPager.addOnPageChangeListener(this)
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt
index 911c9e215..42d59d40c 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ItemsListFragment.kt
@@ -46,12 +46,17 @@ class ItemsListFragment : AbsContentListRecyclerViewFragment<VariousItemsAdapter
     override fun onCreateAdapter(context: Context): VariousItemsAdapter {
         val adapter = VariousItemsAdapter(context)
         val dummyItemAdapter = adapter.dummyAdapter
-        dummyItemAdapter.statusClickListener = object : IStatusViewHolder.SimpleStatusClickListener() {
+        dummyItemAdapter.statusClickListener = object : IStatusViewHolder.StatusClickListener {
             override fun onStatusClick(holder: IStatusViewHolder, position: Int) {
                 val status = dummyItemAdapter.getStatus(position) ?: return
                 IntentUtils.openStatus(getContext(), status, null)
             }
 
+            override fun onQuotedStatusClick(holder: IStatusViewHolder, position: Int) {
+                val status = dummyItemAdapter.getStatus(position) ?: return
+                IntentUtils.openStatus(getContext(), status.account_key, status.quoted_id)
+            }
+
             override fun onItemActionClick(holder: RecyclerView.ViewHolder, id: Int, position: Int) {
                 val status = dummyItemAdapter.getStatus(position) ?: return
                 AbsStatusesFragment.handleStatusActionClick(context, fragmentManager,
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt
index 5465d251b..af1d035e9 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/StatusFragment.kt
@@ -303,7 +303,6 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
 
     }
 
-
     override fun onItemActionClick(holder: ViewHolder, id: Int, position: Int) {
         val status = adapter.getStatus(position)
         AbsStatusesFragment.handleStatusActionClick(context, fragmentManager, twitterWrapper,
@@ -311,7 +310,13 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
     }
 
     override fun onStatusClick(holder: IStatusViewHolder, position: Int) {
-        IntentUtils.openStatus(activity, adapter.getStatus(position)!!, null)
+        val status = adapter.getStatus(position) ?: return
+        IntentUtils.openStatus(activity, status.account_key, status.quoted_id)
+    }
+
+    override fun onQuotedStatusClick(holder: IStatusViewHolder, position: Int) {
+        val status = adapter.getStatus(position) ?: return
+        IntentUtils.openStatus(activity, status.account_key, status.quoted_id)
     }
 
     override fun onStatusLongClick(holder: IStatusViewHolder, position: Int): Boolean {
@@ -2056,29 +2061,33 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
 
     }
 
-    class StatusActivitySummaryLoader(context: Context, private val mAccountKey: UserKey, private val mStatusId: String) : AsyncTaskLoader<StatusActivity>(context) {
+    class StatusActivitySummaryLoader(
+            context: Context,
+            private val accountKey: UserKey,
+            private val statusId: String
+    ) : AsyncTaskLoader<StatusActivity>(context) {
 
         override fun loadInBackground(): StatusActivity? {
             val context = context
-            val details = AccountUtils.getAccountDetails(AccountManager.get(context), mAccountKey, true) ?: return null
+            val details = AccountUtils.getAccountDetails(AccountManager.get(context), accountKey, true) ?: return null
             if (AccountType.TWITTER != details.type) {
                 return null
             }
-            val twitter = MicroBlogAPIFactory.getInstance(context, mAccountKey) ?: return null
+            val twitter = MicroBlogAPIFactory.getInstance(context, accountKey) ?: return null
             val paging = Paging()
             paging.setCount(10)
-            val activitySummary = StatusActivity(mStatusId, emptyList())
+            val activitySummary = StatusActivity(statusId, emptyList())
             val retweeters = ArrayList<ParcelableUser>()
             try {
-                for (status in twitter.getRetweets(mStatusId, paging)) {
-                    val user = ParcelableUserUtils.fromUser(status.user, mAccountKey)
+                for (status in twitter.getRetweets(statusId, paging)) {
+                    val user = ParcelableUserUtils.fromUser(status.user, accountKey)
                     if (!DataStoreUtils.isFilteringUser(context, user.key.toString())) {
                         retweeters.add(user)
                     }
                 }
                 activitySummary.retweeters = retweeters
                 val countValues = ContentValues()
-                val status = twitter.showStatus(mStatusId)
+                val status = twitter.showStatus(statusId)
                 activitySummary.favoriteCount = status.favoriteCount
                 activitySummary.retweetCount = status.retweetCount
                 activitySummary.replyCount = status.replyCount
@@ -2093,7 +2102,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
                         Expression.or(
                                 Expression.equalsArgs(Statuses.STATUS_ID),
                                 Expression.equalsArgs(Statuses.RETWEET_ID)))
-                val statusWhereArgs = arrayOf(mAccountKey.toString(), mStatusId, mStatusId)
+                val statusWhereArgs = arrayOf(accountKey.toString(), statusId, statusId)
                 cr.update(Statuses.CONTENT_URI, countValues, statusWhere.sql, statusWhereArgs)
                 val activityWhere = Expression.and(
                         Expression.equalsArgs(Activities.ACCOUNT_KEY),
@@ -2102,7 +2111,7 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
                                 Expression.equalsArgs(Activities.STATUS_RETWEET_ID)))
 
                 val pStatus = ParcelableStatusUtils.fromStatus(status,
-                        mAccountKey, false)
+                        accountKey, false)
                 cr.insert(CachedStatuses.CONTENT_URI, ParcelableStatusValuesCreator.create(pStatus))
 
                 val activityCursor = cr.query(Activities.AboutMe.CONTENT_URI,
@@ -2145,7 +2154,6 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
             var retweetCount: Long = 0
     ) {
 
-
         fun isStatus(status: ParcelableStatus): Boolean {
             return TextUtils.equals(statusId, if (status.is_retweet) status.retweet_id else status.id)
         }
@@ -2153,13 +2161,18 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
 
     data class ReadPosition(var statusId: Long, var offsetTop: Int)
 
-    private class StatusDividerItemDecoration(context: Context, private val statusAdapter: StatusAdapter, orientation: Int) : DividerItemDecoration(context, orientation) {
+    private class StatusDividerItemDecoration(
+            context: Context,
+            private val statusAdapter: StatusAdapter,
+            orientation: Int
+    ) : DividerItemDecoration(context, orientation) {
 
         override fun isDividerEnabled(childPos: Int): Boolean {
             if (childPos >= statusAdapter.itemCount || childPos < 0) return false
             val itemType = statusAdapter.getItemType(childPos)
             when (itemType) {
-                StatusAdapter.ITEM_IDX_REPLY_LOAD_MORE, StatusAdapter.ITEM_IDX_REPLY_ERROR, StatusAdapter.ITEM_IDX_SPACE -> return false
+                StatusAdapter.ITEM_IDX_REPLY_LOAD_MORE, StatusAdapter.ITEM_IDX_REPLY_ERROR,
+                StatusAdapter.ITEM_IDX_SPACE -> return false
             }
             return true
         }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
index 5eeb478be..d92765bb8 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserFragment.kt
@@ -315,7 +315,7 @@ class UserFragment : BaseFragment(), OnClickListener, OnLinkClickListener,
         followContainer.follow.compoundDrawablePadding = Math.round(followContainer.follow.textSize * 0.25f)
         followingYouIndicator.visibility = if (userRelationship.followed_by) View.VISIBLE else View.GONE
 
-        val resolver = context.contentResolver
+        val resolver = context.applicationContext.contentResolver
         task {
             resolver.insert(CachedUsers.CONTENT_URI, ParcelableUserValuesCreator.create(user))
             resolver.insert(CachedRelationships.CONTENT_URI, ParcelableRelationshipValuesCreator.create(userRelationship))
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserMediaTimelineFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserMediaTimelineFragment.kt
index c7b333336..e56b3dfc5 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserMediaTimelineFragment.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/UserMediaTimelineFragment.kt
@@ -137,7 +137,13 @@ class UserMediaTimelineFragment : AbsContentRecyclerViewFragment<StaggeredGridPa
     }
 
     override fun onStatusClick(holder: IStatusViewHolder, position: Int) {
-        IntentUtils.openStatus(context, adapter.getStatus(position)!!, null)
+        val status = adapter.getStatus(position) ?: return
+        IntentUtils.openStatus(context, status, null)
+    }
+
+    override fun onQuotedStatusClick(holder: IStatusViewHolder, position: Int) {
+        val status = adapter.getStatus(position) ?: return
+        IntentUtils.openStatus(context, status.account_key, status.quoted_id)
     }
 
     override fun onStatusLongClick(holder: IStatusViewHolder, position: Int): Boolean {
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/analyzer/PurchaseFinished.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/analyzer/PurchaseFinished.kt
index 88de63cb8..3275735fd 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/analyzer/PurchaseFinished.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/analyzer/PurchaseFinished.kt
@@ -1,7 +1,8 @@
 package org.mariotaku.twidere.model.analyzer
 
 import android.content.Intent
-import org.mariotaku.twidere.activity.premium.AbsExtraFeaturePurchaseActivity
+import org.mariotaku.twidere.activity.premium.AbsExtraFeaturePurchaseActivity.Companion.EXTRA_PURCHASE_RESULT
+import org.mariotaku.twidere.model.premium.PurchaseResult
 import org.mariotaku.twidere.util.Analyzer
 
 /**
@@ -18,8 +19,7 @@ data class PurchaseFinished(val productName: String) : Analyzer.Event {
         const val NAME_EXTRA_FEATURES = "Enhanced Features"
 
         fun create(data: Intent): PurchaseFinished {
-            val purchaseResult: AbsExtraFeaturePurchaseActivity.PurchaseResult
-                    = data.getParcelableExtra(AbsExtraFeaturePurchaseActivity.EXTRA_PURCHASE_RESULT)
+            val purchaseResult: PurchaseResult = data.getParcelableExtra(EXTRA_PURCHASE_RESULT)
             val result = PurchaseFinished(purchaseResult.feature)
             result.price = purchaseResult.price
             result.currency = purchaseResult.currency
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/BooleanExtraConfiguration.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/BooleanExtraConfiguration.kt
index c9f067400..5a0d6cb52 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/BooleanExtraConfiguration.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/model/tab/conf/BooleanExtraConfiguration.kt
@@ -15,7 +15,11 @@ import org.mariotaku.twidere.model.tab.TabConfiguration
 /**
  * Created by mariotaku on 2016/12/5.
  */
-open class BooleanExtraConfiguration(key: String, val defaultValue: BooleanHolder) : TabConfiguration.ExtraConfiguration(key) {
+open class BooleanExtraConfiguration(
+        key: String,
+        val defaultValue: BooleanHolder
+) : TabConfiguration.ExtraConfiguration(key) {
+
     open var value: Boolean
         get() = checkBox.isChecked
         set(value) {
@@ -33,8 +37,17 @@ open class BooleanExtraConfiguration(key: String, val defaultValue: BooleanHolde
     override fun onViewCreated(context: Context, view: View, fragment: CustomTabsFragment.TabEditorDialogFragment) {
         super.onViewCreated(context, view, fragment)
         val titleView = view.findViewById(android.R.id.title) as TextView
+        val summaryView = view.findViewById(android.R.id.summary) as TextView
         titleView.text = title.createString(context)
 
+        val summary = this.summary
+        if (summary != null) {
+            summaryView.visibility = View.VISIBLE
+            summaryView.text = summary.createString(context)
+        } else {
+            summaryView.visibility = View.GONE
+        }
+
         checkBox = view.findViewById(android.R.id.checkbox) as CheckBox
         checkBox.visibility = View.VISIBLE
         checkBox.isChecked = defaultValue.createBoolean(context)
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt
index d58d284dd..ef03eb77d 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/StatusViewHolder.kt
@@ -444,6 +444,8 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View)
         favoriteButton.setOnClickListener(eventListener)
 
         mediaLabel.setOnClickListener(eventListener)
+
+        quotedView.setOnClickListener(eventListener)
     }
 
 
@@ -577,6 +579,9 @@ class StatusViewHolder(private val adapter: IStatusesAdapter<*>, itemView: View)
                 holder.itemContent -> {
                     listener.onStatusClick(holder, position)
                 }
+                holder.quotedView -> {
+                    listener.onQuotedStatusClick(holder, position)
+                }
                 holder.itemMenu -> {
                     listener.onItemMenuClick(holder, v, position)
                 }
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/iface/IStatusViewHolder.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/iface/IStatusViewHolder.kt
index 6c4228c17..a6e8c304f 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/iface/IStatusViewHolder.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/holder/iface/IStatusViewHolder.kt
@@ -19,10 +19,8 @@
 
 package org.mariotaku.twidere.view.holder.iface
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
-
 import org.mariotaku.twidere.adapter.iface.ContentCardClickListener
 import org.mariotaku.twidere.adapter.iface.IGapSupportedAdapter
 import org.mariotaku.twidere.graphic.like.LikeAnimationDrawable
@@ -30,7 +28,6 @@ import org.mariotaku.twidere.model.ParcelableMedia
 import org.mariotaku.twidere.model.ParcelableStatus
 import org.mariotaku.twidere.model.UserKey
 import org.mariotaku.twidere.view.CardMediaContainer
-import org.mariotaku.twidere.view.holder.GapViewHolder
 
 /**
  * Created by mariotaku on 15/10/26.
@@ -55,42 +52,15 @@ interface IStatusViewHolder : CardMediaContainer.OnMediaClickListener {
 
     interface StatusClickListener : ContentCardClickListener, IGapSupportedAdapter.GapClickListener {
 
-        fun onMediaClick(holder: IStatusViewHolder, view: View, media: ParcelableMedia, statusPosition: Int)
+        fun onMediaClick(holder: IStatusViewHolder, view: View, media: ParcelableMedia, statusPosition: Int) {}
 
-        fun onStatusClick(holder: IStatusViewHolder, position: Int)
+        fun onStatusClick(holder: IStatusViewHolder, position: Int) {}
 
-        fun onStatusLongClick(holder: IStatusViewHolder, position: Int): Boolean
+        fun onQuotedStatusClick(holder: IStatusViewHolder, position: Int) {}
 
-        fun onUserProfileClick(holder: IStatusViewHolder, position: Int)
+        fun onStatusLongClick(holder: IStatusViewHolder, position: Int): Boolean = false
+
+        fun onUserProfileClick(holder: IStatusViewHolder, position: Int) {}
     }
 
-    abstract class SimpleStatusClickListener : StatusClickListener {
-        override fun onMediaClick(holder: IStatusViewHolder, view: View, media: ParcelableMedia, statusPosition: Int) {
-
-        }
-
-        override fun onStatusClick(holder: IStatusViewHolder, position: Int) {
-
-        }
-
-        override fun onStatusLongClick(holder: IStatusViewHolder, position: Int): Boolean {
-            return false
-        }
-
-        override fun onGapClick(holder: GapViewHolder, position: Int) {
-
-        }
-
-        override fun onUserProfileClick(holder: IStatusViewHolder, position: Int) {
-
-        }
-
-        override fun onItemActionClick(holder: RecyclerView.ViewHolder, id: Int, position: Int) {
-
-        }
-
-        override fun onItemMenuClick(holder: RecyclerView.ViewHolder, menuView: View, position: Int) {
-
-        }
-    }
 }
diff --git a/twidere/src/main/res/layout-w600dp/activity_link_handler.xml b/twidere/src/main/res/layout-w600dp/activity_link_handler.xml
new file mode 100644
index 000000000..4fde6b528
--- /dev/null
+++ b/twidere/src/main/res/layout-w600dp/activity_link_handler.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?actionBarSize"
+        android:layout_alignParentTop="true"
+        android:background="?colorToolbar"
+        android:elevation="@dimen/toolbar_elevation"
+        android:tag="ate_ignore"
+        app:popupTheme="?actionBarPopupTheme"
+        tools:elevation="0dp"/>
+
+    <FrameLayout
+        android:id="@+id/contentFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/toolbar"/>
+
+    <View
+        android:id="@+id/windowOverlay"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/toolbar"
+        android:background="?android:windowContentOverlay"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/twidere/src/main/res/layout/activity_link_handler.xml b/twidere/src/main/res/layout/activity_link_handler.xml
new file mode 100644
index 000000000..9c5ee07d4
--- /dev/null
+++ b/twidere/src/main/res/layout/activity_link_handler.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/contentFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/twidere/src/main/res/layout/layout_extra_config_checkbox.xml b/twidere/src/main/res/layout/layout_extra_config_checkbox.xml
index a1fe50a6d..fdf6e197e 100644
--- a/twidere/src/main/res/layout/layout_extra_config_checkbox.xml
+++ b/twidere/src/main/res/layout/layout_extra_config_checkbox.xml
@@ -30,17 +30,35 @@
     android:orientation="horizontal"
     tools:ignore="Overdraw">
 
-    <TextView
-        android:id="@android:id/title"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_marginStart="8dp"
         android:layout_weight="1"
         android:gravity="center_vertical"
-        android:maxLines="1"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:textColorPrimary"/>
+        android:minHeight="48dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:maxLines="1"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:textColorPrimary"
+            tools:text="Title"/>
+
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:textColorSecondary"
+            tools:text="This is summary text"/>
+    </LinearLayout>
 
     <CheckBox
         android:id="@android:id/checkbox"
@@ -53,6 +71,7 @@
         android:layout_weight="0"
         android:clickable="false"
         android:focusable="false"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        tools:visibility="visible"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/twidere/src/main/res/layout/list_item_status.xml b/twidere/src/main/res/layout/list_item_status.xml
index d5040bd3f..63778733e 100644
--- a/twidere/src/main/res/layout/list_item_status.xml
+++ b/twidere/src/main/res/layout/list_item_status.xml
@@ -223,6 +223,8 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/mediaPreview"
             android:layout_marginTop="@dimen/element_spacing_small"
+            android:background="?selectableItemBackground"
+            android:clickable="true"
             android:paddingBottom="@dimen/element_spacing_small"
             android:paddingEnd="@dimen/element_spacing_small"
             android:paddingLeft="@dimen/element_spacing_normal"
diff --git a/twidere/src/main/res/values-land/bools.xml b/twidere/src/main/res/values-land/bools.xml
index 71902be94..7027f7a8c 100644
--- a/twidere/src/main/res/values-land/bools.xml
+++ b/twidere/src/main/res/values-land/bools.xml
@@ -2,6 +2,5 @@
 <resources>
 
     <bool name="default_display_tab_label">true</bool>
-    <bool name="home_display_icon">true</bool>
 
 </resources>
\ No newline at end of file
diff --git a/twidere/src/main/res/values-notnight/themes_daynight.xml b/twidere/src/main/res/values-notnight/themes_daynight.xml
index d7cdaeb84..938c5580a 100644
--- a/twidere/src/main/res/values-notnight/themes_daynight.xml
+++ b/twidere/src/main/res/values-notnight/themes_daynight.xml
@@ -5,7 +5,7 @@
 
     <style name="Theme.Twidere.Dialog.DayNight" parent="Theme.Twidere.Light.Dialog"/>
 
-    <style name="Theme.Twidere.DialogWhenLarge.NoActionBar.DayNight" parent="Theme.Twidere.Light.DialogWhenLarge.NoActionBar"/>
+    <style name="Theme.Twidere.Content.DayNight" parent="Theme.Twidere.Light.Content"/>
 
     <style name="Theme.Twidere.NoActionBar.DayNight" parent="Theme.Twidere.Light.NoActionBar"/>
 
diff --git a/twidere/src/main/res/values-sw600dp/dimens.xml b/twidere/src/main/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 8e6ce6475..000000000
--- a/twidere/src/main/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="settings_panel_margin_start_details">@dimen/settings_panel_width_entries</dimen>
-</resources>
\ No newline at end of file
diff --git a/twidere/src/main/res/values-v21/styles_base.xml b/twidere/src/main/res/values-v21/styles_base.xml
index 36fe5e15a..bafdd6bc1 100644
--- a/twidere/src/main/res/values-v21/styles_base.xml
+++ b/twidere/src/main/res/values-v21/styles_base.xml
@@ -19,8 +19,8 @@
 
 <resources>
 
-    <style name="Widget.Base.TextView.Light" parent="android:Widget.Material.TextView" />
+    <style name="Widget.Base.TextView.Light" parent="android:Widget.Material.TextView"/>
 
-    <style name="Widget.Base.TextView.Dark" parent="android:Widget.Material.Light.TextView" />
+    <style name="Widget.Base.TextView.Dark" parent="android:Widget.Material.Light.TextView"/>
 
 </resources>
\ No newline at end of file
diff --git a/twidere/src/main/res/values-sw600dp/bools.xml b/twidere/src/main/res/values-w600dp/bools.xml
similarity index 50%
rename from twidere/src/main/res/values-sw600dp/bools.xml
rename to twidere/src/main/res/values-w600dp/bools.xml
index 71902be94..835b687e7 100644
--- a/twidere/src/main/res/values-sw600dp/bools.xml
+++ b/twidere/src/main/res/values-w600dp/bools.xml
@@ -2,6 +2,8 @@
 <resources>
 
     <bool name="default_display_tab_label">true</bool>
-    <bool name="home_display_icon">true</bool>
+
+    <!-- Config for home screen -->
+    <bool name="home_tab_has_multiple_columns">true</bool>
 
 </resources>
\ No newline at end of file
diff --git a/twidere/src/main/res/values-w600dp/themes_base.xml b/twidere/src/main/res/values-w600dp/themes_base.xml
new file mode 100644
index 000000000..7b1bae906
--- /dev/null
+++ b/twidere/src/main/res/values-w600dp/themes_base.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="Theme.Twidere.Dark.Content" parent="Theme.Twidere.Dark.Dialog">
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowNoTitle">true</item>
+
+        <item name="android:listDivider" tools:ignore="PrivateResource">
+            @drawable/abc_list_divider_mtrl_alpha
+        </item>
+        <item name="dividerVertical">?android:listDivider</item>
+        <item name="dividerHorizontal">?android:listDivider</item>
+    </style>
+
+    <style name="Theme.Twidere.Light.Content" parent="Theme.Twidere.Light.Dialog">
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowNoTitle">true</item>
+
+        <item name="android:listDivider" tools:ignore="PrivateResource">
+            @drawable/abc_list_divider_mtrl_alpha
+        </item>
+        <item name="dividerVertical">?android:listDivider</item>
+        <item name="dividerHorizontal">?android:listDivider</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/twidere/src/main/res/values-w820dp/dimens.xml b/twidere/src/main/res/values-w820dp/dimens.xml
index 58e25d3c7..0cc34c2eb 100644
--- a/twidere/src/main/res/values-w820dp/dimens.xml
+++ b/twidere/src/main/res/values-w820dp/dimens.xml
@@ -22,4 +22,5 @@
          (such as screen margins) for screens with more than 820dp of available width. This
          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
     <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="settings_panel_margin_start_details">@dimen/settings_panel_width_entries</dimen>
 </resources>
diff --git a/twidere/src/main/res/values/bools.xml b/twidere/src/main/res/values/bools.xml
index 437dda85e..26cfa20fb 100644
--- a/twidere/src/main/res/values/bools.xml
+++ b/twidere/src/main/res/values/bools.xml
@@ -3,7 +3,9 @@
 
     <bool name="default_display_tab_label">false</bool>
     <bool name="support_new_document_intent">false</bool>
-    <bool name="home_display_icon">false</bool>
     <bool name="has_font_family">false</bool>
 
+    <!-- Config for home screen -->
+    <bool name="home_tab_has_multiple_columns">false</bool>
+
 </resources>
\ No newline at end of file
diff --git a/twidere/src/main/res/values/dimens.xml b/twidere/src/main/res/values/dimens.xml
index 3ccbce39a..184bb8c11 100644
--- a/twidere/src/main/res/values/dimens.xml
+++ b/twidere/src/main/res/values/dimens.xml
@@ -10,6 +10,8 @@
 
     <dimen name="button_size_content_card">42dp</dimen>
     <dimen name="button_size_content_card_action">36dp</dimen>
+
+    <!-- Element spacings (padding, margin) -->
     <dimen name="element_spacing_xsmall">2dp</dimen>
     <dimen name="element_spacing_small">4dp</dimen>
     <dimen name="element_spacing_msmall">6dp</dimen>
@@ -24,6 +26,10 @@
     <dimen name="element_spacing_minus_mlarge">-12dp</dimen>
     <dimen name="element_spacing_minus_large">-16dp</dimen>
     <dimen name="element_spacing_minus_xlarge">-24dp</dimen>
+
+    <!-- Preferred size -->
+    <dimen name="preferred_tab_column_width">420dp</dimen>
+
     <dimen name="icon_size_list_item">56dp</dimen>
     <dimen name="icon_size_list_item_small">42dp</dimen>
     <dimen name="icon_size_card_list_item">48dp</dimen>
diff --git a/twidere/src/main/res/values/dimens_system.xml b/twidere/src/main/res/values/dimens_system.xml
new file mode 100644
index 000000000..93b4e411d
--- /dev/null
+++ b/twidere/src/main/res/values/dimens_system.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- The platform's desired fixed width for a dialog along the major axis
+         (the screen is in landscape). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_width_major">100%</item>
+    <!-- The platform's desired fixed width for a dialog along the minor axis
+         (the screen is in portrait). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_width_minor">100%</item>
+    <!-- The platform's desired fixed height for a dialog along the major axis
+         (the screen is in portrait). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_height_major">80%</item>
+    <!-- The platform's desired fixed height for a dialog along the minor axis
+         (the screen is in landscape). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_height_minor">100%</item>
+</resources>
\ No newline at end of file
diff --git a/twidere/src/main/res/values/strings.xml b/twidere/src/main/res/values/strings.xml
index 19656a528..6ca1aec31 100644
--- a/twidere/src/main/res/values/strings.xml
+++ b/twidere/src/main/res/values/strings.xml
@@ -903,4 +903,5 @@
     <string name="title_filters_subscription_invalid">Invalid subscription</string>
     <string name="title_filters_subscription_url">URL</string>
     <string name="label_filters_subscription">Subscription</string>
+    <string name="summary_interactions_not_available">Only available with official keys</string>
 </resources>
\ No newline at end of file
diff --git a/twidere/src/main/res/values/themes.xml b/twidere/src/main/res/values/themes.xml
index a21404714..dcd7e33f5 100644
--- a/twidere/src/main/res/values/themes.xml
+++ b/twidere/src/main/res/values/themes.xml
@@ -11,10 +11,9 @@
         <item name="lightThemeResource">@style/Theme.Twidere.Light.Dialog</item>
     </style>
 
-    <style name="Theme.Twidere.DialogWhenLarge.NoActionBar" parent="Theme.Twidere.DialogWhenLarge.NoActionBar.DayNight">
-        <item name="darkThemeResource">@style/Theme.Twidere.Dark.DialogWhenLarge.NoActionBar</item>
-        <item name="lightThemeResource">@style/Theme.Twidere.Light.DialogWhenLarge.NoActionBar
-        </item>
+    <style name="Theme.Twidere.Content" parent="Theme.Twidere.Content.DayNight">
+        <item name="darkThemeResource">@style/Theme.Twidere.Dark.Content</item>
+        <item name="lightThemeResource">@style/Theme.Twidere.Light.Content</item>
     </style>
 
     <style name="Theme.Twidere.NoActionBar" parent="Theme.Twidere.NoActionBar.DayNight">
diff --git a/twidere/src/main/res/values/themes_base.xml b/twidere/src/main/res/values/themes_base.xml
index 3608ca965..21f72453d 100644
--- a/twidere/src/main/res/values/themes_base.xml
+++ b/twidere/src/main/res/values/themes_base.xml
@@ -18,6 +18,7 @@
   -->
 
 <resources>
+    <style name="Animation.Base.Dialog" parent="android:Animation.Dialog"/>
 
     <style name="Theme.AppCompat.TranslucentDecor"/>
 
diff --git a/twidere/src/main/res/values/themes_base_dark.xml b/twidere/src/main/res/values/themes_base_dark.xml
index d98c2ccbe..0de14c019 100644
--- a/twidere/src/main/res/values/themes_base_dark.xml
+++ b/twidere/src/main/res/values/themes_base_dark.xml
@@ -44,33 +44,7 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
-    <style name="Theme.Twidere.Dark.DialogWhenLarge.NoActionBar" parent="Theme.AppCompat.DialogWhenLarge">
-
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowActionModeOverlay">false</item>
-
-        <!-- Widget styles -->
-        <item name="android:listSeparatorTextViewStyle">@style/Widget.Dark.TextView.ListSeparator
-        </item>
-
-        <!-- Card UI styles -->
-        <item name="cardActionButtonStyle">@style/Widget.CardActionButton</item>
-        <item name="profileImageStyle">@style/Widget.ProfileImage</item>
-        <item name="profileImageStyleLarge">@style/Widget.ProfileImage.Large</item>
-        <item name="cardItemBackgroundColor">@color/background_color_card_item_dark</item>
-
-        <!-- Twidere specific styles -->
-        <item name="menuIconColor">@color/action_icon_light</item>
-        <item name="messageBubbleColor">@color/message_bubble_color_dark</item>
-        <item name="quoteIndicatorBackgroundColor">@color/quote_indicator_background_dark</item>
-
-        <item name="colorToolbar">@color/background_color_action_bar_dark</item>
-        <item name="isToolbarColored">false</item>
-
-        <item name="actionBarTheme">@null</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-    </style>
+    <style name="Theme.Twidere.Dark.Content" parent="Theme.Twidere.Dark"/>
 
     <style name="Theme.Twidere.Dark.Dialog" parent="Theme.AppCompat.Dialog">
 
diff --git a/twidere/src/main/res/values/themes_base_light.xml b/twidere/src/main/res/values/themes_base_light.xml
index ecb8bb551..c35e3d2a1 100644
--- a/twidere/src/main/res/values/themes_base_light.xml
+++ b/twidere/src/main/res/values/themes_base_light.xml
@@ -48,34 +48,7 @@
         <item name="actionBarTheme">@style/Theme.Twidere.Dark.ActionBar</item>
     </style>
 
-    <style name="Theme.Twidere.Light.DialogWhenLarge.NoActionBar" parent="Theme.AppCompat.Light.DialogWhenLarge">
-
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowActionModeOverlay">false</item>
-
-        <!-- Widget styles -->
-        <item name="android:listSeparatorTextViewStyle">@style/Widget.Light.TextView.ListSeparator
-        </item>
-
-        <!-- Card UI styles -->
-        <item name="cardActionButtonStyle">@style/Widget.Light.CardActionButton</item>
-        <item name="profileImageStyle">@style/Widget.Light.ProfileImage</item>
-        <item name="profileImageStyleLarge">@style/Widget.Light.ProfileImage.Large</item>
-        <item name="cardItemBackgroundColor">@color/background_color_card_item_light</item>
-
-        <!-- Twidere specific styles -->
-        <item name="menuIconColor">@color/action_icon_dark</item>
-        <item name="messageBubbleColor">@color/message_bubble_color_light</item>
-        <item name="quoteIndicatorBackgroundColor">@color/quote_indicator_background_light</item>
-
-        <item name="colorToolbar">?colorPrimary</item>
-        <item name="isToolbarColored">true</item>
-
-        <item name="actionBarTheme">@null</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-    </style>
-
+    <style name="Theme.Twidere.Light.Content" parent="Theme.Twidere.Light"/>
 
     <style name="Theme.Twidere.Light.Dialog" parent="Theme.AppCompat.Light.Dialog">
 
diff --git a/twidere/src/main/res/values/themes_daynight.xml b/twidere/src/main/res/values/themes_daynight.xml
index f27726a9c..b6f1758bb 100644
--- a/twidere/src/main/res/values/themes_daynight.xml
+++ b/twidere/src/main/res/values/themes_daynight.xml
@@ -5,7 +5,7 @@
 
     <style name="Theme.Twidere.Dialog.DayNight" parent="Theme.Twidere.Dark.Dialog"/>
 
-    <style name="Theme.Twidere.DialogWhenLarge.NoActionBar.DayNight" parent="Theme.Twidere.Dark.DialogWhenLarge.NoActionBar"/>
+    <style name="Theme.Twidere.Content.DayNight" parent="Theme.Twidere.Dark.Content"/>
 
     <style name="Theme.Twidere.NoActionBar.DayNight" parent="Theme.Twidere.Dark.NoActionBar"/>