From e785bcc1f1e587d5792254641ad3457320a819b5 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sun, 25 Jul 2021 09:36:29 +0200
Subject: [PATCH] Tweak accents

Change-Id: I3ccb799dd430c56fd4d27ef307618e255773d5fa
---
 generate_themes.sh                            | 12 +--
 .../res/values-v23/theme_sc_accent_blue.xml   | 28 +++++++
 .../values-v23/theme_sc_accent_greendark.xml  | 28 +++++++
 .../values-v23/theme_sc_light_accent_blue.xml | 11 +++
 .../theme_sc_light_accent_greendark.xml       | 11 +++
 .../res/values-v27/theme_sc_accent_blue.xml   | 28 +++++++
 .../values-v27/theme_sc_accent_greendark.xml  | 28 +++++++
 .../values-v27/theme_sc_light_accent_blue.xml | 10 +++
 .../theme_sc_light_accent_greendark.xml       | 10 +++
 .../main/res/values/theme_sc_accent_blue.xml  | 81 +++++++++++++++++++
 .../res/values/theme_sc_accent_greendark.xml  | 81 +++++++++++++++++++
 .../res/values/theme_sc_accent_indigo.xml     |  4 +-
 .../main/res/values/theme_sc_accent_lime.xml  |  4 +-
 .../res/values/theme_sc_accent_purple.xml     |  4 +-
 .../res/values/theme_sc_accent_turquoise.xml  |  4 +-
 .../res/values/theme_sc_accent_yellow.xml     |  4 +-
 .../values/theme_sc_light_accent_amber.xml    |  2 +-
 .../res/values/theme_sc_light_accent_blue.xml | 35 ++++++++
 .../theme_sc_light_accent_bluelight.xml       |  2 +-
 .../theme_sc_light_accent_carnation.xml       |  2 +-
 .../res/values/theme_sc_light_accent_cyan.xml |  2 +-
 .../values/theme_sc_light_accent_denim.xml    |  2 +-
 .../res/values/theme_sc_light_accent_gold.xml |  2 +-
 .../theme_sc_light_accent_greendark.xml       | 35 ++++++++
 .../values/theme_sc_light_accent_indigo.xml   |  8 +-
 .../res/values/theme_sc_light_accent_lava.xml |  2 +-
 .../res/values/theme_sc_light_accent_lime.xml |  8 +-
 .../values/theme_sc_light_accent_orange.xml   |  2 +-
 .../res/values/theme_sc_light_accent_pink.xml |  2 +-
 .../values/theme_sc_light_accent_purple.xml   |  2 +-
 .../res/values/theme_sc_light_accent_red.xml  |  2 +-
 .../res/values/theme_sc_light_accent_teal.xml |  2 +-
 .../theme_sc_light_accent_turquoise.xml       |  2 +-
 .../values/theme_sc_light_accent_yellow.xml   |  8 +-
 .../vector/app/features/themes/ThemeUtils.kt  | 10 +++
 vector/src/main/res/values/arrays_sc.xml      | 76 +++++++++--------
 vector/src/main/res/values/strings_sc.xml     |  4 +-
 37 files changed, 485 insertions(+), 73 deletions(-)
 create mode 100644 library/ui-styles/src/main/res/values-v23/theme_sc_accent_blue.xml
 create mode 100644 library/ui-styles/src/main/res/values-v23/theme_sc_accent_greendark.xml
 create mode 100644 library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_blue.xml
 create mode 100644 library/ui-styles/src/main/res/values-v23/theme_sc_light_accent_greendark.xml
 create mode 100644 library/ui-styles/src/main/res/values-v27/theme_sc_accent_blue.xml
 create mode 100644 library/ui-styles/src/main/res/values-v27/theme_sc_accent_greendark.xml
 create mode 100644 library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_blue.xml
 create mode 100644 library/ui-styles/src/main/res/values-v27/theme_sc_light_accent_greendark.xml
 create mode 100644 library/ui-styles/src/main/res/values/theme_sc_accent_blue.xml
 create mode 100644 library/ui-styles/src/main/res/values/theme_sc_accent_greendark.xml
 create mode 100644 library/ui-styles/src/main/res/values/theme_sc_light_accent_blue.xml
 create mode 100644 library/ui-styles/src/main/res/values/theme_sc_light_accent_greendark.xml

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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Blue.v23" parent="AppTheme.Base.SC.Blue">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Dark.Blue.v23" parent="AppTheme.Base.SC.Dark.Blue">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Colored.Blue.v23" parent="AppTheme.Base.SC.Colored.Blue">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Dark.Colored.Blue.v23" parent="AppTheme.Base.SC.Dark.Colored.Blue">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Blue" parent="AppTheme.SC.Blue.v23"/>
+
+    <style name="AppTheme.SC.Dark.Blue" parent="AppTheme.SC.Dark.Blue.v23"/>
+
+    <style name="AppTheme.SC.Colored.Blue" parent="AppTheme.SC.Colored.Blue.v23"/>
+
+    <style name="AppTheme.SC.Dark.Colored.Blue" parent="AppTheme.SC.Dark.Colored.Blue.v23"/>
+
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.GreenDark.v23" parent="AppTheme.Base.SC.GreenDark">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Dark.GreenDark.v23" parent="AppTheme.Base.SC.Dark.GreenDark">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Colored.GreenDark.v23" parent="AppTheme.Base.SC.Colored.GreenDark">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Dark.Colored.GreenDark.v23" parent="AppTheme.Base.SC.Dark.Colored.GreenDark">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.GreenDark" parent="AppTheme.SC.GreenDark.v23"/>
+
+    <style name="AppTheme.SC.Dark.GreenDark" parent="AppTheme.SC.Dark.GreenDark.v23"/>
+
+    <style name="AppTheme.SC.Colored.GreenDark" parent="AppTheme.SC.Colored.GreenDark.v23"/>
+
+    <style name="AppTheme.SC.Dark.Colored.GreenDark" parent="AppTheme.SC.Dark.Colored.GreenDark.v23"/>
+
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Light.Blue.v23" parent="AppTheme.Base.SC.Light.Blue">
+        <item name="android:statusBarColor">@color/background_sc_light_statusbar</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="AppTheme.SC.Light.Blue" parent="AppTheme.SC.Light.Blue.v23"/>
+
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Light.GreenDark.v23" parent="AppTheme.Base.SC.Light.GreenDark">
+        <item name="android:statusBarColor">@color/background_sc_light_statusbar</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+    <style name="AppTheme.SC.Light.GreenDark" parent="AppTheme.SC.Light.GreenDark.v23"/>
+
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Blue.v27" parent="AppTheme.SC.Blue.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Dark.Blue.v27" parent="AppTheme.SC.Dark.Blue.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Colored.Blue.v27" parent="AppTheme.SC.Colored.Blue.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Dark.Colored.Blue.v27" parent="AppTheme.SC.Dark.Colored.Blue.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Blue" parent="AppTheme.SC.Blue.v27" />
+
+    <style name="AppTheme.SC.Dark.Blue" parent="AppTheme.SC.Dark.Blue.v27" />
+
+    <style name="AppTheme.SC.Colored.Blue" parent="AppTheme.SC.Colored.Blue.v27" />
+
+    <style name="AppTheme.SC.Dark.Colored.Blue" parent="AppTheme.SC.Dark.Colored.Blue.v27" />
+
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.GreenDark.v27" parent="AppTheme.SC.GreenDark.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Dark.GreenDark.v27" parent="AppTheme.SC.Dark.GreenDark.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Colored.GreenDark.v27" parent="AppTheme.SC.Colored.GreenDark.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Dark.Colored.GreenDark.v27" parent="AppTheme.SC.Dark.Colored.GreenDark.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.GreenDark" parent="AppTheme.SC.GreenDark.v27" />
+
+    <style name="AppTheme.SC.Dark.GreenDark" parent="AppTheme.SC.Dark.GreenDark.v27" />
+
+    <style name="AppTheme.SC.Colored.GreenDark" parent="AppTheme.SC.Colored.GreenDark.v27" />
+
+    <style name="AppTheme.SC.Dark.Colored.GreenDark" parent="AppTheme.SC.Dark.Colored.GreenDark.v27" />
+
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Light.Blue.v27" parent="AppTheme.SC.Light.Blue.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Light.Blue" parent="AppTheme.SC.Light.Blue.v27" />
+
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.SC.Light.GreenDark.v27" parent="AppTheme.SC.Light.GreenDark.v23">
+        <item name="android:windowLightNavigationBar">false</item>
+    </style>
+
+    <style name="AppTheme.SC.Light.GreenDark" parent="AppTheme.SC.Light.GreenDark.v27" />
+
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- COLORS -->
+
+    <color name="accent_sc_dark_blue">#2196F3</color>
+    <color name="accent_sc_dark_blue_alpha25">#3f2196F3</color>
+    <color name="accent_sc_dark_blue_pale">@color/accent_sc_dark_blue</color>
+    <color name="accent_sc_dark_blue_dark">@color/accent_sc_dark_blue_alpha25</color>
+
+
+    <!-- STYLES -->
+
+    <style name="Vector.BottomSheet.SC.Blue">
+        <item name="android:colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="colorAccent">@color/accent_sc_dark_blue</item>
+    </style>
+
+
+    <!-- THEMES -->
+
+    <style name="AppTheme.Base.SC.Blue">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_blue_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_blue_pale</item>
+        <item name="message_highlight_bg_color">@color/accent_sc_dark_blue_alpha25</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Blue</item>
+    </style>
+
+    <style name="AppTheme.Base.SC.Dark.Blue">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_blue_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_blue_pale</item>
+        <item name="message_highlight_bg_color">@color/accent_sc_dark_blue_alpha25</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Blue</item>
+    </style>
+
+    <style name="AppTheme.Base.SC.Colored.Blue">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_blue_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_blue_pale</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Blue</item>
+
+        <item name="sc_message_bg_outgoing">@color/accent_sc_dark_blue_alpha25</item>
+    </style>
+
+    <style name="AppTheme.Base.SC.Dark.Colored.Blue">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_blue_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_blue_pale</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Blue</item>
+
+        <item name="sc_message_bg_outgoing">@color/accent_sc_dark_blue_alpha25</item>
+    </style>
+
+
+    <style name="AppTheme.SC.Blue" parent="AppTheme.Base.SC.Blue" />
+
+    <style name="AppTheme.SC.Dark.Blue" parent="AppTheme.Base.SC.Dark.Blue" />
+
+    <style name="AppTheme.SC.Colored.Blue" parent="AppTheme.Base.SC.Colored.Blue" />
+
+    <style name="AppTheme.SC.Dark.Colored.Blue" parent="AppTheme.Base.SC.Dark.Colored.Blue" />
+
+
+    <style name="AppTheme.AttachmentsPreview.SC.Blue" parent="AppTheme.Base.SC.Blue"/>
+
+    <style name="AppTheme.Transparent.SC.Blue">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_blue_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_blue</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_blue_pale</item>
+        <item name="message_highlight_bg_color">@color/accent_sc_dark_blue_alpha25</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Blue</item>
+    </style>
+
+</resources>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- COLORS -->
+
+    <color name="accent_sc_dark_greendark">#4CAF50</color>
+    <color name="accent_sc_dark_greendark_alpha25">#3f4CAF50</color>
+    <color name="accent_sc_dark_greendark_pale">@color/accent_sc_dark_greendark</color>
+    <color name="accent_sc_dark_greendark_dark">@color/accent_sc_dark_greendark_alpha25</color>
+
+
+    <!-- STYLES -->
+
+    <style name="Vector.BottomSheet.SC.GreenDark">
+        <item name="android:colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="colorAccent">@color/accent_sc_dark_greendark</item>
+    </style>
+
+
+    <!-- THEMES -->
+
+    <style name="AppTheme.Base.SC.GreenDark">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_greendark_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_greendark_pale</item>
+        <item name="message_highlight_bg_color">@color/accent_sc_dark_greendark_alpha25</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.GreenDark</item>
+    </style>
+
+    <style name="AppTheme.Base.SC.Dark.GreenDark">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_greendark_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_greendark_pale</item>
+        <item name="message_highlight_bg_color">@color/accent_sc_dark_greendark_alpha25</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.GreenDark</item>
+    </style>
+
+    <style name="AppTheme.Base.SC.Colored.GreenDark">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_greendark_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_greendark_pale</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.GreenDark</item>
+
+        <item name="sc_message_bg_outgoing">@color/accent_sc_dark_greendark_alpha25</item>
+    </style>
+
+    <style name="AppTheme.Base.SC.Dark.Colored.GreenDark">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_greendark_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_greendark_pale</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.GreenDark</item>
+
+        <item name="sc_message_bg_outgoing">@color/accent_sc_dark_greendark_alpha25</item>
+    </style>
+
+
+    <style name="AppTheme.SC.GreenDark" parent="AppTheme.Base.SC.GreenDark" />
+
+    <style name="AppTheme.SC.Dark.GreenDark" parent="AppTheme.Base.SC.Dark.GreenDark" />
+
+    <style name="AppTheme.SC.Colored.GreenDark" parent="AppTheme.Base.SC.Colored.GreenDark" />
+
+    <style name="AppTheme.SC.Dark.Colored.GreenDark" parent="AppTheme.Base.SC.Dark.Colored.GreenDark" />
+
+
+    <style name="AppTheme.AttachmentsPreview.SC.GreenDark" parent="AppTheme.Base.SC.GreenDark"/>
+
+    <style name="AppTheme.Transparent.SC.GreenDark">
+        <item name="vctr_reaction_background_on">@color/accent_sc_dark_greendark_dark</item>
+        <item name="colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="android:colorAccent">@color/accent_sc_dark_greendark</item>
+        <item name="colorAccentPale">@color/accent_sc_dark_greendark_pale</item>
+        <item name="message_highlight_bg_color">@color/accent_sc_dark_greendark_alpha25</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.GreenDark</item>
+    </style>
+
+</resources>
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 @@
 
     <!-- COLORS -->
 
