diff --git a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
index bb32351b2..017c688d2 100644
--- a/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
+++ b/app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
@@ -69,6 +69,9 @@ public class AuthUiActivity extends AppCompatActivity {
     @BindView(R.id.purple_theme)
     RadioButton mUsePurpleTheme;
 
+    @BindView(R.id.dark_theme)
+    RadioButton mUseDarkTheme;
+
     @BindView(R.id.email_provider)
     CheckBox mUseEmailProvider;
 
@@ -249,6 +252,10 @@ private int getSelectedTheme() {
             return R.style.PurpleTheme;
         }
 
+        if (mUseDarkTheme.isChecked()) {
+            return R.style.DarkTheme;
+        }
+
         return R.style.GreenTheme;
     }
 
diff --git a/app/src/main/res/layout/auth_ui_layout.xml b/app/src/main/res/layout/auth_ui_layout.xml
index f1e037fe4..49d947db4 100644
--- a/app/src/main/res/layout/auth_ui_layout.xml
+++ b/app/src/main/res/layout/auth_ui_layout.xml
@@ -62,6 +62,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/green_theme" />
+
+            <RadioButton
+                android:id="@+id/dark_theme"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/dark_theme" />
         </RadioGroup>
 
         <TextView
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index f52096543..e36bd7692 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,6 +1,9 @@
 <resources>
 
     <style name="PurpleTheme" parent="FirebaseUI">
+        <item name="android:textColor">#000000</item>
+        <item name="android:textColorPrimary">@color/material_deep_purple_50</item>
+
         <item name="colorPrimary">@color/material_deep_purple_500</item>
         <item name="android:colorPrimary">@color/material_deep_purple_500</item>
 
@@ -10,10 +13,12 @@
         <item name="colorAccent">@color/material_lime_a700</item>
         <item name="android:colorAccent">@color/material_lime_a700</item>
 
-
         <item name="colorControlNormal">@color/material_deep_purple_500</item>
         <item name="android:colorControlNormal">@color/material_deep_purple_500</item>
 
+        <item name="colorButtonNormal">@color/material_deep_purple_500</item>
+        <item name="android:colorButtonNormal">@color/material_deep_purple_500</item>
+
         <item name="colorControlActivated">@color/material_deep_purple_a200</item>
         <item name="android:colorControlActivated">@color/material_deep_purple_a200</item>
 
@@ -24,6 +29,9 @@
     </style>
 
     <style name="GreenTheme" parent="FirebaseUI">
+        <item name="android:textColor">@color/material_green_500</item>
+        <item name="android:textColorPrimary">@color/material_green_50</item>
+
         <item name="colorPrimary">@color/material_green_500</item>
         <item name="android:colorPrimary">@color/material_green_500</item>
 
@@ -33,6 +41,9 @@
         <item name="colorAccent">@color/material_purple_a700</item>
         <item name="android:colorAccent">@color/material_purple_a700</item>
 
+        <item name="colorButtonNormal">@color/material_purple_a700</item>
+        <item name="android:colorButtonNormal">@color/material_purple_a700</item>
+
         <item name="colorControlNormal">@color/material_green_500</item>
         <item name="android:colorControlNormal">@color/material_green_500</item>
 
@@ -45,6 +56,22 @@
         <item name="android:windowBackground">@color/material_green_50</item>
     </style>
 
+    <style name="DarkTheme" parent="FirebaseUI">
+        <item name="colorPrimary">@color/primary_material_dark</item>
+        <item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
+        <item name="colorAccent">@color/accent_material_dark</item>
+        <item name="android:colorBackground">@color/background_material_dark</item>
+        <item name="android:colorForeground">@color/foreground_material_dark</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
+        <item name="android:statusBarColor">@android:color/black</item>
+        <item name="android:textColor">@color/abc_primary_text_material_dark</item>
+        <item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
+        <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
+        <item name="android:textColorSecondary">@color/abc_secondary_text_material_dark</item>
+        <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item>
+        <item name="android:windowBackground">@color/background_material_dark</item>
+    </style>
+
     <style name="WarnButton" parent="Widget.AppCompat.Button.Colored">
         <item name="android:colorButtonNormal">@color/material_red_a200</item>
         <item name="android:textColor">@android:color/white</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 98b1b2d1d..06ce86279 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -23,4 +23,9 @@
     <color name="material_purple_a700">#AA00FF</color>
 
     <color name="material_red_a200">#FF5252</color>
