From 271f48ba8d3bc8e96316f435a729e72d3fb4eec5 Mon Sep 17 00:00:00 2001
From: Garret Yoder <multithedev@gmail.com>
Date: Mon, 25 Jun 2018 12:44:50 -0400
Subject: [PATCH] Fix AAPT2 error

---
 library/src/main/res/values-v21/styles.xml | 282 -------------------
 library/src/main/res/values-v25/styles.xml | 303 ---------------------
 library/src/main/res/values/styles.xml     | 111 ++++++--
 3 files changed, 87 insertions(+), 609 deletions(-)
 delete mode 100644 library/src/main/res/values-v21/styles.xml
 delete mode 100644 library/src/main/res/values-v25/styles.xml

diff --git a/library/src/main/res/values-v21/styles.xml b/library/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 90c9570..0000000
--- a/library/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- BASE THEMES -->
-    <style name="Colorful.Light" parent="android:Theme.Material.Light.NoActionBar"/>
-    <style name="Colorful.Dark" parent="android:Theme.Material.NoActionBar"/>
-    <style name="Colorful.AppCompat.Light" parent="Theme.AppCompat.Light.NoActionBar"/>
-    <style name="Colorful.AppCompat.Dark" parent="Theme.AppCompat.NoActionBar"/>
-
-    <style name="primary0">
-        <item name="android:colorPrimary">@color/md_red_500</item>
-        <item name="android:colorPrimaryDark">@color/md_red_700</item>
-        <item name="colorPrimary">@color/md_red_500</item>
-        <item name="colorPrimaryDark">@color/md_red_700</item>
-    </style>
-
-    <style name="accent0">
-        <item name="android:colorAccent">@color/md_red_500</item>
-        <item name="colorAccent">@color/md_red_500</item>
-        <item name="colorSecondary">@color/md_red_500</item>
-    </style>
-
-    <style name="primary1">
-        <item name="android:colorPrimary" >@color/md_pink_500</item>
-        <item name="android:colorPrimaryDark">@color/md_pink_700</item>
-        <item name="colorPrimary">@color/md_pink_500</item>
-        <item name="colorPrimaryDark">@color/md_pink_700</item>
-    </style>
-
-    <style name="accent1">
-        <item name="android:colorAccent">@color/md_pink_500</item>
-        <item name="colorAccent">@color/md_pink_500</item>
-        <item name="colorSecondary">@color/md_pink_500</item>
-    </style>
-
-    <style name="primary2">
-        <item name="android:colorPrimary">@color/md_purple_500</item>
-        <item name="android:colorPrimaryDark">@color/md_purple_700</item>
-        <item name="colorPrimary">@color/md_purple_500</item>
-        <item name="colorPrimaryDark">@color/md_purple_700</item>
-    </style>
-
-    <style name="accent2">
-        <item name="android:colorAccent">@color/md_purple_500</item>
-        <item name="colorAccent">@color/md_purple_500</item>
-        <item name="colorSecondary">@color/md_purple_500</item>
-    </style>
-
-    <style name="primary3">
-        <item name="android:colorPrimary">@color/md_deep_purple_500</item>
-        <item name="android:colorPrimaryDark">@color/md_deep_purple_700</item>
-        <item name="colorPrimary">@color/md_deep_purple_500</item>
-        <item name="colorPrimaryDark">@color/md_deep_purple_700</item>
-    </style>
-
-    <style name="accent3">
-        <item name="android:colorAccent">@color/md_deep_purple_500</item>
-        <item name="colorAccent">@color/md_deep_purple_500</item>
-        <item name="colorSecondary">@color/md_deep_purple_500</item>
-    </style>
-
-    <style name="primary4">
-        <item name="android:colorPrimary">@color/md_indigo_500</item>
-        <item name="android:colorPrimaryDark">@color/md_indigo_700</item>
-        <item name="colorPrimary">@color/md_indigo_500</item>
-        <item name="colorPrimaryDark">@color/md_indigo_700</item>
-    </style>
-
-    <style name="accent4">
-        <item name="android:colorAccent">@color/md_indigo_500</item>
-        <item name="colorAccent">@color/md_indigo_500</item>
-        <item name="colorSecondary">@color/md_indigo_500</item>
-    </style>
-
-    <style name="primary5">
-        <item name="android:colorPrimary">@color/md_blue_500</item>
-        <item name="android:colorPrimaryDark">@color/md_blue_700</item>
-        <item name="colorPrimary">@color/md_blue_500</item>
-        <item name="colorPrimaryDark">@color/md_blue_700</item>
-    </style>
-
-    <style name="accent5">
-        <item name="android:colorAccent">@color/md_blue_500</item>
-        <item name="colorAccent">@color/md_blue_500</item>
-        <item name="colorSecondary">@color/md_blue_500</item>
-    </style>
-
-    <style name="primary6">
-        <item name="android:colorPrimary">@color/md_light_blue_500</item>
-        <item name="android:colorPrimaryDark">@color/md_light_blue_700</item>
-        <item name="colorPrimary">@color/md_light_blue_500</item>
-        <item name="colorPrimaryDark">@color/md_light_blue_700</item>
-    </style>
-
-    <style name="accent6">
-        <item name="android:colorAccent">@color/md_light_blue_500</item>
-        <item name="colorAccent">@color/md_light_blue_500</item>
-        <item name="colorSecondary">@color/md_light_blue_500</item>
-    </style>
-
-    <style name="primary7">
-        <item name="android:colorPrimary">@color/md_cyan_500</item>
-        <item name="android:colorPrimaryDark">@color/md_cyan_700</item>
-        <item name="colorPrimary">@color/md_cyan_500</item>
-        <item name="colorPrimaryDark">@color/md_cyan_700</item>
-    </style>
-
-    <style name="accent7">
-        <item name="android:colorAccent">@color/md_cyan_500</item>
-        <item name="colorAccent">@color/md_cyan_500</item>
-        <item name="colorSecondary">@color/md_cyan_500</item>
-    </style>
-
-    <style name="primary8">
-        <item name="android:colorPrimary">@color/md_teal_500</item>
-        <item name="android:colorPrimaryDark">@color/md_teal_700</item>
-        <item name="colorPrimary">@color/md_teal_500</item>
-        <item name="colorPrimaryDark">@color/md_teal_700</item>
-    </style>
-
-    <style name="accent8">
-        <item name="android:colorAccent">@color/md_teal_500</item>
-        <item name="colorAccent">@color/md_teal_500</item>
-        <item name="colorSecondary">@color/md_teal_500</item>
-    </style>
-
-    <style name="primary9">
-        <item name="android:colorPrimary">@color/md_green_500</item>
-        <item name="android:colorPrimaryDark">@color/md_green_700</item>
-        <item name="colorPrimary">@color/md_green_500</item>
-        <item name="colorPrimaryDark">@color/md_green_700</item>
-    </style>
-
-    <style name="accent9">
-        <item name="android:colorAccent">@color/md_green_500</item>
-        <item name="colorAccent">@color/md_green_500</item>
-        <item name="colorSecondary">@color/md_green_500</item>
-    </style>
-
-    <style name="primary10">
-        <item name="android:colorPrimary">@color/md_light_green_500</item>
-        <item name="android:colorPrimaryDark">@color/md_light_green_700</item>
-        <item name="colorPrimary">@color/md_light_green_500</item>
-        <item name="colorPrimaryDark">@color/md_light_green_700</item>
-    </style>
-
-    <style name="accent10">
-        <item name="android:colorAccent">@color/md_light_green_500</item>
-        <item name="colorAccent">@color/md_light_green_500</item>
-        <item name="colorSecondary">@color/md_light_green_500</item>
-    </style>
-
-    <style name="primary11">
-        <item name="android:colorPrimary">@color/md_lime_500</item>
-        <item name="android:colorPrimaryDark">@color/md_lime_700</item>
-        <item name="colorPrimary">@color/md_lime_500</item>
-        <item name="colorPrimaryDark">@color/md_lime_700</item>
-    </style>
-
-    <style name="accent11">
-        <item name="android:colorAccent">@color/md_lime_500</item>
-        <item name="colorAccent">@color/md_lime_500</item>
-        <item name="colorSecondary">@color/md_lime_500</item>
-    </style>
-
-    <style name="primary12">
-        <item name="android:colorPrimary">@color/md_yellow_500</item>
-        <item name="android:colorPrimaryDark">@color/md_yellow_700</item>
-        <item name="colorPrimary">@color/md_yellow_500</item>
-        <item name="colorPrimaryDark">@color/md_yellow_700</item>
-    </style>
-
-    <style name="accent12">
-        <item name="android:colorAccent">@color/md_yellow_500</item>
-        <item name="colorAccent">@color/md_yellow_500</item>
-        <item name="colorSecondary">@color/md_yellow_500</item>
-    </style>
-
-    <style name="primary13">
-        <item name="android:colorPrimary">@color/md_amber_500</item>
-        <item name="android:colorPrimaryDark">@color/md_amber_700</item>
-        <item name="colorPrimary">@color/md_amber_500</item>
-        <item name="colorPrimaryDark">@color/md_amber_700</item>
-    </style>
-
-    <style name="accent13">
-        <item name="android:colorAccent">@color/md_amber_500</item>
-        <item name="colorAccent">@color/md_amber_500</item>
-        <item name="colorSecondary">@color/md_amber_500</item>
-    </style>
-
-    <style name="primary14">
-        <item name="android:colorPrimary">@color/md_orange_500</item>
-        <item name="android:colorPrimaryDark">@color/md_orange_700</item>
-        <item name="colorPrimary">@color/md_orange_500</item>
-        <item name="colorPrimaryDark">@color/md_orange_700</item>
-    </style>
-
-    <style name="accent14">
-        <item name="android:colorAccent">@color/md_orange_500</item>
-        <item name="colorAccent">@color/md_orange_500</item>
-        <item name="colorSecondary">@color/md_orange_500</item>
-    </style>
-
-    <style name="primary15">
-        <item name="android:colorPrimary">@color/md_deep_orange_500</item>
-        <item name="android:colorPrimaryDark">@color/md_deep_orange_700</item>
-        <item name="colorPrimary">@color/md_deep_orange_500</item>
-        <item name="colorPrimaryDark">@color/md_deep_orange_700</item>
-    </style>
-
-    <style name="accent15">
-        <item name="android:colorAccent">@color/md_deep_orange_500</item>
-        <item name="colorAccent">@color/md_deep_orange_500</item>
-        <item name="colorSecondary">@color/md_deep_orange_500</item>
-    </style>
-
-    <style name="primary16">
-        <item name="android:colorPrimary">@color/md_brown_500</item>
-        <item name="android:colorPrimaryDark">@color/md_brown_700</item>
-        <item name="colorPrimary">@color/md_brown_500</item>
-        <item name="colorPrimaryDark">@color/md_brown_700</item>
-    </style>
-
-    <style name="accent16">
-        <item name="android:colorAccent">@color/md_brown_500</item>
-        <item name="colorAccent">@color/md_brown_500</item>
-        <item name="colorSecondary">@color/md_brown_500</item>
-    </style>
-
-    <style name="primary17">
-        <item name="android:colorPrimary">@color/md_grey_500</item>
-        <item name="android:colorPrimaryDark">@color/md_grey_700</item>
-        <item name="colorPrimary">@color/md_grey_500</item>
-        <item name="colorPrimaryDark">@color/md_grey_700</item>
-    </style>
-
-    <style name="accent17">
-        <item name="android:colorAccent">@color/md_grey_500</item>
-        <item name="colorAccent">@color/md_grey_500</item>
-        <item name="colorSecondary">@color/md_grey_500</item>
-    </style>
-
-    <style name="primary18">
-        <item name="android:colorPrimary">@color/md_blue_grey_500</item>
-        <item name="android:colorPrimaryDark">@color/md_blue_grey_700</item>
-        <item name="colorPrimary">@color/md_blue_grey_500</item>
-        <item name="colorPrimaryDark">@color/md_blue_grey_700</item>
-    </style>
-
-    <style name="accent18">
-        <item name="android:colorAccent">@color/md_blue_grey_500</item>
-        <item name="colorAccent">@color/md_blue_grey_500</item>
-        <item name="colorSecondary">@color/md_blue_grey_500</item>
-    </style>
-
-    <style name="primary19">
-        <item name="android:colorPrimary">@color/md_white_1000</item>
-        <item name="android:colorPrimaryDark">@color/md_white_1000</item>
-        <item name="colorPrimary">@color/md_white_1000</item>
-        <item name="colorPrimaryDark">@color/md_white_1000</item>
-    </style>
-
-    <style name="accent19">
-        <item name="android:colorAccent">@color/md_white_1000</item>
-        <item name="colorAccent">@color/md_white_1000</item>
-        <item name="colorSecondary">@color/md_white_1000</item>
-    </style>
-
-    <style name="primary20">
-        <item name="android:colorPrimary">@color/md_black_1000</item>
-        <item name="android:colorPrimaryDark">@color/md_black_1000</item>
-        <item name="colorPrimary">@color/md_black_1000</item>
-        <item name="colorPrimaryDark">@color/md_black_1000</item>
-    </style>
-
-    <style name="accent20">
-        <item name="android:colorAccent">@color/md_black_1000</item>
-        <item name="colorAccent">@color/md_black_1000</item>
-        <item name="colorSecondary">@color/md_black_1000</item>
-    </style>
-
-</resources>
diff --git a/library/src/main/res/values-v25/styles.xml b/library/src/main/res/values-v25/styles.xml
deleted file mode 100644
index f50a375..0000000
--- a/library/src/main/res/values-v25/styles.xml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- BASE THEMES -->
-    <style name="Colorful.Light" parent="android:Theme.Material.Light.NoActionBar"/>
-    <style name="Colorful.Dark" parent="android:Theme.Material.NoActionBar"/>
-    <style name="Colorful.AppCompat.Light" parent="Theme.AppCompat.Light.NoActionBar"/>
-    <style name="Colorful.AppCompat.Dark" parent="Theme.AppCompat.NoActionBar"/>
-
-    <style name="primary0">
-        <item name="android:colorPrimary">@color/md_red_500</item>
-        <item name="android:colorPrimaryDark">@color/md_red_700</item>
-        <item name="colorPrimary">@color/md_red_500</item>
-        <item name="colorPrimaryDark">@color/md_red_700</item>
-    </style>
-
-    <style name="accent0">
-        <item name="android:colorAccent">@color/md_red_500</item>
-        <item name="colorAccent">@color/md_red_500</item>
-        <item name="android:colorSecondary">@color/md_red_500</item>
-        <item name="colorSecondary">@color/md_red_500</item>
-    </style>
-
-    <style name="primary1">
-        <item name="android:colorPrimary" >@color/md_pink_500</item>
-        <item name="android:colorPrimaryDark">@color/md_pink_700</item>
-        <item name="colorPrimary">@color/md_pink_500</item>
-        <item name="colorPrimaryDark">@color/md_pink_700</item>
-    </style>
-
-    <style name="accent1">
-        <item name="android:colorAccent">@color/md_pink_500</item>
-        <item name="colorAccent">@color/md_pink_500</item>
-        <item name="android:colorSecondary">@color/md_pink_500</item>
-        <item name="colorSecondary">@color/md_pink_500</item>
-    </style>
-
-    <style name="primary2">
-        <item name="android:colorPrimary">@color/md_purple_500</item>
-        <item name="android:colorPrimaryDark">@color/md_purple_700</item>
-        <item name="colorPrimary">@color/md_purple_500</item>
-        <item name="colorPrimaryDark">@color/md_purple_700</item>
-    </style>
-
-    <style name="accent2">
-        <item name="android:colorAccent">@color/md_purple_500</item>
-        <item name="colorAccent">@color/md_purple_500</item>
-        <item name="android:colorSecondary">@color/md_purple_500</item>
-        <item name="colorSecondary">@color/md_purple_500</item>
-    </style>
-
-    <style name="primary3">
-        <item name="android:colorPrimary">@color/md_deep_purple_500</item>
-        <item name="android:colorPrimaryDark">@color/md_deep_purple_700</item>
-        <item name="colorPrimary">@color/md_deep_purple_500</item>
-        <item name="colorPrimaryDark">@color/md_deep_purple_700</item>
-    </style>
-
-    <style name="accent3">
-        <item name="android:colorAccent">@color/md_deep_purple_500</item>
-        <item name="colorAccent">@color/md_deep_purple_500</item>
-        <item name="android:colorSecondary">@color/md_deep_purple_500</item>
-        <item name="colorSecondary">@color/md_deep_purple_500</item>
-    </style>
-
-    <style name="primary4">
-        <item name="android:colorPrimary">@color/md_indigo_500</item>
-        <item name="android:colorPrimaryDark">@color/md_indigo_700</item>
-        <item name="colorPrimary">@color/md_indigo_500</item>
-        <item name="colorPrimaryDark">@color/md_indigo_700</item>
-    </style>
-
-    <style name="accent4">
-        <item name="android:colorAccent">@color/md_indigo_500</item>
-        <item name="colorAccent">@color/md_indigo_500</item>
-        <item name="android:colorSecondary">@color/md_indigo_500</item>
-        <item name="colorSecondary">@color/md_indigo_500</item>
-    </style>
-
-    <style name="primary5">
-        <item name="android:colorPrimary">@color/md_blue_500</item>
-        <item name="android:colorPrimaryDark">@color/md_blue_700</item>
-        <item name="colorPrimary">@color/md_blue_500</item>
-        <item name="colorPrimaryDark">@color/md_blue_700</item>
-    </style>
-
-    <style name="accent5">
-        <item name="android:colorAccent">@color/md_blue_500</item>
-        <item name="colorAccent">@color/md_blue_500</item>
-        <item name="android:colorSecondary">@color/md_blue_500</item>
-        <item name="colorSecondary">@color/md_blue_500</item>
-    </style>
-
-    <style name="primary6">
-        <item name="android:colorPrimary">@color/md_light_blue_500</item>
-        <item name="android:colorPrimaryDark">@color/md_light_blue_700</item>
-        <item name="colorPrimary">@color/md_light_blue_500</item>
-        <item name="colorPrimaryDark">@color/md_light_blue_700</item>
-    </style>
-
-    <style name="accent6">
-        <item name="android:colorAccent">@color/md_light_blue_500</item>
-        <item name="colorAccent">@color/md_light_blue_500</item>
-        <item name="android:colorSecondary">@color/md_light_blue_500</item>
-        <item name="colorSecondary">@color/md_light_blue_500</item>
-    </style>
-
-    <style name="primary7">
-        <item name="android:colorPrimary">@color/md_cyan_500</item>
-        <item name="android:colorPrimaryDark">@color/md_cyan_700</item>
-        <item name="colorPrimary">@color/md_cyan_500</item>
-        <item name="colorPrimaryDark">@color/md_cyan_700</item>
-    </style>
-
-    <style name="accent7">
-        <item name="android:colorAccent">@color/md_cyan_500</item>
-        <item name="colorAccent">@color/md_cyan_500</item>
-        <item name="android:colorSecondary">@color/md_cyan_500</item>
-        <item name="colorSecondary">@color/md_cyan_500</item>
-    </style>
-
-    <style name="primary8">
-        <item name="android:colorPrimary">@color/md_teal_500</item>
-        <item name="android:colorPrimaryDark">@color/md_teal_700</item>
-        <item name="colorPrimary">@color/md_teal_500</item>
-        <item name="colorPrimaryDark">@color/md_teal_700</item>
-    </style>
-
-    <style name="accent8">
-        <item name="android:colorAccent">@color/md_teal_500</item>
-        <item name="colorAccent">@color/md_teal_500</item>
-        <item name="android:colorSecondary">@color/md_teal_500</item>
-        <item name="colorSecondary">@color/md_teal_500</item>
-    </style>
-
-    <style name="primary9">
-        <item name="android:colorPrimary">@color/md_green_500</item>
-        <item name="android:colorPrimaryDark">@color/md_green_700</item>
-        <item name="colorPrimary">@color/md_green_500</item>
-        <item name="colorPrimaryDark">@color/md_green_700</item>
-    </style>
-
-    <style name="accent9">
-        <item name="android:colorAccent">@color/md_green_500</item>
-        <item name="colorAccent">@color/md_green_500</item>
-        <item name="android:colorSecondary">@color/md_green_500</item>
-        <item name="colorSecondary">@color/md_green_500</item>
-    </style>
-
-    <style name="primary10">
-        <item name="android:colorPrimary">@color/md_light_green_500</item>
-        <item name="android:colorPrimaryDark">@color/md_light_green_700</item>
-        <item name="colorPrimary">@color/md_light_green_500</item>
-        <item name="colorPrimaryDark">@color/md_light_green_700</item>
-    </style>
-
-    <style name="accent10">
-        <item name="android:colorAccent">@color/md_light_green_500</item>
-        <item name="colorAccent">@color/md_light_green_500</item>
-        <item name="android:colorSecondary">@color/md_light_green_500</item>
-        <item name="colorSecondary">@color/md_light_green_500</item>
-    </style>
-
-    <style name="primary11">
-        <item name="android:colorPrimary">@color/md_lime_500</item>
-        <item name="android:colorPrimaryDark">@color/md_lime_700</item>
-        <item name="colorPrimary">@color/md_lime_500</item>
-        <item name="colorPrimaryDark">@color/md_lime_700</item>
-    </style>
-
-    <style name="accent11">
-        <item name="android:colorAccent">@color/md_lime_500</item>
-        <item name="colorAccent">@color/md_lime_500</item>
-        <item name="android:colorSecondary">@color/md_lime_500</item>
-        <item name="colorSecondary">@color/md_lime_500</item>
-    </style>
-
-    <style name="primary12">
-        <item name="android:colorPrimary">@color/md_yellow_500</item>
-        <item name="android:colorPrimaryDark">@color/md_yellow_700</item>
-        <item name="colorPrimary">@color/md_yellow_500</item>
-        <item name="colorPrimaryDark">@color/md_yellow_700</item>
-    </style>
-
-    <style name="accent12">
-        <item name="android:colorAccent">@color/md_yellow_500</item>
-        <item name="colorAccent">@color/md_yellow_500</item>
-        <item name="android:colorSecondary">@color/md_yellow_500</item>
-        <item name="colorSecondary">@color/md_yellow_500</item>
-    </style>
-
-    <style name="primary13">
-        <item name="android:colorPrimary">@color/md_amber_500</item>
-        <item name="android:colorPrimaryDark">@color/md_amber_700</item>
-        <item name="colorPrimary">@color/md_amber_500</item>
-        <item name="colorPrimaryDark">@color/md_amber_700</item>
-    </style>
-
-    <style name="accent13">
-        <item name="android:colorAccent">@color/md_amber_500</item>
-        <item name="colorAccent">@color/md_amber_500</item>
-        <item name="android:colorSecondary">@color/md_amber_500</item>
-        <item name="colorSecondary">@color/md_amber_500</item>
-    </style>
-
-    <style name="primary14">
-        <item name="android:colorPrimary">@color/md_orange_500</item>
-        <item name="android:colorPrimaryDark">@color/md_orange_700</item>
-        <item name="colorPrimary">@color/md_orange_500</item>
-        <item name="colorPrimaryDark">@color/md_orange_700</item>
-    </style>
-
-    <style name="accent14">
-        <item name="android:colorAccent">@color/md_orange_500</item>
-        <item name="colorAccent">@color/md_orange_500</item>
-        <item name="android:colorSecondary">@color/md_orange_500</item>
-        <item name="colorSecondary">@color/md_orange_500</item>
-    </style>
-
-    <style name="primary15">
-        <item name="android:colorPrimary">@color/md_deep_orange_500</item>
-        <item name="android:colorPrimaryDark">@color/md_deep_orange_700</item>
-        <item name="colorPrimary">@color/md_deep_orange_500</item>
-        <item name="colorPrimaryDark">@color/md_deep_orange_700</item>
-    </style>
-
-    <style name="accent15">
-        <item name="android:colorAccent">@color/md_deep_orange_500</item>
-        <item name="colorAccent">@color/md_deep_orange_500</item>
-        <item name="android:colorSecondary">@color/md_deep_orange_500</item>
-        <item name="colorSecondary">@color/md_deep_orange_500</item>
-    </style>
-
-    <style name="primary16">
-        <item name="android:colorPrimary">@color/md_brown_500</item>
-        <item name="android:colorPrimaryDark">@color/md_brown_700</item>
-        <item name="colorPrimary">@color/md_brown_500</item>
-        <item name="colorPrimaryDark">@color/md_brown_700</item>
-    </style>
-
-    <style name="accent16">
-        <item name="android:colorAccent">@color/md_brown_500</item>
-        <item name="colorAccent">@color/md_brown_500</item>
-        <item name="android:colorSecondary">@color/md_brown_500</item>
-        <item name="colorSecondary">@color/md_brown_500</item>
-    </style>
-
-    <style name="primary17">
-        <item name="android:colorPrimary">@color/md_grey_500</item>
-        <item name="android:colorPrimaryDark">@color/md_grey_700</item>
-        <item name="colorPrimary">@color/md_grey_500</item>
-        <item name="colorPrimaryDark">@color/md_grey_700</item>
-    </style>
-
-    <style name="accent17">
-        <item name="android:colorAccent">@color/md_grey_500</item>
-        <item name="colorAccent">@color/md_grey_500</item>
-        <item name="android:colorSecondary">@color/md_grey_500</item>
-        <item name="colorSecondary">@color/md_grey_500</item>
-    </style>
-
-    <style name="primary18">
-        <item name="android:colorPrimary">@color/md_blue_grey_500</item>
-        <item name="android:colorPrimaryDark">@color/md_blue_grey_700</item>
-        <item name="colorPrimary">@color/md_blue_grey_500</item>
-        <item name="colorPrimaryDark">@color/md_blue_grey_700</item>
-    </style>
-
-    <style name="accent18">
-        <item name="android:colorAccent">@color/md_blue_grey_500</item>
-        <item name="colorAccent">@color/md_blue_grey_500</item>
-        <item name="android:colorSecondary">@color/md_blue_grey_500</item>
-        <item name="colorSecondary">@color/md_blue_grey_500</item>
-    </style>
-
-    <style name="primary19">
-        <item name="android:colorPrimary">@color/md_white_1000</item>
-        <item name="android:colorPrimaryDark">@color/md_white_1000</item>
-        <item name="colorPrimary">@color/md_white_1000</item>
-        <item name="colorPrimaryDark">@color/md_white_1000</item>
-    </style>
-
-    <style name="accent19">
-        <item name="android:colorAccent">@color/md_white_1000</item>
-        <item name="colorAccent">@color/md_white_1000</item>
-        <item name="android:colorSecondary">@color/md_white_1000</item>
-        <item name="colorSecondary">@color/md_white_1000</item>
-    </style>
-
-    <style name="primary20">
-        <item name="android:colorPrimary">@color/md_black_1000</item>
-        <item name="android:colorPrimaryDark">@color/md_black_1000</item>
-        <item name="colorPrimary">@color/md_black_1000</item>
-        <item name="colorPrimaryDark">@color/md_black_1000</item>
-    </style>
-
-    <style name="accent20">
-        <item name="android:colorAccent">@color/md_black_1000</item>
-        <item name="colorAccent">@color/md_black_1000</item>
-        <item name="android:colorSecondary">@color/md_black_1000</item>
-        <item name="colorSecondary">@color/md_black_1000</item>
-    </style>
-
-</resources>
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
index 002e2e1..d596991 100644
--- a/library/src/main/res/values/styles.xml
+++ b/library/src/main/res/values/styles.xml
@@ -1,219 +1,282 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:tools="http://schemas.android.com/tools"  tools:ignore="NewApi">
     <!-- BASE THEMES -->
