diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e033fea8a..042a7473a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -24,71 +24,156 @@
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ecb63c05c..83a94535b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,44 +3,299 @@
#AA000000
#EEFFFFFF
- #F1395E
- #EF5350
- #EDE3E4
+ #0058CB
+ #FFFFFF
+ #D9E2FF
+ #001945
+ #575E71
+ #FFFFFF
+ #DCE2F9
+ #141B2C
+ #725572
+ #FFFFFF
+ #FDD7FA
+ #2A132C
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FEFBFF
+ #1B1B1F
+ #FEFBFF
+ #1B1B1F
+ #E1E2EC
+ #44464F
+ #757780
+ #F2F0F4
+ #303034
+ #B0C6FF
+ #000000
+ #0058CB
+ #0058CB
+ #B0C6FF
+ #002D6F
+ #00429B
+ #D9E2FF
+ #C0C6DC
+ #293042
+ #404659
+ #DCE2F9
+ #E0BBDD
+ #412742
+ #593D5A
+ #FDD7FA
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #1B1B1F
+ #E3E2E6
+ #1B1B1F
+ #E3E2E6
+ #44464F
+ #C5C6D0
+ #8F9099
+ #1B1B1F
+ #E3E2E6
+ #0058CB
+ #000000
+ #B0C6FF
+ #B0C6FF
- #C96052
- #D25545
- #1B0B09
+ #9F4034
+ #FFFFFF
+ #FFDAD5
+ #410000
+ #775652
+ #FFFFFF
+ #FFDAD5
+ #2C1512
+ #705C2E
+ #FFFFFF
+ #FCDFA6
+ #251A00
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FFFBFF
+ #201A19
+ #FFFBFF
+ #201A19
+ #F5DDDA
+ #534341
+ #857370
+ #FBEEEC
+ #362F2E
+ #FFB4A9
+ #000000
+ #9F4034
+ #9F4034
+ #FFB4A9
+ #61120C
+ #7F291F
+ #FFDAD5
+ #E7BDB6
+ #442925
+ #5D3F3B
+ #FFDAD5
+ #DEC38C
+ #3E2E04
+ #574419
+ #FCDFA6
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #201A19
+ #EDE0DE
+ #201A19
+ #EDE0DE
+ #534341
+ #D8C2BE
+ #A08C89
+ #201A19
+ #EDE0DE
+ #9F4034
+ #000000
+ #FFB4A9
+ #FFB4A9
- #1F75FE
- #66A1FE
- #e3e1fb
+ #745B00
+ #FFFFFF
+ #FFE08D
+ #241A00
+ #695D3F
+ #FFFFFF
+ #F2E1BB
+ #231B04
+ #47664A
+ #FFFFFF
+ #C9ECC8
+ #04210B
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FFFBFF
+ #1E1B16
+ #FFFBFF
+ #1E1B16
+ #EBE1CF
+ #4C4639
+ #7E7667
+ #F7F0E7
+ #33302A
+ #EBC248
+ #000000
+ #745B00
+ #745B00
+ #EBC248
+ #3D2F00
+ #584400
+ #FFE08D
+ #D5C5A1
+ #392F15
+ #50462A
+ #F2E1BB
+ #ADCFAD
+ #19361F
+ #304D34
+ #C9ECC8
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #1E1B16
+ #E8E1D9
+ #1E1B16
+ #E8E1D9
+ #4C4639
+ #CFC5B4
+ #989080
+ #1E1B16
+ #E8E1D9
+ #745B00
+ #000000
+ #EBC248
+ #EBC248
- #1F75FE
- #0146B6
- #0A0B15
+ #3E6A00
+ #FFFFFF
+ #B9F474
+ #0F2000
+ #576249
+ #FFFFFF
+ #DBE7C8
+ #151E0B
+ #386663
+ #FFFFFF
+ #BBECE8
+ #00201E
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FDFCF5
+ #1B1C18
+ #FDFCF5
+ #1B1C18
+ #E1E4D5
+ #44483D
+ #75796C
+ #F2F1E9
+ #30312C
+ #9ED75B
+ #000000
+ #3E6A00
+ #3E6A00
+ #9ED75B
+ #1E3700
+ #2E4F00
+ #B9F474
+ #BFCBAD
+ #2A331E
+ #404A33
+ #DBE7C8
+ #A0D0CC
+ #003735
+ #1F4E4B
+ #BBECE8
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #1B1C18
+ #E3E3DB
+ #1B1C18
+ #E3E3DB
+ #44483D
+ #C5C8BA
+ #8E9285
+ #1B1C18
+ #E3E3DB
+ #3E6A00
+ #000000
+ #9ED75B
+ #9ED75B
- #FFA000
- #FFB300
- #FFF8E1
-
- #D9B95C
- #D1B956
- #19160B
-
- #7CB342
- #8BC34A
- #E8EFE2
-
- #8BC34A
- #33681E
- #0B1307
-
- #7E57C2
- #B39DDB
- #EFEBF6
-
- #AA6F6B
- #8F415B
- #201015
+ #9B3489
+ #FFFFFF
+ #FFD7F0
+ #3A0032
+ #6F5767
+ #FFFFFF
+ #F9DAEC
+ #281623
+ #815341
+ #FFFFFF
+ #FFDBCE
+ #321205
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FFFBFF
+ #1F1A1D
+ #FFFBFF
+ #1F1A1D
+ #EFDEE6
+ #4F444A
+ #81737B
+ #F8EEF1
+ #342F32
+ #FFACE7
+ #000000
+ #9B3489
+ #9B3489
+ #FFACE7
+ #5E0052
+ #7E186F
+ #FFD7F0
+ #DCBED0
+ #3E2A38
+ #56404F
+ #F9DAEC
+ #F5B9A2
+ #4B2617
+ #663C2B
+ #FFDBCE
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #1F1A1D
+ #EAE0E3
+ #1F1A1D
+ #EAE0E3
+ #4F444A
+ #D2C2CA
+ #9B8D94
+ #1F1A1D
+ #EAE0E3
+ #9B3489
+ #000000
+ #FFACE7
+ #FFACE7
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 82bee1768..8db722ec0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -24,76 +24,156 @@