+
+    <color name="material_grey_200">#EEEEEE</color>
+    <color name="material_grey_400">#BDBDBD</color>
+    <color name="material_grey_500">#9E9E9E</color>
+    <color name="material_grey_700">#616161</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 260a9a8a2..c13bde216 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
     <string name="sign_in">Start</string>
     <string name="green_theme">Green Theme</string>
     <string name="purple_theme">Purple Theme</string>
+    <string name="dark_theme">Dark Theme</string>
     <string name="use_theme_header">Use theme:</string>
     <string name="logo_header">Logo:</string>
     <string name="firebase_logo_label">Firebase Auth</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3072c906d..0a091f55b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,6 +14,9 @@
         <item name="colorControlActivated">@color/material_deep_purple_a200</item>
         <item name="colorControlHighlight">@color/material_lime_a700</item>
         <item name="android:windowBackground">@color/material_deep_purple_50</item>
+        <item name="android:textColor">@color/material_grey_900</item>
+        <item name="android:textColorPrimary">@color/material_deep_purple_50</item>
+        <item name="colorButtonNormal">@color/material_deep_purple_500</item>
     </style>
 
     <style name="GreenTheme" parent="FirebaseUI">
@@ -24,6 +27,23 @@
         <item name="colorControlActivated">@color/material_lime_a700</item>
         <item name="colorControlHighlight">@color/material_green_a200</item>
         <item name="android:windowBackground">@color/material_green_50</item>
+        <item name="android:textColor">@color/material_grey_900</item>
+        <item name="android:textColorPrimary">@color/material_deep_purple_50</item>
+        <item name="colorButtonNormal">@color/material_green_500</item>
+    </style>
+
+    <style name="DarkTheme" parent="FirebaseUI">
+        <item name="colorPrimary">@color/primary_material_dark</item>
+        <item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
+        <item name="colorAccent">@color/accent_material_dark</item>
+        <item name="android:colorBackground">@color/background_material_dark</item>
+        <item name="android:colorForeground">@color/foreground_material_dark</item>
+        <item name="android:textColor">@color/abc_primary_text_material_dark</item>
+        <item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
+        <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
+        <item name="android:textColorSecondary">@color/abc_secondary_text_material_dark</item>
+        <item name="android:textColorSecondaryInverse">@color/abc_secondary_text_material_light</item>
+        <item name="android:windowBackground">@color/background_material_dark</item>
     </style>
 
     <style name="WarnButton" parent="Widget.AppCompat.Button.Colored">
diff --git a/auth/src/main/res/drawable-v21/rounded_button.xml b/auth/src/main/res/drawable-v21/rounded_button.xml
deleted file mode 100644
index 341243943..000000000
--- a/auth/src/main/res/drawable-v21/rounded_button.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" >
-        <shape android:shape="rectangle" >
-            <corners android:radius="3dp" />
-            <solid android:color="?attr/colorControlActivated"/>
-        </shape>
-    </item>
-    <item android:state_focused="true">
-        <shape android:shape="rectangle" >
-            <corners android:radius="3dp" />
-            <solid android:color="?attr/colorControlHighlight"/>
-        </shape>
-    </item>
-    <item >
-        <shape android:shape="rectangle" >
-            <corners android:radius="3dp" />
-            <solid android:color="?attr/colorButtonNormal"/>
-        </shape>
-    </item>
-</selector>
diff --git a/auth/src/main/res/drawable/rounded_button.xml b/auth/src/main/res/drawable/rounded_button.xml
deleted file mode 100644
index 4e05e5712..000000000
--- a/auth/src/main/res/drawable/rounded_button.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" >
-        <shape android:shape="rectangle" >
-            <corners android:radius="3dp" />
-            <solid android:color="@color/authui_colorPrimaryDark"/>
-        </shape>
-    </item>
-    <item android:state_focused="true">
-        <shape android:shape="rectangle" >
-            <corners android:radius="3dp" />
-            <solid android:color="@color/authui_colorActivated"/>
-        </shape>
-    </item>
-    <item >
-        <shape android:shape="rectangle" >
-            <corners android:radius="3dp" />
-            <solid android:color="@color/authui_colorPrimary"/>
-        </shape>
-    </item>
-</selector>
-
diff --git a/auth/src/main/res/layout/confirm_recovery_layout.xml b/auth/src/main/res/layout/confirm_recovery_layout.xml
index 8532d7147..0b74ee5ae 100644
--- a/auth/src/main/res/layout/confirm_recovery_layout.xml
+++ b/auth/src/main/res/layout/confirm_recovery_layout.xml
@@ -3,7 +3,7 @@
     android:orientation="vertical"
     style="@style/FirebaseUI.WrapperStyle">
     <TextView