-    <color name="accent_sc_dark_indigo">#536DFE</color>
-    <color name="accent_sc_dark_indigo_alpha25">#3f536DFE</color>
+    <color name="accent_sc_dark_indigo">#5C6BC0</color>
+    <color name="accent_sc_dark_indigo_alpha25">#3f5C6BC0</color>
     <color name="accent_sc_dark_indigo_pale">@color/accent_sc_dark_indigo</color>
     <color name="accent_sc_dark_indigo_dark">@color/accent_sc_dark_indigo_alpha25</color>
 
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 @@
 
     <!-- COLORS -->
 
-    <color name="accent_sc_dark_lime">#cddc39</color>
-    <color name="accent_sc_dark_lime_alpha25">#3fcddc39</color>
+    <color name="accent_sc_dark_lime">#AFB42B</color>
+    <color name="accent_sc_dark_lime_alpha25">#3fAFB42B</color>
     <color name="accent_sc_dark_lime_pale">@color/accent_sc_dark_lime</color>
     <color name="accent_sc_dark_lime_dark">@color/accent_sc_dark_lime_alpha25</color>
 
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 @@
 
     <!-- COLORS -->
 
-    <color name="accent_sc_dark_purple">#673ab7</color>
-    <color name="accent_sc_dark_purple_alpha25">#3f673ab7</color>
+    <color name="accent_sc_dark_purple">#9575CD</color>
+    <color name="accent_sc_dark_purple_alpha25">#3f9575CD</color>
     <color name="accent_sc_dark_purple_pale">@color/accent_sc_dark_purple</color>
     <color name="accent_sc_dark_purple_dark">@color/accent_sc_dark_purple_alpha25</color>
 
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 @@
 
     <!-- COLORS -->
 
