diff --git a/generate_themes.sh b/generate_themes.sh
index 09fb9050a1..81e2c6d03d 100755
--- a/generate_themes.sh
+++ b/generate_themes.sh
@@ -163,25 +163,27 @@ function generate_accent() {
generate_accent "Amber" "#ffa000" "#ffab00"
generate_accent "BlueLight" "#03a9f4" "#03a9f4" "Light blue"
+generate_accent "Blue" "#2196F3" "#2196F3"
generate_accent "Carnation" "#fb83b2" "#ffa6c9"
generate_accent "Cyan" "#00bcd4" "#00bcd4"
generate_accent "Denim" "#1560BD" "#1560BD"
generate_accent "Gold" "#CFB53B" "#CFB53B"
#generate_accent "GreenLight" "#8bc34a" "#8bc34a" "Light green"
+generate_accent "GreenDark" "#4CAF50" "#4CAF50" "Dark green"
#generate_accent "Grey" "#808080" "#808080"
#generate_accent "Hope" "#5fc72d" "#59ff3a"
-generate_accent "Indigo" "#536DFE" "#536DFE"
+generate_accent "Indigo" "#5C6BC0" "#5C6BC0"
generate_accent "Lava" "#B20120" "#EB0028"
-generate_accent "Lime" "#cddc39" "#cddc39"
+generate_accent "Lime" "#C0CA33" "#AFB42B"
generate_accent "Orange" "#ff9800" "#ff9800"
#generate_accent "Oxygen" "#53ADEF" "#53ADEF"
generate_accent "Pink" "#e91e63" "#f48fb1"
#generate_accent "Pixel" "#4285f4" "#3367d6"
-generate_accent "Purple" "#673ab7" "#673ab7"
+generate_accent "Purple" "#673ab7" "#9575CD"
generate_accent "Red" "#ff0000" "#ff0000"
generate_accent "Teal" "#008577" "#80cbc4"
-generate_accent "Turquoise" "#00C1C1" "#00FFFF"
-generate_accent "Yellow" "#fdd835" "#ffeb3b"
+generate_accent "Turquoise" "#00C1C1" "#00C1C1"
+generate_accent "Yellow" "#FBC02D" "#FBC02D"
# We have foreground on accent colors, better skip these
#generate_accent "Grey" "#808080" "#808080"
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_accent_blue.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_blue.xml
new file mode 100644
index 0000000000..cfc419bbce
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_blue.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_accent_greendark.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_greendark.xml
new file mode 100644
index 0000000000..326964cbae
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_accent_greendark.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_blue.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_blue.xml
new file mode 100644
index 0000000000..13dcc44095
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_blue.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_greendark.xml b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_greendark.xml
new file mode 100644
index 0000000000..58d54ef8a7
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_greendark.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_accent_blue.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_blue.xml
new file mode 100644
index 0000000000..1733a17e71
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_blue.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_accent_greendark.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_greendark.xml
new file mode 100644
index 0000000000..5a9bd0324c
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_accent_greendark.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_blue.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_blue.xml
new file mode 100644
index 0000000000..6ce7aa6a16
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_blue.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_greendark.xml b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_greendark.xml
new file mode 100644
index 0000000000..069c7d0cae
--- /dev/null
+++ b/library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_greendark.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_blue.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_blue.xml
new file mode 100644
index 0000000000..105394db5f
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_blue.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+ #2196F3
+ #3f2196F3
+ @color/accent_sc_dark_blue
+ @color/accent_sc_dark_blue_alpha25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_greendark.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_greendark.xml
new file mode 100644
index 0000000000..7df6dcdf93
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_greendark.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+ #4CAF50
+ #3f4CAF50
+ @color/accent_sc_dark_greendark
+ @color/accent_sc_dark_greendark_alpha25
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml
index 32c04035b2..0ccbc84d2c 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_indigo.xml
@@ -3,8 +3,8 @@
- #536DFE
- #3f536DFE
+ #5C6BC0
+ #3f5C6BC0
@color/accent_sc_dark_indigo
@color/accent_sc_dark_indigo_alpha25
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_lime.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_lime.xml
index 71f7a2e255..31759cecdf 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_accent_lime.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_lime.xml
@@ -3,8 +3,8 @@
- #cddc39
- #3fcddc39
+ #AFB42B
+ #3fAFB42B
@color/accent_sc_dark_lime
@color/accent_sc_dark_lime_alpha25
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_purple.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_purple.xml
index 9d734671c3..f04002be8e 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_accent_purple.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_purple.xml
@@ -3,8 +3,8 @@
- #673ab7
- #3f673ab7
+ #9575CD
+ #3f9575CD
@color/accent_sc_dark_purple
@color/accent_sc_dark_purple_alpha25
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_turquoise.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_turquoise.xml
index 19e537f929..8b543bc6a7 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_accent_turquoise.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_turquoise.xml
@@ -3,8 +3,8 @@
- #00FFFF
- #3f00FFFF
+ #00C1C1
+ #3f00C1C1
@color/accent_sc_dark_turquoise
@color/accent_sc_dark_turquoise_alpha25
diff --git a/library/ui-styles/src/main/res/values/theme_sc_accent_yellow.xml b/library/ui-styles/src/main/res/values/theme_sc_accent_yellow.xml
index e7d360ac06..3563f5b2c8 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_accent_yellow.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_accent_yellow.xml
@@ -3,8 +3,8 @@
- #ffeb3b
- #3fffeb3b
+ #FBC02D
+ #3fFBC02D
@color/accent_sc_dark_yellow
@color/accent_sc_dark_yellow_alpha25
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_amber.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_amber.xml
index fdf9647e50..60137ad43b 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_amber.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_amber.xml
@@ -21,7 +21,7 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_bluelight.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_bluelight.xml
index 96584f8194..c10ecd5699 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_bluelight.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_bluelight.xml
@@ -21,7 +21,7 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml
index e7748cc2b2..8fb98b11a2 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_indigo.xml
@@ -3,11 +3,11 @@
- #536DFE
- #3f536DFE
+ #5C6BC0
+ #3f5C6BC0
@color/accent_sc_light_indigo
@color/accent_sc_light_indigo_alpha25
- #eaedfe
+ #ebedf7
@@ -21,7 +21,7 @@