diff --git a/about/src/main/java/io/plaidapp/about/ui/AboutStyler.kt b/about/src/main/java/io/plaidapp/about/ui/AboutStyler.kt
index 7698d78c7..e848d7cee 100644
--- a/about/src/main/java/io/plaidapp/about/ui/AboutStyler.kt
+++ b/about/src/main/java/io/plaidapp/about/ui/AboutStyler.kt
@@ -36,7 +36,6 @@ class AboutStyler @Inject constructor(activity: AboutActivity) {
     @ColorInt
     val highlightColor = ColorUtils.getThemeColor(
         activity,
-        coreR.attr.colorPrimary,
-        coreR.color.primary
+        coreR.attr.colorPrimary
     )
 }
diff --git a/app/src/main/java/io/plaidapp/ui/HomeActivity.java b/app/src/main/java/io/plaidapp/ui/HomeActivity.java
index b91597c49..519ddf6a6 100644
--- a/app/src/main/java/io/plaidapp/ui/HomeActivity.java
+++ b/app/src/main/java/io/plaidapp/ui/HomeActivity.java
@@ -479,7 +479,7 @@ protected void fabClick() {
         if (viewModel.isDesignerNewsUserLoggedIn()) {
             Intent intent = ActivityHelper.intentTo(Activities.DesignerNews.PostStory.INSTANCE);
             FabTransform.addExtras(intent, ColorUtils.getThemeColor(
-                    this, R.attr.colorPrimary, -1), R.drawable.ic_add_dark);
+                    this, R.attr.colorPrimary), R.drawable.ic_add_dark);
             intent.putExtra(PostStoryService.EXTRA_BROADCAST_RESULT, true);
             registerPostStoryResultListener();
             ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(this, fab,
@@ -488,7 +488,7 @@ protected void fabClick() {
         } else {
             Intent intent = ActivityHelper.intentTo(Activities.DesignerNews.Login.INSTANCE);
             FabTransform.addExtras(intent, ColorUtils.getThemeColor(
-                    this, R.attr.colorPrimary, -1), R.drawable.ic_add_dark);
+                    this, R.attr.colorPrimary), R.drawable.ic_add_dark);
             ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(this, fab,
                     getString(R.string.transition_designer_news_login));
             startActivityForResult(intent, RC_NEW_DESIGNER_NEWS_LOGIN, options.toBundle());
diff --git a/app/src/main/res/animator/selected_comment.xml b/app/src/main/res/animator/selected_comment.xml
index b95c80a34..ad53dc901 100644
--- a/app/src/main/res/animator/selected_comment.xml
+++ b/app/src/main/res/animator/selected_comment.xml
@@ -23,8 +23,8 @@
 
             <objectAnimator
                 android:propertyName="backgroundColor"
-                android:valueFrom="@color/background_light"
-                android:valueTo="@color/selected_comment_background"
+                android:valueFrom="@color/color_surface"
+                android:valueTo="@color/color_highlighted_surface"
                 android:duration="@android:integer/config_shortAnimTime"
                 android:valueType="colorType" />
 
@@ -45,8 +45,8 @@
 
             <objectAnimator
                 android:propertyName="backgroundColor"
-                android:valueFrom="@color/selected_comment_background"
-                android:valueTo="@color/background_light"
+                android:valueFrom="@color/color_highlighted_surface"
+                android:valueTo="@color/color_surface"
                 android:duration="@android:integer/config_shortAnimTime"
                 android:valueType="colorType" />
 
diff --git a/app/src/main/res/drawable/comment_background.xml b/app/src/main/res/drawable/comment_background.xml
index 453cc4bc5..4de7acea0 100644
--- a/app/src/main/res/drawable/comment_background.xml
+++ b/app/src/main/res/drawable/comment_background.xml
@@ -21,7 +21,7 @@
     android:enterFadeDuration="@integer/comment_expand_collapse_duration"
     android:exitFadeDuration="@integer/comment_expand_collapse_duration">
 
-    <item android:state_activated="true" android:drawable="@color/selected_comment_background" />
-    <item android:drawable="@color/designer_news_story_comment_background" />
+    <item android:state_activated="true" android:drawable="@color/color_highlighted_surface" />
+    <item android:drawable="@color/color_surface" />
 
 </selector>
diff --git a/app/src/main/res/drawable/ic_no_comments.xml b/app/src/main/res/drawable/ic_no_comments.xml
index 2c714b127..929f8947c 100644
--- a/app/src/main/res/drawable/ic_no_comments.xml
+++ b/app/src/main/res/drawable/ic_no_comments.xml
@@ -20,7 +20,9 @@
     android:width="36dp"
     android:height="36dp"
     android:viewportWidth="48"