-    <color name="accent_sc_dark_turquoise">#00FFFF</color>
-    <color name="accent_sc_dark_turquoise_alpha25">#3f00FFFF</color>
+    <color name="accent_sc_dark_turquoise">#00C1C1</color>
+    <color name="accent_sc_dark_turquoise_alpha25">#3f00C1C1</color>
     <color name="accent_sc_dark_turquoise_pale">@color/accent_sc_dark_turquoise</color>
     <color name="accent_sc_dark_turquoise_dark">@color/accent_sc_dark_turquoise_alpha25</color>
 
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 @@
 
     <!-- COLORS -->
 
-    <color name="accent_sc_dark_yellow">#ffeb3b</color>
-    <color name="accent_sc_dark_yellow_alpha25">#3fffeb3b</color>
+    <color name="accent_sc_dark_yellow">#FBC02D</color>
+    <color name="accent_sc_dark_yellow_alpha25">#3fFBC02D</color>
     <color name="accent_sc_dark_yellow_pale">@color/accent_sc_dark_yellow</color>
     <color name="accent_sc_dark_yellow_dark">@color/accent_sc_dark_yellow_alpha25</color>
 
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 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Amber">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_amber_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_amber</item>
         <item name="android:colorAccent">@color/accent_sc_light_amber</item>
         <item name="colorAccentPale">@color/accent_sc_light_amber_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_blue.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_blue.xml