-    <style name="Colorful.Light" parent="Theme.AppCompat.Light.NoActionBar"/>
-    <style name="Colorful.Dark" parent="Theme.AppCompat.NoActionBar"/>
+    <style name="Colorful.Light" parent="android:Theme.Material.Light.NoActionBar"/>
+    <style name="Colorful.Dark" parent="android:Theme.Material.NoActionBar"/>
     <style name="Colorful.AppCompat.Light" parent="Theme.AppCompat.Light.NoActionBar"/>
     <style name="Colorful.AppCompat.Dark" parent="Theme.AppCompat.NoActionBar"/>
 
     <style name="primary0">
+        <item name="android:colorPrimary">@color/md_red_500</item>
+        <item name="android:colorPrimaryDark">@color/md_red_700</item>
         <item name="colorPrimary">@color/md_red_500</item>
         <item name="colorPrimaryDark">@color/md_red_700</item>
     </style>
 
     <style name="accent0">
+        <item name="android:colorAccent">@color/md_red_500</item>
         <item name="colorAccent">@color/md_red_500</item>
-        <item name="colorSecondary">@color/md_red_500</item>
+        <item name="android:colorSecondary">@color/md_red_500</item>
     </style>
 
     <style name="primary1">
+        <item name="android:colorPrimary" >@color/md_pink_500</item>
+        <item name="android:colorPrimaryDark">@color/md_pink_700</item>
         <item name="colorPrimary">@color/md_pink_500</item>
         <item name="colorPrimaryDark">@color/md_pink_700</item>
     </style>
 
     <style name="accent1">