-        style="@style/FirebaseUI.Text.BodyText"
+        style="@style/FirebaseUI.Text.BodyTextNoColor"
         android:id="@+id/body_text"/>
     <Button
         style="@style/FirebaseUI.Button.AlertButton"
diff --git a/auth/src/main/res/values-v21/styles.xml b/auth/src/main/res/values-v21/styles.xml
index 84ab706a9..3d6825a76 100644
--- a/auth/src/main/res/values-v21/styles.xml
+++ b/auth/src/main/res/values-v21/styles.xml
@@ -5,32 +5,31 @@
         <item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
         <item name="colorAccent">@color/authui_colorAccent</item>
         <item name="colorButtonNormal">@color/authui_colorPrimary</item>
-
-        <item name="android:colorPrimary">@color/authui_colorPrimary</item>
-        <item name="android:colorPrimaryDark">@color/authui_colorPrimaryDark</item>
-        <item name="android:colorAccent">@color/authui_colorAccent</item>
-        <item name="android:colorButtonNormal">@color/authui_colorPrimary</item>
-
+        <item name="android:textColorHint">@color/authui_colorPrimary</item>
         <item name="android:buttonStyle">@style/FirebaseUI.Button</item>
         <item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
+        <item name="android:textViewStyle">@style/FirebaseUI.Text.BodyText</item>
+        <item name="android:textColorPrimary">#FFF</item>
+        <item name="android:textColor">#000</item>
     </style>
 
     <style name="FirebaseUI.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.MinWidth">
-        <item name="colorPrimary">@color/authui_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
-        <item name="colorAccent">@color/authui_colorAccent</item>
-        <item name="colorButtonNormal">@color/authui_colorPrimary</item>
-
-        <item name="android:colorPrimary">@color/authui_colorPrimary</item>
-        <item name="android:colorPrimaryDark">@color/authui_colorPrimaryDark</item>
-        <item name="android:colorAccent">@color/authui_colorAccent</item>
-        <item name="android:colorButtonNormal">@color/authui_colorPrimary</item>
-
         <item name="android:buttonStyle">@style/FirebaseUI.Button</item>
         <item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
-
         <item name="android:layout_width">match_parent</item>
         <item name="android:windowMinWidthMajor">360dp</item>
         <item name="android:layout_height">match_parent</item>
     </style>
-</resources>
\ No newline at end of file
+
+    <style name="FirebaseUI.EditText">
+        <item name="android:textSize">16sp</item>
+        <item name="android:lineSpacingExtra">8sp</item>
+        <item name="android:textColorHint">?android:textColor</item>
+        <item name="android:textColor">?android:textColor</item>
+        <item name="android:editTextColor">?android:textColor</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textCursorDrawable">@null</item>
+    </style>
+</resources>
diff --git a/auth/src/main/res/values/colors.xml b/auth/src/main/res/values/colors.xml
index e22f28f3d..0b1630c8a 100644
--- a/auth/src/main/res/values/colors.xml
+++ b/auth/src/main/res/values/colors.xml
@@ -4,14 +4,11 @@
     <color name="authui_colorPrimaryDark">#2F3E9E</color>
     <color name="authui_colorAccent">#3E50B4</color>
     <color name="authui_colorActivated">#1a237e</color>
+    <color name="authui_inputTextColor">#FFFFFF</color>
+    <color name="authui_inputTextColorDisabled">#333333</color>
+    <color name="authui_inputTextColorDark">#000000</color>
+    <color name="authui_inputTextColorDarkDisabled">#333333</color>
 
-    <color name="headingColor">#212121</color>
-    <color name="bodyTextColor">#c0000000</color>
     <color name="errorColor">#DD2C00</color>
     <color name="linkColor">#4285F4</color>
-    <color name="buttonColor">@color/authui_colorPrimary</color>
-    <color name="buttonColorPressed">@color/authui_colorActivated</color>
-    <color name="buttonTextColor">#FFFFFF</color>
-    <color name="inputLabelColor">#757575</color>
-    <color name="shadowColor">#eeeeee</color>
 </resources>
diff --git a/auth/src/main/res/values/styles.xml b/auth/src/main/res/values/styles.xml
index f46b9d0e4..1973df61a 100644
--- a/auth/src/main/res/values/styles.xml
+++ b/auth/src/main/res/values/styles.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="FirebaseUI" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:textColor">@color/authui_inputTextColorDark</item>
+        <item name="android:textColorPrimary">@color/authui_inputTextColor</item>
         <item name="colorPrimary">@color/authui_colorPrimary</item>
         <item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
         <item name="colorAccent">@color/authui_colorAccent</item>
         <item name="colorButtonNormal">@color/authui_colorPrimary</item>