new file mode 100644
index 0000000000..fa95429c30
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_blue.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- COLORS -->
+
+    <color name="accent_sc_light_blue">#2196F3</color>
+    <color name="accent_sc_light_blue_alpha25">#3f2196F3</color>
+    <color name="accent_sc_light_blue_pale">@color/accent_sc_light_blue</color>
+    <color name="accent_sc_light_blue_dark">@color/accent_sc_light_blue_alpha25</color>
+    <color name="accent_sc_light_blue_noalpha12">#e4f2fd</color>
+
+
+    <!-- STYLES -->
+
+    <style name="Vector.BottomSheet.SC.Light.Blue">
+        <item name="android:colorAccent">@color/accent_sc_light_blue</item>
+        <item name="colorAccent">@color/accent_sc_light_blue</item>
+    </style>
+
+
+    <!-- THEMES -->
+
+    <style name="AppTheme.Base.SC.Light.Blue">
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_blue_noalpha12</item>
+        <item name="colorAccent">@color/accent_sc_light_blue</item>
+        <item name="android:colorAccent">@color/accent_sc_light_blue</item>
+        <item name="colorAccentPale">@color/accent_sc_light_blue_pale</item>
+        <item name="sc_message_bg_outgoing">@color/accent_sc_light_blue_noalpha12</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light.Blue</item>
+    </style>
+
+    <!-- Default AppTheme for usage where settings don't apply -->
+    <style name="AppTheme.SC.Light.Blue" parent="AppTheme.Base.SC.Light.Blue" />
+
+</resources>
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 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.BlueLight">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_bluelight_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_bluelight</item>
         <item name="android:colorAccent">@color/accent_sc_light_bluelight</item>
         <item name="colorAccentPale">@color/accent_sc_light_bluelight_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml
index ae4f72483a..0e7b68f606 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_carnation.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Carnation">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_carnation_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_carnation</item>
         <item name="android:colorAccent">@color/accent_sc_light_carnation</item>
         <item name="colorAccentPale">@color/accent_sc_light_carnation_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_cyan.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_cyan.xml
index a9abcc7f55..cd481c5d63 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_cyan.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_cyan.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Cyan">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_cyan_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_cyan</item>
         <item name="android:colorAccent">@color/accent_sc_light_cyan</item>
         <item name="colorAccentPale">@color/accent_sc_light_cyan_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml
index 9ec2c9a456..f1b8ff98a6 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_denim.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Denim">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_denim_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_denim</item>
         <item name="android:colorAccent">@color/accent_sc_light_denim</item>
         <item name="colorAccentPale">@color/accent_sc_light_denim_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_gold.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_gold.xml
index a3eec21751..cff5dbe3ac 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_gold.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_gold.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Gold">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_gold_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_gold</item>
         <item name="android:colorAccent">@color/accent_sc_light_gold</item>
         <item name="colorAccentPale">@color/accent_sc_light_gold_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_greendark.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_greendark.xml
new file mode 100644
index 0000000000..8fa8d36e75
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_greendark.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- COLORS -->
+
+    <color name="accent_sc_light_greendark">#4CAF50</color>
+    <color name="accent_sc_light_greendark_alpha25">#3f4CAF50</color>
+    <color name="accent_sc_light_greendark_pale">@color/accent_sc_light_greendark</color>
+    <color name="accent_sc_light_greendark_dark">@color/accent_sc_light_greendark_alpha25</color>
+    <color name="accent_sc_light_greendark_noalpha12">#e9f5ea</color>
+
+
+    <!-- STYLES -->
+
+    <style name="Vector.BottomSheet.SC.Light.GreenDark">
+        <item name="android:colorAccent">@color/accent_sc_light_greendark</item>
+        <item name="colorAccent">@color/accent_sc_light_greendark</item>
+    </style>
+
+
+    <!-- THEMES -->
+
+    <style name="AppTheme.Base.SC.Light.GreenDark">
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_greendark_noalpha12</item>
+        <item name="colorAccent">@color/accent_sc_light_greendark</item>
+        <item name="android:colorAccent">@color/accent_sc_light_greendark</item>
+        <item name="colorAccentPale">@color/accent_sc_light_greendark_pale</item>
+        <item name="sc_message_bg_outgoing">@color/accent_sc_light_greendark_noalpha12</item>
+        <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light.GreenDark</item>
+    </style>
+
+    <!-- Default AppTheme for usage where settings don't apply -->
+    <style name="AppTheme.SC.Light.GreenDark" parent="AppTheme.Base.SC.Light.GreenDark" />
+
+</resources>
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 @@
 
     <!-- COLORS -->
 