+        <item name="android:colorAccent">@color/md_pink_500</item>
         <item name="colorAccent">@color/md_pink_500</item>
-        <item name="colorSecondary">@color/md_pink_500</item>
+        <item name="android:colorSecondary">@color/md_pink_500</item>
     </style>
 
     <style name="primary2">
+        <item name="android:colorPrimary">@color/md_purple_500</item>
+        <item name="android:colorPrimaryDark">@color/md_purple_700</item>
         <item name="colorPrimary">@color/md_purple_500</item>
         <item name="colorPrimaryDark">@color/md_purple_700</item>
     </style>
 
     <style name="accent2">
+        <item name="android:colorAccent">@color/md_purple_500</item>
         <item name="colorAccent">@color/md_purple_500</item>
-        <item name="colorSecondary">@color/md_purple_500</item>
+        <item name="android:colorSecondary">@color/md_purple_500</item>
     </style>
 
     <style name="primary3">
+        <item name="android:colorPrimary">@color/md_deep_purple_500</item>
+        <item name="android:colorPrimaryDark">@color/md_deep_purple_700</item>
         <item name="colorPrimary">@color/md_deep_purple_500</item>
         <item name="colorPrimaryDark">@color/md_deep_purple_700</item>
     </style>
 
     <style name="accent3">