-
         <item name="android:buttonStyle">@style/FirebaseUI.Button</item>
         <item name="android:editTextStyle">@style/FirebaseUI.EditText</item>
+        <item name="colorControlNormal">@color/authui_colorPrimary</item>
+        <item name="colorControlActivated">@color/authui_colorAccent</item>
+        <item name="colorControlHighlight">@color/authui_colorAccent</item>
     </style>
 
     <style name="FirebaseUI.Dialog" parent="Base.Theme.AppCompat.Light.Dialog.MinWidth">
-        <item name="colorPrimary">@color/authui_colorPrimary</item>
-        <item name="colorPrimaryDark">@color/authui_colorPrimaryDark</item>
-        <item name="colorAccent">@color/authui_colorAccent</item>
-        <item name="colorButtonNormal">@color/authui_colorPrimary</item>
-
         <item name="android:layout_width">match_parent</item>
         <item name="android:windowMinWidthMajor">360dp</item>
         <item name="android:layout_height">match_parent</item>
@@ -106,10 +105,11 @@
     <!-- Common styles -->
     <style name="FirebaseUI.Text.TextInputLayout">
         <item name="android:paddingTop">8dp</item>
+        <item name="android:textColorHint">?android:attr/textColor</item>
     </style>
 
     <style name="FirebaseUI.Text.HintText" parent="FirebaseUI.Text.T12">
-        <item name="android:textColor">@color/inputLabelColor</item>
+        <item name="android:textColor">?android:attr/textColor</item>
     </style>
 
     <style name="FirebaseUI.Text.ErrorText" parent="FirebaseUI.Text.T12">
@@ -120,18 +120,12 @@
 
     <style name="FirebaseUI.Button" parent="@style/Widget.AppCompat.Button">
         <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_gravity">right</item>
-        <item name="android:layout_height">36dp</item>
-        <item name="android:layout_margin">8dp</item>
-        <item name="android:textColor">@color/buttonTextColor</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:radius">3dp</item>
-        <item name="android:background">@drawable/rounded_button</item>
+        <item name="android:textColor">?attr/android:textColorPrimary</item>
     </style>
 
     <style name="FirebaseUI.Button.NextButton">
-        <item name="android:layout_width">88dp</item>
-        <item name="android:layout_height">36dp</item>
     </style>
 
     <style name="FirebaseUI.Button.AlertButton">
@@ -142,19 +136,19 @@
         <item name="android:layout_marginBottom">0dp</item>
         <item name="android:gravity">right|center</item>
         <item name="android:background">@android:color/transparent</item>
-        <item name="android:textColor">@color/buttonColor</item>
     </style>
 
     <style name="FirebaseUI.EditText">
+        <item name="android:textColor">?android:textColor</item>
         <item name="android:textSize">16sp</item>
         <item name="android:lineSpacingExtra">8sp</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:fontFamily">sans-serif</item>
-        <item name="android:colorActivatedHighlight">@color/authui_colorPrimary</item>
-        <item name="android:colorFocusedHighlight">@color/authui_colorPrimary</item>
+        <item name="android:textCursorDrawable">@null</item>
     </style>
 
+
     <style name="FirebaseUI.EditText.PasswordField">
         <item name="android:hint">@string/password_hint</item>
         <item name="android:inputType">textPassword</item>
@@ -172,11 +166,9 @@
 
     <style name="FirebaseUI.Text.Link">
         <item name="android:textColor">@color/linkColor</item>
-
     </style>
 
     <style name="FirebaseUI.Text.Heading" parent="FirebaseUI.Text.T07">
-        <item name="android:textColor">@color/headingColor</item>
         <item name="android:paddingTop">0dp</item>
         <item name="android:paddingBottom">16dp</item>
     </style>
@@ -184,14 +176,14 @@
     <style name="FirebaseUI.Text.BodyText" parent="FirebaseUI.Text.T08">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">@color/bodyTextColor</item>
+        <item name="android:textColor">?android:textColor</item>
         <item name="android:paddingBottom">16dp</item>
     </style>
 
-    <style name="FirebaseUI.Text.InputLabel" parent="FirebaseUI.Text.T12">
-        <item name="android:textColor">@color/inputLabelColor</item>
-        <item name="android:paddingTop">8dp</item>
-        <item name="android:paddingBottom">8dp</item>
+    <style name="FirebaseUI.Text.BodyTextNoColor" parent="FirebaseUI.Text.T08">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingBottom">16dp</item>
     </style>
 
     <!-- Authentication method picker styles -->