-    <color name="accent_sc_light_indigo">#536DFE</color>
-    <color name="accent_sc_light_indigo_alpha25">#3f536DFE</color>
+    <color name="accent_sc_light_indigo">#5C6BC0</color>
+    <color name="accent_sc_light_indigo_alpha25">#3f5C6BC0</color>
     <color name="accent_sc_light_indigo_pale">@color/accent_sc_light_indigo</color>
     <color name="accent_sc_light_indigo_dark">@color/accent_sc_light_indigo_alpha25</color>
-    <color name="accent_sc_light_indigo_noalpha12">#eaedfe</color>
+    <color name="accent_sc_light_indigo_noalpha12">#ebedf7</color>
 
 
     <!-- STYLES -->
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Indigo">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_indigo_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_indigo</item>
         <item name="android:colorAccent">@color/accent_sc_light_indigo</item>
         <item name="colorAccentPale">@color/accent_sc_light_indigo_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml
index 76c7c5f37f..236fd64a78 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lava.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Lava">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_lava_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_lava</item>
         <item name="android:colorAccent">@color/accent_sc_light_lava</item>
         <item name="colorAccentPale">@color/accent_sc_light_lava_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_lime.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lime.xml
index 3b1effa620..d66629b690 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_lime.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_lime.xml
@@ -3,11 +3,11 @@
 
     <!-- COLORS -->
 
-    <color name="accent_sc_light_lime">#cddc39</color>
-    <color name="accent_sc_light_lime_alpha25">#3fcddc39</color>
+    <color name="accent_sc_light_lime">#C0CA33</color>
+    <color name="accent_sc_light_lime_alpha25">#3fC0CA33</color>
     <color name="accent_sc_light_lime_pale">@color/accent_sc_light_lime</color>
     <color name="accent_sc_light_lime_dark">@color/accent_sc_light_lime_alpha25</color>
-    <color name="accent_sc_light_lime_noalpha12">#f9fae7</color>
+    <color name="accent_sc_light_lime_noalpha12">#f7f8e6</color>
 
 
     <!-- STYLES -->
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Lime">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_lime_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_lime</item>
         <item name="android:colorAccent">@color/accent_sc_light_lime</item>
         <item name="colorAccentPale">@color/accent_sc_light_lime_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_orange.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_orange.xml
index b851d4f8b8..355132abc2 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_orange.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_orange.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Orange">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_orange_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_orange</item>
         <item name="android:colorAccent">@color/accent_sc_light_orange</item>
         <item name="colorAccentPale">@color/accent_sc_light_orange_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_pink.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_pink.xml
index 64bfd077f3..5b483d3f84 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_pink.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_pink.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Pink">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_pink_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_pink</item>
         <item name="android:colorAccent">@color/accent_sc_light_pink</item>
         <item name="colorAccentPale">@color/accent_sc_light_pink_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_purple.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_purple.xml
index c0f3b075d9..9fe9cf1717 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_purple.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_purple.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Purple">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_purple_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_purple</item>
         <item name="android:colorAccent">@color/accent_sc_light_purple</item>
         <item name="colorAccentPale">@color/accent_sc_light_purple_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_red.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_red.xml
index 13c2a374c5..78c26b3fc7 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_red.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_red.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Red">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_red_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_red</item>
         <item name="android:colorAccent">@color/accent_sc_light_red</item>
         <item name="colorAccentPale">@color/accent_sc_light_red_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_teal.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_teal.xml
index 2531306cc7..28f41aa3fa 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_teal.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_teal.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Teal">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_teal_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_teal</item>
         <item name="android:colorAccent">@color/accent_sc_light_teal</item>
         <item name="colorAccentPale">@color/accent_sc_light_teal_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_turquoise.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_turquoise.xml
index 32ca00c0aa..117f962f26 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_turquoise.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_turquoise.xml
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Turquoise">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_turquoise_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_turquoise</item>
         <item name="android:colorAccent">@color/accent_sc_light_turquoise</item>
         <item name="colorAccentPale">@color/accent_sc_light_turquoise_pale</item>
diff --git a/library/ui-styles/src/main/res/values/theme_sc_light_accent_yellow.xml b/library/ui-styles/src/main/res/values/theme_sc_light_accent_yellow.xml
index 8458690933..25fb51739b 100644
--- a/library/ui-styles/src/main/res/values/theme_sc_light_accent_yellow.xml
+++ b/library/ui-styles/src/main/res/values/theme_sc_light_accent_yellow.xml
@@ -3,11 +3,11 @@
 
     <!-- COLORS -->
 