+        <item name="android:colorAccent">@color/md_deep_purple_500</item>
         <item name="colorAccent">@color/md_deep_purple_500</item>
-        <item name="colorSecondary">@color/md_deep_purple_500</item>
+        <item name="android:colorSecondary">@color/md_deep_purple_500</item>
     </style>
 
     <style name="primary4">
+        <item name="android:colorPrimary">@color/md_indigo_500</item>
+        <item name="android:colorPrimaryDark">@color/md_indigo_700</item>
         <item name="colorPrimary">@color/md_indigo_500</item>
         <item name="colorPrimaryDark">@color/md_indigo_700</item>
     </style>
 
     <style name="accent4">
+        <item name="android:colorAccent">@color/md_indigo_500</item>
         <item name="colorAccent">@color/md_indigo_500</item>
-        <item name="colorSecondary">@color/md_indigo_500</item>
+        <item name="android:colorSecondary">@color/md_indigo_500</item>
     </style>
 
     <style name="primary5">
+        <item name="android:colorPrimary">@color/md_blue_500</item>
+        <item name="android:colorPrimaryDark">@color/md_blue_700</item>
         <item name="colorPrimary">@color/md_blue_500</item>
         <item name="colorPrimaryDark">@color/md_blue_700</item>
     </style>
 
     <style name="accent5">