-    android:viewportHeight="48">
+    android:viewportHeight="48"
+    android:alpha="0.7"
+    android:tint="?attr/colorControlNormal">
 
     <path
         android:pathData="M40.3797458,8.85523799 C41.1769296,9.52771558 41.6811165,10.5373723 41.6811165,11.6666667 L41.6994499,44.6666667 L34.3661165,37.3333333 L11.9016504,37.3333333 L7.63388348,41.6011003 L4.86611652,38.8333333 L40.3661165,3.33333333 L43.1338835,6.10110029 L40.3797458,8.85523799 Z M19.2349838,30 L34.3661165,30 L34.3661165,26.3333333 L22.9016504,26.3333333 L19.2349838,30 Z M24.7349838,24.5 L34.3661165,24.5 L34.3661165,20.8333333 L28.4016504,20.8333333 L24.7349838,24.5 Z M30.2349838,19 L34.3661165,19 L34.3661165,15.3333333 L33.9016504,15.3333333 L30.2349838,19 Z M30.2994498,8 L8.69944986,8 C6.67361652,8 5.03278319,9.64083333 5.03278319,11.6666667 L5.03278319,33.2666666 L13.7994498,24.5 L12.3661165,24.5 L12.3661165,20.8333333 L17.4661164,20.8333333 L19.2994498,19 L12.3661165,19 L12.3661165,15.3333333 L22.9661164,15.3333333 L30.2994498,8 L30.2994498,8 Z"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 458956c88..1dfca9078 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -104,27 +104,26 @@
         <item name="lineHeightHint">28sp</item>
     </style>
 
-    <style name="TextAppearance.CommentAuthor" parent="@android:style/TextAppearance.Material.Caption">
+    <style name="TextAppearance.CommentAuthor" parent="@style/TextAppearance.MaterialComponents.Caption">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/original_poster_text_color</item>
         <item name="android:fontFeatureSettings">smcp, onum</item>
         <item name="android:letterSpacing">0.02</item>
     </style>
 
-    <!-- todo revert to material styles? -->
-    <style name="TextAppearance.Comment" parent="@android:style/TextAppearance.Material.Body1">
+    <style name="TextAppearance.Comment" parent="@style/TextAppearance.MaterialComponents.Body1">
         <item name="android:textSize">15sp</item>
-        <item name="android:textColor">@color/text_secondary_dark</item>
+        <item name="android:textColor">?android:textColorSecondary</item>
         <item name="lineHeightHint">24sp</item>
-        <!--<item name="android:letterSpacing">0.01</item>-->
     </style>
 
     <style name="TextAppearance.Comment.None">
         <item name="android:textColor">@color/grey_300</item>
     </style>
 
-    <style name="TextAppearance.CommentTimestamp" parent="@android:style/TextAppearance.Material.Caption">
-        <item name="android:textColor">@color/hint_disabled_dark</item>
+    <style name="TextAppearance.CommentTimestamp" parent="@style/TextAppearance.MaterialComponents.Caption">
+        <item name="android:textColor">?android:textColorTertiary</item>
         <item name="android:textSize">14sp</item>
         <item name="android:fontFeatureSettings">onum, smcp</item>
         <item name="android:letterSpacing">0.02</item>