-    <color name="accent_sc_light_yellow">#fdd835</color>
-    <color name="accent_sc_light_yellow_alpha25">#3ffdd835</color>
+    <color name="accent_sc_light_yellow">#FBC02D</color>
+    <color name="accent_sc_light_yellow_alpha25">#3fFBC02D</color>
     <color name="accent_sc_light_yellow_pale">@color/accent_sc_light_yellow</color>
     <color name="accent_sc_light_yellow_dark">@color/accent_sc_light_yellow_alpha25</color>
-    <color name="accent_sc_light_yellow_noalpha12">#fefae6</color>
+    <color name="accent_sc_light_yellow_noalpha12">#fef7e5</color>
 
 
     <!-- STYLES -->
@@ -21,7 +21,7 @@
     <!-- THEMES -->
 
     <style name="AppTheme.Base.SC.Light.Yellow">
-        <!-- SC additions -->
+        <item name="vctr_reaction_background_on">@color/accent_sc_light_yellow_noalpha12</item>
         <item name="colorAccent">@color/accent_sc_light_yellow</item>
         <item name="android:colorAccent">@color/accent_sc_light_yellow</item>
         <item name="colorAccentPale">@color/accent_sc_light_yellow_pale</item>
diff --git a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
index 53cf6be4bb..2a6a0018b1 100644
--- a/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
@@ -400,6 +400,8 @@ object ThemeUtils {
                     "denim" -> R.style.AppTheme_SC_Light_Denim
                     "indigo" -> R.style.AppTheme_SC_Light_Indigo
                     "lava" -> R.style.AppTheme_SC_Light_Lava
+                    "blue" -> R.style.AppTheme_SC_Light_Blue
+                    "greendark" -> R.style.AppTheme_SC_Light_GreenDark
                     // Do not change this comment for automatic light theme insertion
                     else -> resId
                 }
@@ -423,6 +425,8 @@ object ThemeUtils {
                     "denim" -> R.style.AppTheme_SC_Denim
                     "indigo" -> R.style.AppTheme_SC_Indigo
                     "lava" -> R.style.AppTheme_SC_Lava
+                    "blue" -> R.style.AppTheme_SC_Blue
+                    "greendark" -> R.style.AppTheme_SC_GreenDark
                     // Do not change this comment for automatic black theme insertion
                     else -> resId
                 }
@@ -446,6 +450,8 @@ object ThemeUtils {
                     "denim" -> R.style.AppTheme_SC_Dark_Denim
                     "indigo" -> R.style.AppTheme_SC_Dark_Indigo
                     "lava" -> R.style.AppTheme_SC_Dark_Lava
+                    "blue" -> R.style.AppTheme_SC_Dark_Blue
+                    "greendark" -> R.style.AppTheme_SC_Dark_GreenDark
                     // Do not change this comment for automatic dark theme insertion
                     else -> resId
                 }
@@ -469,6 +475,8 @@ object ThemeUtils {
                     "denim" -> R.style.AppTheme_SC_Colored_Denim
                     "indigo" -> R.style.AppTheme_SC_Colored_Indigo
                     "lava" -> R.style.AppTheme_SC_Colored_Lava
+                    "blue" -> R.style.AppTheme_SC_Colored_Blue
+                    "greendark" -> R.style.AppTheme_SC_Colored_GreenDark
                     // Do not change this comment for automatic black colored theme insertion
                     else -> resId
                 }
@@ -492,6 +500,8 @@ object ThemeUtils {
                     "denim" -> R.style.AppTheme_SC_Dark_Colored_Denim
                     "indigo" -> R.style.AppTheme_SC_Dark_Colored_Indigo
                     "lava" -> R.style.AppTheme_SC_Dark_Colored_Lava
+                    "blue" -> R.style.AppTheme_SC_Dark_Colored_Blue
+                    "greendark" -> R.style.AppTheme_SC_Dark_Colored_GreenDark
                     // Do not change this comment for automatic dark colored theme insertion
                     else -> resId
                 }
diff --git a/vector/src/main/res/values/arrays_sc.xml b/vector/src/main/res/values/arrays_sc.xml
index d1741262a9..4291e4f44a 100644
--- a/vector/src/main/res/values/arrays_sc.xml
+++ b/vector/src/main/res/values/arrays_sc.xml
@@ -50,11 +50,17 @@
     </string-array>
 
     <string-array name="sc_accent_color_dark_entries" translatable="false">
-        <item>@string/sc_accent_green</item>
+        <item>@string/sc_accent_greenlight</item>
         <item>@string/sc_accent_amber</item> <!-- Dark Amber name -->
         <item>@string/sc_accent_bluelight</item> <!-- Dark BlueLight name -->
+        <item>@string/sc_accent_blue</item> <!-- Dark Blue name -->
+        <item>@string/sc_accent_carnation</item> <!-- Dark Carnation name -->
         <item>@string/sc_accent_cyan</item> <!-- Dark Cyan name -->
+        <item>@string/sc_accent_denim</item> <!-- Dark Denim name -->
         <item>@string/sc_accent_gold</item> <!-- Dark Gold name -->
+        <item>@string/sc_accent_greendark</item> <!-- Dark GreenDark name -->
+        <item>@string/sc_accent_indigo</item> <!-- Dark Indigo name -->
+        <item>@string/sc_accent_lava</item> <!-- Dark Lava name -->
         <item>@string/sc_accent_lime</item> <!-- Dark Lime name -->
         <item>@string/sc_accent_orange</item> <!-- Dark Orange name -->
         <item>@string/sc_accent_pink</item> <!-- Dark Pink name -->