+        <item name="android:colorAccent">@color/md_blue_500</item>
         <item name="colorAccent">@color/md_blue_500</item>
-        <item name="colorSecondary">@color/md_blue_500</item>
+        <item name="android:colorSecondary">@color/md_blue_500</item>
     </style>
 
     <style name="primary6">
+        <item name="android:colorPrimary">@color/md_light_blue_500</item>
+        <item name="android:colorPrimaryDark">@color/md_light_blue_700</item>
         <item name="colorPrimary">@color/md_light_blue_500</item>
         <item name="colorPrimaryDark">@color/md_light_blue_700</item>
     </style>
 
     <style name="accent6">
+        <item name="android:colorAccent">@color/md_light_blue_500</item>
         <item name="colorAccent">@color/md_light_blue_500</item>
-        <item name="colorSecondary">@color/md_light_blue_500</item>
+        <item name="android:colorSecondary">@color/md_light_blue_500</item>
     </style>
 
     <style name="primary7">
+        <item name="android:colorPrimary">@color/md_cyan_500</item>
+        <item name="android:colorPrimaryDark">@color/md_cyan_700</item>
         <item name="colorPrimary">@color/md_cyan_500</item>
         <item name="colorPrimaryDark">@color/md_cyan_700</item>
     </style>
 
     <style name="accent7">