diff --git a/build.gradle b/build.gradle
index 9100c37e0..7a911554c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,9 @@
 buildscript { scriptHandler ->
     apply from: 'repositories.gradle',
             to: scriptHandler
+    repositories {
+        google()
+    }
     ext.versions = [
             'compileSdk'         : 28,
             'minSdk'             : 23,
@@ -61,7 +64,7 @@ buildscript { scriptHandler ->
     ]
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0-beta05'
+        classpath 'com.android.tools.build:gradle:3.4.0-rc02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "com.google.gms:google-services:${versions.googleServices}"
         classpath "io.fabric.tools:gradle:${versions.fabric}"
diff --git a/core/src/main/java/io/plaidapp/core/ui/filter/FilterViewHolder.kt b/core/src/main/java/io/plaidapp/core/ui/filter/FilterViewHolder.kt
index 0d6889bc9..93144da6f 100644
--- a/core/src/main/java/io/plaidapp/core/ui/filter/FilterViewHolder.kt
+++ b/core/src/main/java/io/plaidapp/core/ui/filter/FilterViewHolder.kt
@@ -85,7 +85,7 @@ class FilterViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     }
 
     fun createHighlightAnimator(): Animator {
-        val highlightColor = ColorUtils.getThemeColor(itemView.context, R.attr.colorPrimary, -1)
+        val highlightColor = ColorUtils.getThemeColor(itemView.context, R.attr.colorPrimary)
         val fadeFromTo = ColorUtils.modifyAlpha(highlightColor, 0)
 
         return ObjectAnimator.ofArgb(
diff --git a/core/src/main/java/io/plaidapp/core/util/ColorUtils.java b/core/src/main/java/io/plaidapp/core/util/ColorUtils.java
index 26d06a150..7e06a0522 100644
--- a/core/src/main/java/io/plaidapp/core/util/ColorUtils.java
+++ b/core/src/main/java/io/plaidapp/core/util/ColorUtils.java
@@ -18,20 +18,19 @@
 package io.plaidapp.core.util;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import androidx.annotation.AttrRes;
 import androidx.annotation.CheckResult;
 import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
 import androidx.annotation.FloatRange;
 import androidx.annotation.IntDef;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.core.math.MathUtils;
 import androidx.palette.graphics.Palette;
-import android.util.TypedValue;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -41,7 +40,8 @@
  */
 public class ColorUtils {
 
-    private ColorUtils() { }
+    private ColorUtils() {
+    }
 
     public static final int IS_LIGHT = 0;
     public static final int IS_DARK = 1;
@@ -50,16 +50,20 @@ private ColorUtils() { }
     /**
      * Set the alpha component of {@code color} to be {@code alpha}.
      */
-    public static @CheckResult @ColorInt int modifyAlpha(@ColorInt int color,
-                                                         @IntRange(from = 0, to = 255) int alpha) {
+    public static @CheckResult
+    @ColorInt
+    int modifyAlpha(@ColorInt int color,
+                    @IntRange(from = 0, to = 255) int alpha) {
         return (color & 0x00ffffff) | (alpha << 24);
     }
 
     /**
      * Set the alpha component of {@code color} to be {@code alpha}.
      */
-    public static @CheckResult @ColorInt int modifyAlpha(@ColorInt int color,
-                                                      @FloatRange(from = 0f, to = 1f) float alpha) {
+    public static @CheckResult
+    @ColorInt
+    int modifyAlpha(@ColorInt int color,
+                    @FloatRange(from = 0f, to = 1f) float alpha) {
         return modifyAlpha(color, (int) (255f * alpha));
     }
 
@@ -69,13 +73,15 @@ private ColorUtils() { }
      * Annoyingly we have to return this Lightness 'enum' rather than a boolean as palette isn't
      * guaranteed to find the most populous color.
      */
-    public static @Lightness int isDark(Palette palette) {
+    public static @Lightness
+    int isDark(Palette palette) {
         Palette.Swatch mostPopulous = getMostPopulousSwatch(palette);
         if (mostPopulous == null) return LIGHTNESS_UNKNOWN;
         return isDark(mostPopulous.getRgb()) ? IS_DARK : IS_LIGHT;
     }
 
-    public static @Nullable Palette.Swatch getMostPopulousSwatch(Palette palette) {
+    public static @Nullable
+    Palette.Swatch getMostPopulousSwatch(Palette palette) {
         Palette.Swatch mostPopulous = null;
         if (palette != null) {
             for (Palette.Swatch swatch : palette.getSwatches()) {
@@ -123,14 +129,15 @@ public static boolean isDark(@ColorInt int color) {
      * Calculate a variant of the color to make it more suitable for overlaying information. Light
      * colors will be lightened and dark colors will be darkened
      *
-     * @param color the color to adjust
-     * @param isDark whether {@code color} is light or dark
+     * @param color               the color to adjust
+     * @param isDark              whether {@code color} is light or dark
      * @param lightnessMultiplier the amount to modify the color e.g. 0.1f will alter it by 10%
      * @return the adjusted color
      */
-    public static @ColorInt int scrimify(@ColorInt int color,
-                                        boolean isDark,
-                                        @FloatRange(from = 0f, to = 1f) float lightnessMultiplier) {
+    public static @ColorInt
+    int scrimify(@ColorInt int color,
+                 boolean isDark,
+                 @FloatRange(from = 0f, to = 1f) float lightnessMultiplier) {
         float[] hsl = new float[3];
         androidx.core.graphics.ColorUtils.colorToHSL(color, hsl);
 
@@ -140,32 +147,29 @@ public static boolean isDark(@ColorInt int color) {
             lightnessMultiplier = 1f - lightnessMultiplier;
         }
 
-        hsl[2] = MathUtils.clamp(hsl[2] * lightnessMultiplier,0f, 1f);
+        hsl[2] = MathUtils.clamp(hsl[2] * lightnessMultiplier, 0f, 1f);
         return androidx.core.graphics.ColorUtils.HSLToColor(hsl);
     }
 
-    public static @ColorInt int scrimify(@ColorInt int color,
-                                        @FloatRange(from = 0f, to = 1f) float lightnessMultiplier) {
+    public static @ColorInt
+    int scrimify(@ColorInt int color,
+                 @FloatRange(from = 0f, to = 1f) float lightnessMultiplier) {
         return scrimify(color, isDark(color), lightnessMultiplier);
     }
 
     /**
      * Queries the theme of the given {@code context} for a theme color.
      *
-     * @param context            the context holding the current theme.
-     * @param attrResId          the theme color attribute to resolve.
-     * @param fallbackColorResId a color resource id tto fallback to if the theme color cannot be
-     *                           resolved.
-     * @return the theme color or the fallback color.
+     * @param context   the context holding the current theme.
+     * @param attrResId the theme color attribute to resolve.
+     * @return the theme color
      */
     @ColorInt
-    public static int getThemeColor(@NonNull Context context, @AttrRes int attrResId,
-            @ColorRes int fallbackColorResId) {
-        final TypedValue tv = new TypedValue();
-        if (context.getTheme().resolveAttribute(attrResId, tv, true)) {
-            return tv.data;
-        }
-        return ContextCompat.getColor(context, fallbackColorResId);
+    public static int getThemeColor(@NonNull Context context, @AttrRes int attrResId) {
+        TypedArray a = context.obtainStyledAttributes(null, new int[]{attrResId});
+        final int color = a.getColor(0, Color.MAGENTA);
+        a.recycle();
+        return color;
     }
 
     @Retention(RetentionPolicy.SOURCE)
diff --git a/core/src/main/res/color/original_poster_text_color.xml b/core/src/main/res/color/original_poster_text_color.xml
new file mode 100644
index 000000000..fa56472ca
--- /dev/null
+++ b/core/src/main/res/color/original_poster_text_color.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2019 Google Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software distributed under the License
+  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+  or implied. See the License for the specific language governing permissions and limitations under
+  the License.
+  -->
+
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item app:state_original_poster="true" android:color="?attr/colorPrimary" />
+    <item android:color="?android:textColorPrimary" />
+
+</selector>
diff --git a/core/src/main/res/color/text_color_tertiary.xml b/core/src/main/res/color/text_color_tertiary.xml
new file mode 100644
index 000000000..bb4978b2d
--- /dev/null
+++ b/core/src/main/res/color/text_color_tertiary.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2019 Google Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software distributed under the License
+  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+  or implied. See the License for the specific language governing permissions and limitations under
+  the License.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="?attr/colorOnSurface"
+        android:alpha="0.38" />
+</selector>
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
index 35b130fc1..c23f91846 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/colors.xml
@@ -17,5 +17,7 @@
 
     <!-- app palette -->
     <color name="color_surface">@color/background_dark</color>
+    <color name="color_highlighted_surface">#ff404040</color>
+    <color name="color_background">#ff292929</color>
 
 </resources>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 5183382a1..14f208aa4 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -22,6 +22,8 @@
     <color name="primary">#69F0AE</color>
     <color name="primary_dark">#4aa87a</color>
     <color name="color_surface">@color/background_light</color>
+    <color name="color_highlighted_surface">#ffffff</color>
+    <color name="color_background">#e0e0e0</color>
 
     <!-- common colours -->
     <color name="text_primary_dark">#de000000</color> <!-- 87% -->
@@ -33,7 +35,6 @@
     <color name="ripple_light">#99ffffff</color>
     <color name="ripple_dark">@color/mid_grey</color>
     <color name="background_light">#fafafa</color> <!-- grey 50 -->
-    <color name="background_lightish">#e0e0e0</color> <!-- grey 300 -->
     <color name="background_card">#ffffff</color>
     <color name="background_dark">#ff333333</color>
     <color name="immersive_bars">#99000000</color>
@@ -56,7 +57,6 @@
     <color name="divider">#1f000000</color> <!-- 12% black -->
     <color name="page_indicator_dark">#80333333</color>
     <color name="page_indicator_dark_selected">#ff333333</color>
-    <color name="selected_comment_background">#ffffffff</color>
     <color name="error">#ffdd2c00</color>
     <color name="delete">#fff44336</color>
     <color name="shadow">#4c000000</color>
@@ -76,8 +76,6 @@
     <color name="designer_news_story_comment_background">@android:color/transparent</color>
 
     <color name="designer_news_super_dark">#000133</color>
-    <color name="designer_news_quote_line">#ffeceef1</color>
-    <color name="designer_news_quote">#73000000</color>
 
     <!-- product hunt-->
     <color name="product_hunt">#ffff9800</color>
@@ -87,4 +85,5 @@
         <item>#ff212121</item>
         <item>#ff232323</item>
     </array>
+
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index eb522193e..7f9c27e04 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -28,10 +28,11 @@
         <item name="colorError">@color/error</item>
         <item name="colorOnError">#ffffff</item>
         <item name="colorSurface">@color/color_surface</item>
-        <item name="android:colorBackground">@color/color_surface</item>
+        <item name="android:colorBackground">@color/color_background</item>
         <item name="android:navigationBarColor">@color/background_super_dark</item>
         <item name="android:statusBarColor">@color/background_super_dark</item>
         <item name="android:textColorHint">@color/hint_disabled_dark</item>
+        <item name="android:textColorTertiary">@color/text_color_tertiary</item>
         <item name="android:windowBackground">@color/background_light</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
diff --git a/designernews/src/main/java/io/plaidapp/designernews/dagger/Injector.kt b/designernews/src/main/java/io/plaidapp/designernews/dagger/Injector.kt
index 15517c842..5e367a513 100644
--- a/designernews/src/main/java/io/plaidapp/designernews/dagger/Injector.kt
+++ b/designernews/src/main/java/io/plaidapp/designernews/dagger/Injector.kt
@@ -20,8 +20,9 @@ package io.plaidapp.designernews.dagger
 
 import `in`.uncod.android.bypass.Bypass
 import android.util.TypedValue
-import androidx.core.content.ContextCompat
 import io.plaidapp.core.dagger.MarkdownModule
+import io.plaidapp.core.util.ColorUtils
+import io.plaidapp.designernews.R
 import io.plaidapp.designernews.ui.login.LoginActivity
 import io.plaidapp.designernews.ui.story.StoryActivity
 import io.plaidapp.ui.coreComponent
@@ -32,15 +33,16 @@ import io.plaidapp.ui.coreComponent
 fun inject(storyId: Long, activity: StoryActivity) {
 
     val bypassOptions = Bypass.Options()
-        .setBlockQuoteLineColor(
-            ContextCompat.getColor(activity, io.plaidapp.R.color.designer_news_quote_line)
-        )
+        .setBlockQuoteLineColor(activity.getColor(R.color.thread_depth))
         .setBlockQuoteLineWidth(2) // dps
         .setBlockQuoteLineIndent(8) // dps
         .setPreImageLinebreakHeight(4) // dps
         .setBlockQuoteIndentSize(TypedValue.COMPLEX_UNIT_DIP, 2f)
         .setBlockQuoteTextColor(
-            ContextCompat.getColor(activity, io.plaidapp.R.color.designer_news_quote)
+            ColorUtils.getThemeColor(
+                activity,
+                android.R.attr.textColorSecondary
+            )
         )
 
     DaggerStoryComponent.builder()
diff --git a/designernews/src/main/java/io/plaidapp/designernews/ui/story/CommentReplyViewHolder.kt b/designernews/src/main/java/io/plaidapp/designernews/ui/story/CommentReplyViewHolder.kt
index cf8c15638..ff3b3f9be 100644
--- a/designernews/src/main/java/io/plaidapp/designernews/ui/story/CommentReplyViewHolder.kt
+++ b/designernews/src/main/java/io/plaidapp/designernews/ui/story/CommentReplyViewHolder.kt
@@ -21,9 +21,9 @@ import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.animation.PropertyValuesHolder
 import android.view.View
-import android.widget.Button
 import android.widget.EditText
 import android.widget.ImageButton
+import android.widget.TextView
 import androidx.core.animation.doOnEnd
 import androidx.core.animation.doOnStart
 import androidx.recyclerview.widget.RecyclerView
@@ -38,7 +38,7 @@ import io.plaidapp.designernews.R
  */
 internal class CommentReplyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-    val commentVotes: Button = itemView.findViewById(R.id.comment_votes)
+    val commentVotes: TextView = itemView.findViewById(R.id.comment_votes)
     private val replyLabel: TextInputLayout = itemView.findViewById(R.id.comment_reply_label)
     val commentReply: EditText = itemView.findViewById(R.id.comment_reply)
     val postReply: ImageButton = itemView.findViewById(R.id.post_reply)
diff --git a/designernews/src/main/java/io/plaidapp/designernews/ui/story/StoryActivity.java b/designernews/src/main/java/io/plaidapp/designernews/ui/story/StoryActivity.java
index 0eb320e39..511c322b9 100644
--- a/designernews/src/main/java/io/plaidapp/designernews/ui/story/StoryActivity.java
+++ b/designernews/src/main/java/io/plaidapp/designernews/ui/story/StoryActivity.java
@@ -39,7 +39,6 @@
 import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.view.ViewGroup;
-import android.view.animation.Interpolator;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -53,7 +52,6 @@
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.app.ShareCompat;
 import androidx.core.content.ContextCompat;
-import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -89,9 +87,7 @@
 import java.util.List;
 
 import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
-import static io.plaidapp.core.util.AnimUtils.getFastOutLinearInInterpolator;
-import static io.plaidapp.core.util.AnimUtils.getFastOutSlowInInterpolator;
-import static io.plaidapp.core.util.AnimUtils.getLinearOutSlowInInterpolator;
+import static io.plaidapp.core.util.AnimUtils.*;
 
 public class StoryActivity extends AppCompatActivity {
 
@@ -874,9 +870,8 @@ private void handleCommentVotesClick(CommentReplyViewHolder holder,
                             result -> {
                                 if (result instanceof Result.Success) {
                                     comment.setUpvoted(true);
-                                    ;
                                     // TODO fix this
-//                                    comment.vote_count++;
+                                    // comment.vote_count++;
                                     holder.getCommentVotes().setText(String.valueOf(comment.getUpvotesCount()));
                                     holder.getCommentVotes().setActivated(true);
                                 } else {
diff --git a/designernews/src/main/java/io/plaidapp/ui/drawable/ThreadedCommentDrawable.java b/designernews/src/main/java/io/plaidapp/ui/drawable/ThreadedCommentDrawable.java
deleted file mode 100644
index 02ab17409..000000000
--- a/designernews/src/main/java/io/plaidapp/ui/drawable/ThreadedCommentDrawable.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.plaidapp.ui.drawable;
-
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.Drawable;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-
-/**
- * A drawable showing the depth of a threaded conversation
- */
-public class ThreadedCommentDrawable extends Drawable {
-
-    private static final @ColorInt int THREAD_COLOR = 0xffeceef1;
-
-    private final int threadWidth;
-    private final int gap;
-    private final int halfThreadWidth;
-    private final Paint paint;
-    private int threads;
-
-    /**
-     *
-     * @param threadWidth in pixels
-     * @param gap in pixels
-     */
-    public ThreadedCommentDrawable(int threadWidth, int gap) {
-        this.threadWidth = threadWidth;
-        this.gap = gap;
-        halfThreadWidth = threadWidth / 2;
-        paint = new Paint();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setStrokeWidth(threadWidth);
-        paint.setColor(THREAD_COLOR);
-    }
-
-    public ThreadedCommentDrawable(int threadWidth, int gap, int depth) {
-        this(threadWidth, gap);
-        setDepth(depth);
-    }
-
-    public void setDepth(int depth) {
-        this.threads = depth + 1;
-        invalidateSelf();
-    }
-
-    @Override
-    public void draw(@NonNull Canvas canvas) {
-        for (int thread = 0; thread < threads; thread++) {
-            int left = halfThreadWidth + (thread * (threadWidth + gap));
-            canvas.drawLine(left, 0, left, getBounds().bottom, paint);
-        }
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        return (threads * threadWidth) + ((threads - 1) * gap);
-    }
-
-    @Override
-    public void setAlpha(int i) {
-        paint.setAlpha(i);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) {
-        paint.setColorFilter(colorFilter);
-    }
-
-    @Override
-    public int getOpacity() {
-        return paint.getAlpha() == 255 ? PixelFormat.OPAQUE : PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        ThreadedCommentDrawable that = (ThreadedCommentDrawable) o;
-        return threads == that.threads;
-    }
-
-    @Override
-    public int hashCode() {
-        return threads;
-    }
-}
diff --git a/designernews/src/main/java/io/plaidapp/ui/drawable/ThreadedCommentDrawable.kt b/designernews/src/main/java/io/plaidapp/ui/drawable/ThreadedCommentDrawable.kt
new file mode 100644
index 000000000..dba1e2392
--- /dev/null
+++ b/designernews/src/main/java/io/plaidapp/ui/drawable/ThreadedCommentDrawable.kt
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.plaidapp.ui.drawable
+
+import android.content.res.ColorStateList
+import android.graphics.Canvas
+import android.graphics.ColorFilter
+import android.graphics.Paint
+import android.graphics.PixelFormat
+import android.graphics.PorterDuff.Mode.SRC_IN
+import android.graphics.drawable.Drawable
+import androidx.annotation.ColorInt
+import androidx.annotation.Px
+
+@ColorInt private const val THREAD_COLOR = 0xffff00ff.toInt()
+
+/**
+ * A drawable showing the depth of a threaded conversation
+ */
+class ThreadedCommentDrawable(
+    @Px private val threadWidth: Int,
+    @Px private val gap: Int
+) : Drawable() {
+
+    private val halfThreadWidth: Int = threadWidth / 2
+    private val paint = Paint().apply {
+        style = Paint.Style.STROKE
+        strokeWidth = threadWidth.toFloat()
+        color = THREAD_COLOR
+    }
+    private var threads: Int = 0
+
+    constructor(threadWidth: Int, gap: Int, depth: Int) : this(threadWidth, gap) {
+        setDepth(depth)
+    }
+
+    fun setDepth(depth: Int) {
+        this.threads = depth + 1
+        invalidateSelf()
+    }
+
+    override fun draw(canvas: Canvas) {
+        for (thread in 0 until threads) {
+            val left = halfThreadWidth + thread * (threadWidth + gap)
+            canvas.drawLine(left.toFloat(), 0f, left.toFloat(), bounds.bottom.toFloat(), paint)
+        }
+    }
+
+    override fun getIntrinsicWidth(): Int {
+        return threads * threadWidth + (threads - 1) * gap
+    }
+
+    override fun setAlpha(i: Int) {
+        paint.alpha = i
+    }
+
+    override fun setColorFilter(colorFilter: ColorFilter?) {
+        paint.colorFilter = colorFilter
+    }
+
+    override fun setTintList(tint: ColorStateList?) {
+        if (tint != null) {
+            setColorFilter(tint.defaultColor, SRC_IN)
+        } else {
+            clearColorFilter()
+        }
+    }
+
+    override fun setTint(tintColor: Int) {
+        setColorFilter(tintColor, SRC_IN)
+    }
+
+    override fun getOpacity(): Int {
+        return if (paint.alpha == 255) PixelFormat.OPAQUE else PixelFormat.TRANSLUCENT
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as ThreadedCommentDrawable
+
+        if (threads != other.threads) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return threads
+    }
+}
diff --git a/designernews/src/main/res/color/designer_news_author.xml b/designernews/src/main/res/color/designer_news_author.xml
deleted file mode 100644
index a4c7715f5..000000000
--- a/designernews/src/main/res/color/designer_news_author.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2015 Google Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item app:state_original_poster="true" android:color="@color/designer_news" />
-    <item android:color="@color/text_secondary_dark" />
-
-</selector>
diff --git a/designernews/src/main/res/color/thread_depth.xml b/designernews/src/main/res/color/thread_depth.xml
new file mode 100644
index 000000000..b9529264e
--- /dev/null
+++ b/designernews/src/main/res/color/thread_depth.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (c) 2019 Google Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software distributed under the License
+  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+  or implied. See the License for the specific language governing permissions and limitations under
+  the License.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="?attr/colorOnSurface"
+        android:alpha="0.08" />
+</selector>
diff --git a/designernews/src/main/res/layout-w600dp/activity_designer_news_story.xml b/designernews/src/main/res/layout-w600dp/activity_designer_news_story.xml
index 9dc0ac130..838456db8 100644
--- a/designernews/src/main/res/layout-w600dp/activity_designer_news_story.xml
+++ b/designernews/src/main/res/layout-w600dp/activity_designer_news_story.xml
@@ -21,7 +21,7 @@
     android:id="@+id/comments_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_lightish"
+    android:background="?android:attr/colorBackground"
     android:transitionName="@string/transition_story_background"
     app:dragDismissDistance="@dimen/drag_dismiss_distance"
     app:dragDismissScale="0.95">
@@ -30,7 +30,7 @@
         android:id="@+id/header"
         android:layout_width="match_parent"
         android:layout_height="@dimen/extended_height_toolbar"
-        android:background="?android:colorPrimary" />
+        android:background="?attr/colorPrimary" />
 
     <!-- wrapping layout needed for the ripple :( -->
     <FrameLayout
diff --git a/designernews/src/main/res/layout/activity_designer_news_story.xml b/designernews/src/main/res/layout/activity_designer_news_story.xml
index b001b0ced..bdbbda10a 100644
--- a/designernews/src/main/res/layout/activity_designer_news_story.xml
+++ b/designernews/src/main/res/layout/activity_designer_news_story.xml
@@ -35,7 +35,7 @@
         android:id="@+id/background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background_light"
+        android:background="?attr/colorSurface"
         android:transitionName="@string/transition_story_background" />
 
     <!-- Description added as header to the list.
diff --git a/designernews/src/main/res/layout/designer_news_comment.xml b/designernews/src/main/res/layout/designer_news_comment.xml
index f30b3a4ef..0fa379b41 100644
--- a/designernews/src/main/res/layout/designer_news_comment.xml
+++ b/designernews/src/main/res/layout/designer_news_comment.xml
@@ -36,7 +36,8 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="@+id/comment_text"
         android:layout_marginStart="@dimen/padding_normal"
-        android:paddingEnd="@dimen/spacing_normal" />
+        android:paddingEnd="@dimen/spacing_normal"
+        android:tint="@color/thread_depth" />
 
     <io.plaidapp.core.ui.widget.BaselineGridTextView
         android:id="@+id/comment_time_ago"
@@ -59,7 +60,7 @@
         app:layout_constraintHorizontal_bias="0"
         android:paddingTop="@dimen/spacing_micro"
         android:ellipsize="end"
-        android:textAppearance="@style/TextAppearance.CommentAuthor.DesignerNews"
+        android:textAppearance="@style/TextAppearance.CommentAuthor"
         tools:text="Nick B" />
 
     <io.plaidapp.core.ui.widget.BaselineGridTextView
diff --git a/designernews/src/main/res/layout/designer_news_comment_actions.xml b/designernews/src/main/res/layout/designer_news_comment_actions.xml
index 172252794..062c343fc 100644
--- a/designernews/src/main/res/layout/designer_news_comment_actions.xml
+++ b/designernews/src/main/res/layout/designer_news_comment_actions.xml
@@ -26,18 +26,17 @@
     android:paddingEnd="@dimen/designer_news_story_comment_actions_padding_end"
     android:paddingBottom="@dimen/spacing_normal"
     android:clipToPadding="false"
-    android:background="@color/selected_comment_background"
+    android:background="@color/color_highlighted_surface"
     android:elevation="@dimen/designer_news_story_comment_action_elevation">
 
-    <Button
+    <io.plaidapp.core.ui.widget.BaselineGridTextView
         android:id="@+id/comment_votes"
         android:layout_width="@dimen/fab_size"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:drawableTop="@drawable/asl_upvote"
         android:textAppearance="@style/TextAppearance.CommentAuthor"
-        tools:text="33 likes"
-        style="?android:borderlessButtonStyle" />
+        tools:text="33 likes" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/comment_reply_label"
diff --git a/designernews/src/main/res/values/styles.xml b/designernews/src/main/res/values/styles.xml
index 0335d48ad..d979c4868 100644
--- a/designernews/src/main/res/values/styles.xml
+++ b/designernews/src/main/res/values/styles.xml
@@ -50,10 +50,6 @@
         <item name="android:colorControlNormal">@color/hint_disabled_dark</item>
     </style>
 
-    <style name="TextAppearance.CommentAuthor.DesignerNews">
-        <item name="android:textColor">@color/designer_news_author</item>
-    </style>
-
     <style name="TextAppearance.DesignerNewsDescription" parent="@android:style/TextAppearance.Material.Subhead">
         <item name="android:textColor">@color/text_secondary_dark</item>
         <item name="android:letterSpacing">0.01</item>
diff --git a/dribbble/src/main/java/io/plaidapp/dribbble/ui/shot/ShotStyler.kt b/dribbble/src/main/java/io/plaidapp/dribbble/ui/shot/ShotStyler.kt
index a27bcd3e7..8950fa56b 100644
--- a/dribbble/src/main/java/io/plaidapp/dribbble/ui/shot/ShotStyler.kt
+++ b/dribbble/src/main/java/io/plaidapp/dribbble/ui/shot/ShotStyler.kt
@@ -45,7 +45,6 @@ class ShotStyler @Inject constructor(context: Context) {
     @ColorInt
     val highlightColor = ColorUtils.getThemeColor(
         context,
-        coreR.attr.colorPrimary,
-        coreR.color.primary
+        coreR.attr.colorPrimary
     )
 }
diff --git a/dribbble/src/main/res/layout/activity_dribbble_shot.xml b/dribbble/src/main/res/layout/activity_dribbble_shot.xml
index 6ca05dcb7..6bcb72cd2 100644
--- a/dribbble/src/main/res/layout/activity_dribbble_shot.xml
+++ b/dribbble/src/main/res/layout/activity_dribbble_shot.xml
@@ -62,7 +62,7 @@
             android:id="@+id/background"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?colorSurface"
+            android:background="?attr/colorSurface"
             android:transitionName="@string/transition_shot_background" />
 
         <io.plaidapp.core.ui.widget.ParallaxScrimageView
diff --git a/dribbble/src/main/res/values/styles.xml b/dribbble/src/main/res/values/styles.xml
index f55a1dbc7..56ec61a4f 100644
--- a/dribbble/src/main/res/values/styles.xml
+++ b/dribbble/src/main/res/values/styles.xml
@@ -44,8 +44,4 @@
         <item name="android:letterSpacing">0.01</item>
         <item name="lineHeightHint">24sp</item>
     </style>
-
-    <style name="TextAppearance.CommentAuthor.Dribbble">
-        <item name="android:textColor">@color/dribble_comment_author</item>
-    </style>
 </resources>
diff --git a/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt b/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt
index b292df117..0c148d022 100644
--- a/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt
+++ b/search/src/main/java/io/plaidapp/search/ui/SearchActivity.kt
@@ -301,7 +301,7 @@ class SearchActivity : AppCompatActivity() {
                 noResults =
                     (findViewById<View>(R.id.stub_no_search_results) as ViewStub).inflate() as TextView
                 noResults?.apply {
-                    setOnClickListener { v ->
+                    setOnClickListener {
                         searchView.setQuery("", false)
                         searchView.requestFocus()
                         ImeUtils.showIme(searchView)