diff --git a/car-ui-lib/res/color/car_ui_primary_text_color.xml b/car-ui-lib/res/color/car_ui_primary_text_color.xml
new file mode 100644
index 0000000..f238428
--- /dev/null
+++ b/car-ui-lib/res/color/car_ui_primary_text_color.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 The Android Open Source Project
+
+    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.
+-->
+<!-- Default text colors for car buttons when enabled/disabled. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:alpha="0.50"
+        android:color="@android:color/white" />
+    <item android:color="@android:color/white" />
+</selector>
\ No newline at end of file
diff --git a/car-ui-lib/res/color/car_ui_secondary_text_color.xml b/car-ui-lib/res/color/car_ui_secondary_text_color.xml
new file mode 100644
index 0000000..f0c6f45
--- /dev/null
+++ b/car-ui-lib/res/color/car_ui_secondary_text_color.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2019 The Android Open Source Project
+
+    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.
+-->
+<!-- Default text colors for car buttons when enabled/disabled. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:alpha="0.36"
+        android:color="@android:color/white"/>
+    <item android:color="@android:color/white"
+        android:alpha="0.72" />
+</selector>
\ No newline at end of file
diff --git a/car-ui-lib/res/values/colors.xml b/car-ui-lib/res/values/colors.xml
index 8a70ba6..d4a78d7 100644
--- a/car-ui-lib/res/values/colors.xml
+++ b/car-ui-lib/res/values/colors.xml
@@ -18,10 +18,6 @@
 
     <!-- Background color to use on full screen activities -->
     <color name="car_ui_activity_background_color">#000000</color>
-    <!-- Main text color (titles, text body, etc.) -->
-    <color name="car_ui_primary_text_color">#FFFFFFFF</color>
-    <!-- Text color used in subtitles or other secondary text blocks -->
-    <color name="car_ui_secondary_text_color">#90FFFFFF</color>
     <!-- The ripple color. -->
     <color name="car_ui_ripple_color">#27ffffff</color>
 
@@ -59,8 +55,8 @@
     <!-- Preferences -->
 
     <color name="car_ui_preference_category_title_text_color">#ff60a8f0</color>
-    <color name="car_ui_preference_summary_text_color">#ffdadce0</color>
-    <color name="car_ui_preference_title_text_color">@android:color/white</color>
+    <color name="car_ui_preference_summary_text_color">@color/car_ui_secondary_text_color</color>
+    <color name="car_ui_preference_title_text_color">@color/car_ui_primary_text_color</color>
     <color name="car_ui_preference_edit_text_dialog_message_text_color">#ffdadce0</color>
     <color name="car_ui_preference_icon_color">@android:color/white</color>
     <color name="car_ui_preference_switch_track_text_color">@android:color/white</color>