+        <item name="android:colorAccent">@color/md_cyan_500</item>
         <item name="colorAccent">@color/md_cyan_500</item>
-        <item name="colorSecondary">@color/md_cyan_500</item>
+        <item name="android:colorSecondary">@color/md_cyan_500</item>
     </style>
 
     <style name="primary8">
+        <item name="android:colorPrimary">@color/md_teal_500</item>
+        <item name="android:colorPrimaryDark">@color/md_teal_700</item>
         <item name="colorPrimary">@color/md_teal_500</item>
         <item name="colorPrimaryDark">@color/md_teal_700</item>
     </style>
 
     <style name="accent8">
+        <item name="android:colorAccent">@color/md_teal_500</item>
         <item name="colorAccent">@color/md_teal_500</item>
-        <item name="colorSecondary">@color/md_teal_500</item>
+        <item name="android:colorSecondary">@color/md_teal_500</item>
     </style>
 
     <style name="primary9">
+        <item name="android:colorPrimary">@color/md_green_500</item>
+        <item name="android:colorPrimaryDark">@color/md_green_700</item>
         <item name="colorPrimary">@color/md_green_500</item>
         <item name="colorPrimaryDark">@color/md_green_700</item>
     </style>
 
     <style name="accent9">
+        <item name="android:colorAccent">@color/md_green_500</item>
         <item name="colorAccent">@color/md_green_500</item>