@@ -63,10 +69,6 @@
         <item>@string/sc_accent_teal</item> <!-- Dark Teal name -->
         <item>@string/sc_accent_turquoise</item> <!-- Dark Turquoise name -->
         <item>@string/sc_accent_yellow</item> <!-- Dark Yellow name -->
-        <item>@string/sc_accent_carnation</item> <!-- Dark Carnation name -->
-        <item>@string/sc_accent_denim</item> <!-- Dark Denim name -->
-        <item>@string/sc_accent_indigo</item> <!-- Dark Indigo name -->
-        <item>@string/sc_accent_lava</item> <!-- Dark Lava name -->
         <!-- do not change this comment for dark accent entry generation -->
     </string-array>
 
@@ -74,8 +76,14 @@
         <item>green</item>
         <item>amber</item> <!-- Dark Amber id -->
         <item>bluelight</item> <!-- Dark BlueLight id -->
+        <item>blue</item> <!-- Dark Blue id -->
+        <item>carnation</item> <!-- Dark Carnation id -->
         <item>cyan</item> <!-- Dark Cyan id -->
+        <item>denim</item> <!-- Dark Denim id -->
         <item>gold</item> <!-- Dark Gold id -->
+        <item>greendark</item> <!-- Dark GreenDark id -->
+        <item>indigo</item> <!-- Dark Indigo id -->
+        <item>lava</item> <!-- Dark Lava id -->
         <item>lime</item> <!-- Dark Lime id -->
         <item>orange</item> <!-- Dark Orange id -->
         <item>pink</item> <!-- Dark Pink id -->
@@ -84,10 +92,6 @@
         <item>teal</item> <!-- Dark Teal id -->
         <item>turquoise</item> <!-- Dark Turquoise id -->
         <item>yellow</item> <!-- Dark Yellow id -->
-        <item>carnation</item> <!-- Dark Carnation id -->
-        <item>denim</item> <!-- Dark Denim id -->
-        <item>indigo</item> <!-- Dark Indigo id -->
-        <item>lava</item> <!-- Dark Lava id -->
         <!-- do not change this comment for dark accent value generation -->
     </string-array>
 
@@ -95,29 +99,37 @@
         <item>#8bc34a</item>
         <item>#ffab00</item> <!-- Dark Amber accent -->
         <item>#03a9f4</item> <!-- Dark BlueLight accent -->
+        <item>#2196F3</item> <!-- Dark Blue accent -->
+        <item>#ffa6c9</item> <!-- Dark Carnation accent -->
         <item>#00bcd4</item> <!-- Dark Cyan accent -->
+        <item>#1560BD</item> <!-- Dark Denim accent -->
         <item>#CFB53B</item> <!-- Dark Gold accent -->
-        <item>#cddc39</item> <!-- Dark Lime accent -->
+        <item>#4CAF50</item> <!-- Dark GreenDark accent -->
+        <item>#5C6BC0</item> <!-- Dark Indigo accent -->
+        <item>#EB0028</item> <!-- Dark Lava accent -->
+        <item>#AFB42B</item> <!-- Dark Lime accent -->
         <item>#ff9800</item> <!-- Dark Orange accent -->
         <item>#f48fb1</item> <!-- Dark Pink accent -->
-        <item>#673ab7</item> <!-- Dark Purple accent -->
+        <item>#9575CD</item> <!-- Dark Purple accent -->
         <item>#ff0000</item> <!-- Dark Red accent -->
         <item>#80cbc4</item> <!-- Dark Teal accent -->
-        <item>#00FFFF</item> <!-- Dark Turquoise accent -->
-        <item>#ffeb3b</item> <!-- Dark Yellow accent -->
-        <item>#ffa6c9</item> <!-- Dark Carnation accent -->
-        <item>#1560BD</item> <!-- Dark Denim accent -->
-        <item>#536DFE</item> <!-- Dark Indigo accent -->
-        <item>#EB0028</item> <!-- Dark Lava accent -->
+        <item>#00C1C1</item> <!-- Dark Turquoise accent -->
+        <item>#FBC02D</item> <!-- Dark Yellow accent -->
         <!-- do not change this comment for dark accent preview generation -->
     </string-array>
 
     <string-array name="sc_accent_color_light_entries" translatable="false">
-        <item>@string/sc_accent_green</item>
+        <item>@string/sc_accent_greenlight</item>
         <item>@string/sc_accent_amber</item> <!-- Light Amber name -->
         <item>@string/sc_accent_bluelight</item> <!-- Light BlueLight name -->
+        <item>@string/sc_accent_blue</item> <!-- Light Blue name -->
+        <item>@string/sc_accent_carnation</item> <!-- Light Carnation name -->
         <item>@string/sc_accent_cyan</item> <!-- Light Cyan name -->
+        <item>@string/sc_accent_denim</item> <!-- Light Denim name -->
         <item>@string/sc_accent_gold</item> <!-- Light Gold name -->