-        <item name="colorSecondary">@color/md_green_500</item>
+        <item name="android:colorSecondary">@color/md_green_500</item>
     </style>
 
     <style name="primary10">
+        <item name="android:colorPrimary">@color/md_light_green_500</item>
+        <item name="android:colorPrimaryDark">@color/md_light_green_700</item>
         <item name="colorPrimary">@color/md_light_green_500</item>
         <item name="colorPrimaryDark">@color/md_light_green_700</item>
     </style>
 
     <style name="accent10">
+        <item name="android:colorAccent">@color/md_light_green_500</item>
         <item name="colorAccent">@color/md_light_green_500</item>
-        <item name="colorSecondary">@color/md_light_green_500</item>
+        <item name="android:colorSecondary">@color/md_light_green_500</item>
     </style>
 
     <style name="primary11">
+        <item name="android:colorPrimary">@color/md_lime_500</item>
+        <item name="android:colorPrimaryDark">@color/md_lime_700</item>
         <item name="colorPrimary">@color/md_lime_500</item>
         <item name="colorPrimaryDark">@color/md_lime_700</item>
     </style>
 
     <style name="accent11">
+        <item name="android:colorAccent">@color/md_lime_500</item>
         <item name="colorAccent">@color/md_lime_500</item>
-        <item name="colorSecondary">@color/md_lime_500</item>
+        <item name="android:colorSecondary">@color/md_lime_500</item>
     </style>
 
     <style name="primary12">
+        <item name="android:colorPrimary">@color/md_yellow_500</item>
+        <item name="android:colorPrimaryDark">@color/md_yellow_700</item>
         <item name="colorPrimary">@color/md_yellow_500</item>
         <item name="colorPrimaryDark">@color/md_yellow_700</item>
     </style>
 
     <style name="accent12">
+        <item name="android:colorAccent">@color/md_yellow_500</item>
         <item name="colorAccent">@color/md_yellow_500</item>