+        <item>@string/sc_accent_greendark</item> <!-- Light GreenDark name -->
+        <item>@string/sc_accent_indigo</item> <!-- Light Indigo name -->
+        <item>@string/sc_accent_lava</item> <!-- Light Lava name -->
         <item>@string/sc_accent_lime</item> <!-- Light Lime name -->
         <item>@string/sc_accent_orange</item> <!-- Light Orange name -->
         <item>@string/sc_accent_pink</item> <!-- Light Pink name -->
@@ -126,10 +138,6 @@
         <item>@string/sc_accent_teal</item> <!-- Light Teal name -->
         <item>@string/sc_accent_turquoise</item> <!-- Light Turquoise name -->
         <item>@string/sc_accent_yellow</item> <!-- Light Yellow name -->
-        <item>@string/sc_accent_carnation</item> <!-- Light Carnation name -->
-        <item>@string/sc_accent_denim</item> <!-- Light Denim name -->
-        <item>@string/sc_accent_indigo</item> <!-- Light Indigo name -->
-        <item>@string/sc_accent_lava</item> <!-- Light Lava name -->
         <!-- do not change this comment for light accent entry generation -->
     </string-array>
 
@@ -137,8 +145,14 @@
         <item>green</item>
         <item>amber</item> <!-- Light Amber id -->
         <item>bluelight</item> <!-- Light BlueLight id -->
+        <item>blue</item> <!-- Light Blue id -->
+        <item>carnation</item> <!-- Light Carnation id -->
         <item>cyan</item> <!-- Light Cyan id -->
+        <item>denim</item> <!-- Light Denim id -->
         <item>gold</item> <!-- Light Gold id -->
+        <item>greendark</item> <!-- Light GreenDark id -->
+        <item>indigo</item> <!-- Light Indigo id -->
+        <item>lava</item> <!-- Light Lava id -->
         <item>lime</item> <!-- Light Lime id -->
         <item>orange</item> <!-- Light Orange id -->
         <item>pink</item> <!-- Light Pink id -->
@@ -147,10 +161,6 @@
         <item>teal</item> <!-- Light Teal id -->
         <item>turquoise</item> <!-- Light Turquoise id -->
         <item>yellow</item> <!-- Light Yellow id -->
-        <item>carnation</item> <!-- Light Carnation id -->
-        <item>denim</item> <!-- Light Denim id -->
-        <item>indigo</item> <!-- Light Indigo id -->
-        <item>lava</item> <!-- Light Lava id -->
         <!-- do not change this comment for light accent value generation -->
     </string-array>
 
@@ -158,20 +168,22 @@
         <item>#8bc34a</item>
         <item>#ffa000</item> <!-- Light Amber accent -->
         <item>#03a9f4</item> <!-- Light BlueLight accent -->
+        <item>#2196F3</item> <!-- Light Blue accent -->
+        <item>#fb83b2</item> <!-- Light Carnation accent -->
         <item>#00bcd4</item> <!-- Light Cyan accent -->
+        <item>#1560BD</item> <!-- Light Denim accent -->
         <item>#CFB53B</item> <!-- Light Gold accent -->
-        <item>#cddc39</item> <!-- Light Lime accent -->
+        <item>#4CAF50</item> <!-- Light GreenDark accent -->
+        <item>#5C6BC0</item> <!-- Light Indigo accent -->
+        <item>#B20120</item> <!-- Light Lava accent -->
+        <item>#C0CA33</item> <!-- Light Lime accent -->
         <item>#ff9800</item> <!-- Light Orange accent -->
         <item>#e91e63</item> <!-- Light Pink accent -->
         <item>#673ab7</item> <!-- Light Purple accent -->
         <item>#ff0000</item> <!-- Light Red accent -->
         <item>#008577</item> <!-- Light Teal accent -->
         <item>#00C1C1</item> <!-- Light Turquoise accent -->
-        <item>#fdd835</item> <!-- Light Yellow accent -->
-        <item>#fb83b2</item> <!-- Light Carnation accent -->
-        <item>#1560BD</item> <!-- Light Denim accent -->
-        <item>#536DFE</item> <!-- Light Indigo accent -->
-        <item>#B20120</item> <!-- Light Lava accent -->
+        <item>#FBC02D</item> <!-- Light Yellow accent -->
         <!-- do not change this comment for light accent preview generation -->
     </string-array>
 
diff --git a/vector/src/main/res/values/strings_sc.xml b/vector/src/main/res/values/strings_sc.xml
index 393b017ace..26926a90f8 100644
--- a/vector/src/main/res/values/strings_sc.xml
+++ b/vector/src/main/res/values/strings_sc.xml
@@ -85,7 +85,8 @@
     <string name="settings_sc_accent_disclaimer">Note that these color settings only apply to SC themes, and not Element themes.</string>
 
     <!-- Accent colors -->
-    <string name="sc_accent_green">Green</string>
+    <string name="sc_accent_greenlight">Light green</string>
+    <string name="sc_accent_greendark">Dark green</string>
     <string name="sc_accent_amber">Amber</string>
     <string name="sc_accent_bluelight">Light blue</string>
     <string name="sc_accent_cyan">Cyan</string>
@@ -102,6 +103,7 @@
     <string name="sc_accent_denim">Denim</string>
     <string name="sc_accent_indigo">Indigo</string>
     <string name="sc_accent_lava">Lava</string>
+    <string name="sc_accent_blue">Blue</string>
     <!-- do not change this comment for accent generation -->
 
 </resources>