-        <item name="colorSecondary">@color/md_yellow_500</item>
+        <item name="android:colorSecondary">@color/md_yellow_500</item>
     </style>
 
     <style name="primary13">
+        <item name="android:colorPrimary">@color/md_amber_500</item>
+        <item name="android:colorPrimaryDark">@color/md_amber_700</item>
         <item name="colorPrimary">@color/md_amber_500</item>
         <item name="colorPrimaryDark">@color/md_amber_700</item>
     </style>
 
     <style name="accent13">
+        <item name="android:colorAccent">@color/md_amber_500</item>
         <item name="colorAccent">@color/md_amber_500</item>
-        <item name="colorSecondary">@color/md_amber_500</item>
+        <item name="android:colorSecondary">@color/md_amber_500</item>
     </style>
 
     <style name="primary14">
+        <item name="android:colorPrimary">@color/md_orange_500</item>
+        <item name="android:colorPrimaryDark">@color/md_orange_700</item>
         <item name="colorPrimary">@color/md_orange_500</item>
         <item name="colorPrimaryDark">@color/md_orange_700</item>
     </style>
 
     <style name="accent14">
+        <item name="android:colorAccent">@color/md_orange_500</item>
         <item name="colorAccent">@color/md_orange_500</item>
-        <item name="colorSecondary">@color/md_orange_500</item>
+        <item name="android:colorSecondary">@color/md_orange_500</item>
     </style>
 
     <style name="primary15">
+        <item name="android:colorPrimary">@color/md_deep_orange_500</item>
+        <item name="android:colorPrimaryDark">@color/md_deep_orange_700</item>
         <item name="colorPrimary">@color/md_deep_orange_500</item>
         <item name="colorPrimaryDark">@color/md_deep_orange_700</item>
     </style>
 
     <style name="accent15">
+        <item name="android:colorAccent">@color/md_deep_orange_500</item>
         <item name="colorAccent">@color/md_deep_orange_500</item>
-        <item name="colorSecondary">@color/md_deep_orange_500</item>
+        <item name="android:colorSecondary">@color/md_deep_orange_500</item>
     </style>
 
     <style name="primary16">
+        <item name="android:colorPrimary">@color/md_brown_500</item>
+        <item name="android:colorPrimaryDark">@color/md_brown_700</item>
         <item name="colorPrimary">@color/md_brown_500</item>
         <item name="colorPrimaryDark">@color/md_brown_700</item>
     </style>
 
     <style name="accent16">
+        <item name="android:colorAccent">@color/md_brown_500</item>
         <item name="colorAccent">@color/md_brown_500</item>
-        <item name="colorSecondary">@color/md_brown_500</item>
+        <item name="android:colorSecondary">@color/md_brown_500</item>
     </style>
 
     <style name="primary17">
+        <item name="android:colorPrimary">@color/md_grey_500</item>
+        <item name="android:colorPrimaryDark">@color/md_grey_700</item>
         <item name="colorPrimary">@color/md_grey_500</item>
         <item name="colorPrimaryDark">@color/md_grey_700</item>
     </style>
 
     <style name="accent17">
+        <item name="android:colorAccent">@color/md_grey_500</item>
         <item name="colorAccent">@color/md_grey_500</item>
-        <item name="colorSecondary">@color/md_grey_500</item>
+        <item name="android:colorSecondary">@color/md_grey_500</item>
     </style>
 
     <style name="primary18">
+        <item name="android:colorPrimary">@color/md_blue_grey_500</item>
+        <item name="android:colorPrimaryDark">@color/md_blue_grey_700</item>
         <item name="colorPrimary">@color/md_blue_grey_500</item>
         <item name="colorPrimaryDark">@color/md_blue_grey_700</item>
     </style>
 
     <style name="accent18">
+        <item name="android:colorAccent">@color/md_blue_grey_500</item>
         <item name="colorAccent">@color/md_blue_grey_500</item>
-        <item name="colorSecondary">@color/md_blue_grey_500</item>
+        <item name="android:colorSecondary">@color/md_blue_grey_500</item>
     </style>
 
     <style name="primary19">
+        <item name="android:colorPrimary">@color/md_white_1000</item>
+        <item name="android:colorPrimaryDark">@color/md_white_1000</item>
         <item name="colorPrimary">@color/md_white_1000</item>
         <item name="colorPrimaryDark">@color/md_white_1000</item>
     </style>
 
     <style name="accent19">
+        <item name="android:colorAccent">@color/md_white_1000</item>
         <item name="colorAccent">@color/md_white_1000</item>
-        <item name="colorSecondary">@color/md_white_1000</item>
+        <item name="android:colorSecondary">@color/md_white_1000</item>
     </style>
 
     <style name="primary20">
+        <item name="android:colorPrimary">@color/md_black_1000</item>
+        <item name="android:colorPrimaryDark">@color/md_black_1000</item>
         <item name="colorPrimary">@color/md_black_1000</item>
         <item name="colorPrimaryDark">@color/md_black_1000</item>
     </style>
 
     <style name="accent20">
+        <item name="android:colorAccent">@color/md_black_1000</item>
         <item name="colorAccent">@color/md_black_1000</item>
-        <item name="colorSecondary">@color/md_black_1000</item>
+        <item name="android:colorSecondary">@color/md_black_1000</item>
     </style>
 
 </resources>