diff --git a/CHANGELOG.md b/CHANGELOG.md
index b16c3a5ada..55d7c729ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,7 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `Key "extension-XXX-YYY" was already used` crash (@AntsyLich)
- Navigation layout tap zones shifting after zooming out in webtoon readers (@FooIbar)
- Some extension not loading due to missing classes (@AwkwardPeak7)
-- Theme colors in accordance to upstream changes (@CrepeTF)
+- Theme colors in accordance to upstream changes (@CrepeTF, @AntsyLich)
- Crash when requesting folder access on non-conforming devices (@mainrs)
- Bugged color for Date/Scanlator in chapter list for read chapters (@ivaniskandar)
- Categories having same `order` after restoring backup (@Cologler)
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 24200c4077..c79fcf02ae 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -4,8 +4,13 @@
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2e6458eca8..d0fb6fca75 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -15,6 +15,7 @@
- @color/tachiyomi_onPrimary
- @color/tachiyomi_primaryContainer
- @color/tachiyomi_onPrimaryContainer
+ - @color/tachiyomi_inversePrimary
- @color/tachiyomi_secondary
- @color/tachiyomi_onSecondary
- @color/tachiyomi_secondaryContainer
@@ -29,14 +30,20 @@
- @color/tachiyomi_onSurface
- @color/tachiyomi_surfaceVariant
- @color/tachiyomi_onSurfaceVariant
- - @color/tachiyomi_outline
- - @color/tachiyomi_inverseOnSurface
+ - @color/tachiyomi_surfaceTint
- @color/tachiyomi_inverseSurface
- - @color/tachiyomi_primaryInverse
- - @color/error
- - @color/onError
- - @color/errorContainer
- - @color/onErrorContainer
+ - @color/tachiyomi_inverseOnSurface
+ - @color/tachiyomi_error
+ - @color/tachiyomi_onError
+ - @color/tachiyomi_errorContainer
+ - @color/tachiyomi_onErrorContainer
+ - @color/tachiyomi_outline
+ - @color/tachiyomi_outlineVariant
+ - @color/tachiyomi_surfaceContainer
+ - @color/tachiyomi_surfaceContainerHigh
+ - @color/tachiyomi_surfaceContainerHighest
+ - @color/tachiyomi_surfaceContainerLow
+ - @color/tachiyomi_surfaceContainerLowest
- @color/divider_default
- @drawable/line_divider
@@ -52,7 +59,7 @@
- @bool/lightStatusBar
- @android:color/transparent
- - @color/surface_amoled
+ - @color/amoled_surface
- @null
- false
- false
@@ -91,6 +98,7 @@
- @color/greenapple_onPrimary
- @color/greenapple_primaryContainer
- @color/greenapple_onPrimaryContainer
+ - @color/greenapple_inversePrimary
- @color/greenapple_secondary
- @color/greenapple_onSecondary
- @color/greenapple_secondaryContainer
@@ -105,10 +113,22 @@
- @color/greenapple_onSurface
- @color/greenapple_surfaceVariant
- @color/greenapple_onSurfaceVariant
- - @color/greenapple_outline
- - @color/greenapple_inverseOnSurface
- @color/greenapple_inverseSurface
- - @color/greenapple_primaryInverse
+ - @color/greenapple_inverseOnSurface
+ - @color/greenapple_error
+ - @color/greenapple_onError
+ - @color/greenapple_errorContainer
+ - @color/greenapple_onErrorContainer
+ - @color/greenapple_outline
+ - @color/greenapple_outlineVariant
+ - @color/greenapple_scrim
+ - @color/greenapple_surfaceBright
+ - @color/greenapple_surfaceDim
+ - @color/greenapple_surfaceContainer
+ - @color/greenapple_surfaceContainerHigh
+ - @color/greenapple_surfaceContainerHighest
+ - @color/greenapple_surfaceContainerLow
+ - @color/greenapple_surfaceContainerLowest
@@ -118,6 +138,7 @@
- @color/lavender_onPrimary
- @color/lavender_primaryContainer
- @color/lavender_onPrimaryContainer
+ - @color/lavender_inversePrimary
- @color/lavender_secondary
- @color/lavender_onSecondary
- @color/lavender_secondaryContainer
@@ -132,11 +153,22 @@
- @color/lavender_onSurface
- @color/lavender_surfaceVariant
- @color/lavender_onSurfaceVariant
- - @color/lavender_outline
- - @color/lavender_inverseOnSurface
- @color/lavender_inverseSurface
- - @color/lavender_primaryInverse
- - @color/lavender_elevationOverlay
+ - @color/lavender_inverseOnSurface
+ - @color/lavender_error
+ - @color/lavender_onError
+ - @color/lavender_errorContainer
+ - @color/lavender_onErrorContainer
+ - @color/lavender_outline
+ - @color/lavender_outlineVariant
+ - @color/lavender_scrim
+ - @color/lavender_surfaceBright
+ - @color/lavender_surfaceDim
+ - @color/lavender_surfaceContainer
+ - @color/lavender_surfaceContainerHigh
+ - @color/lavender_surfaceContainerHighest
+ - @color/lavender_surfaceContainerLow
+ - @color/lavender_surfaceContainerLowest
@@ -146,6 +178,7 @@
- @color/midnightdusk_onPrimary
- @color/midnightdusk_primaryContainer
- @color/midnightdusk_onPrimaryContainer
+ - @color/midnightdusk_inversePrimary
- @color/midnightdusk_secondary
- @color/midnightdusk_onSecondary
- @color/midnightdusk_secondaryContainer
@@ -160,11 +193,15 @@
- @color/midnightdusk_onSurface
- @color/midnightdusk_surfaceVariant
- @color/midnightdusk_onSurfaceVariant
- - @color/midnightdusk_outline
- - @color/midnightdusk_inverseOnSurface
+ - @color/midnightdusk_surfaceTint
- @color/midnightdusk_inverseSurface
- - @color/midnightdusk_primaryInverse
- - @color/midnightdusk_elevationOverlay
+ - @color/midnightdusk_inverseOnSurface
+ - @color/midnightdusk_outline
+ - @color/midnightdusk_surfaceContainer
+ - @color/midnightdusk_surfaceContainerHigh
+ - @color/midnightdusk_surfaceContainerHighest
+ - @color/midnightdusk_surfaceContainerLow
+ - @color/midnightdusk_surfaceContainerLowest
@@ -174,6 +211,7 @@
- @color/strawberry_onPrimary
- @color/strawberry_primaryContainer
- @color/strawberry_onPrimaryContainer
+ - @color/strawberry_inversePrimary
- @color/strawberry_secondary
- @color/strawberry_onSecondary
- @color/strawberry_secondaryContainer
@@ -188,10 +226,22 @@
- @color/strawberry_onSurface
- @color/strawberry_surfaceVariant
- @color/strawberry_onSurfaceVariant
- - @color/strawberry_outline
- - @color/strawberry_inverseOnSurface
- @color/strawberry_inverseSurface
- - @color/strawberry_primaryInverse
+ - @color/strawberry_inverseOnSurface
+ - @color/strawberry_error
+ - @color/strawberry_onError
+ - @color/strawberry_errorContainer
+ - @color/strawberry_onErrorContainer
+ - @color/strawberry_outline
+ - @color/strawberry_outlineVariant
+ - @color/strawberry_scrim
+ - @color/strawberry_surfaceBright
+ - @color/strawberry_surfaceDim
+ - @color/strawberry_surfaceContainer
+ - @color/strawberry_surfaceContainerHigh
+ - @color/strawberry_surfaceContainerHighest
+ - @color/strawberry_surfaceContainerLow
+ - @color/strawberry_surfaceContainerLowest
@@ -201,6 +251,7 @@
- @color/tako_onPrimary
- @color/tako_primaryContainer
- @color/tako_onPrimaryContainer
+ - @color/tako_inversePrimary
- @color/tako_secondary
- @color/tako_onSecondary
- @color/tako_secondaryContainer
@@ -215,11 +266,15 @@
- @color/tako_onSurface
- @color/tako_surfaceVariant
- @color/tako_onSurfaceVariant
- - @color/tako_outline
- - @color/tako_inverseOnSurface
+ - @color/tako_surfaceTint
- @color/tako_inverseSurface
- - @color/tako_primaryInverse
- - @color/tako_elevationOverlay
+ - @color/tako_inverseOnSurface
+ - @color/tako_outline
+ - @color/tako_surfaceContainer
+ - @color/tako_surfaceContainerHigh
+ - @color/tako_surfaceContainerHighest
+ - @color/tako_surfaceContainerLow
+ - @color/tako_surfaceContainerLowest
@@ -229,6 +284,7 @@
- @color/tealturquoise_onPrimary
- @color/tealturquoise_primaryContainer
- @color/tealturquoise_onPrimaryContainer
+ - @color/tealturquoise_inversePrimary
- @color/tealturquoise_secondary
- @color/tealturquoise_onSecondary
- @color/tealturquoise_secondaryContainer
@@ -243,13 +299,15 @@
- @color/tealturquoise_onSurface
- @color/tealturquoise_surfaceVariant
- @color/tealturquoise_onSurfaceVariant
- - @color/tealturquoise_outline
- - @color/tealturquoise_inverseOnSurface
+ - @color/tealturquoise_surfaceTint
- @color/tealturquoise_inverseSurface
- - @color/tealturquoise_primaryInverse
- - @color/tealturquoise_tertiary
- - @color/tealturquoise_onTertiary
- - @color/tealturquoise_elevationOverlay
+ - @color/tealturquoise_inverseOnSurface
+ - @color/tealturquoise_outline
+ - @color/tealturquoise_surfaceContainer
+ - @color/tealturquoise_surfaceContainerHigh
+ - @color/tealturquoise_surfaceContainerHighest
+ - @color/tealturquoise_surfaceContainerLow
+ - @color/tealturquoise_surfaceContainerLowest
@@ -259,6 +317,7 @@
- @color/yinyang_onPrimary
- @color/yinyang_primaryContainer
- @color/yinyang_onPrimaryContainer
+ - @color/yinyang_inversePrimary
- @color/yinyang_secondary
- @color/yinyang_onSecondary
- @color/yinyang_secondaryContainer
@@ -273,10 +332,15 @@
- @color/yinyang_onSurface
- @color/yinyang_surfaceVariant
- @color/yinyang_onSurfaceVariant
- - @color/yinyang_outline
- - @color/yinyang_inverseOnSurface
+ - @color/yinyang_surfaceTint
- @color/yinyang_inverseSurface
- - @color/yinyang_primaryInverse
+ - @color/yinyang_inverseOnSurface
+ - @color/yinyang_outline
+ - @color/yinyang_surfaceContainer
+ - @color/yinyang_surfaceContainerHigh
+ - @color/yinyang_surfaceContainerHighest
+ - @color/yinyang_surfaceContainerLow
+ - @color/yinyang_surfaceContainerLowest
@@ -286,6 +350,7 @@
- @color/yotsuba_onPrimary
- @color/yotsuba_primaryContainer
- @color/yotsuba_onPrimaryContainer
+ - @color/yotsuba_inversePrimary
- @color/yotsuba_secondary
- @color/yotsuba_onSecondary
- @color/yotsuba_secondaryContainer
@@ -300,10 +365,15 @@
- @color/yotsuba_onSurface
- @color/yotsuba_surfaceVariant
- @color/yotsuba_onSurfaceVariant
- - @color/yotsuba_outline
- - @color/yotsuba_inverseOnSurface
+ - @color/yotsuba_surfaceTint
- @color/yotsuba_inverseSurface
- - @color/yotsuba_primaryInverse
+ - @color/yotsuba_inverseOnSurface
+ - @color/yotsuba_outline
+ - @color/yotsuba_surfaceContainer
+ - @color/yotsuba_surfaceContainerHigh
+ - @color/yotsuba_surfaceContainerHighest
+ - @color/yotsuba_surfaceContainerLow
+ - @color/yotsuba_surfaceContainerLowest
@@ -313,6 +383,7 @@
- @color/tidalwave_onPrimary
- @color/tidalwave_primaryContainer
- @color/tidalwave_onPrimaryContainer
+ - @color/tidalwave_inversePrimary
- @color/tidalwave_secondary
- @color/tidalwave_onSecondary
- @color/tidalwave_secondaryContainer
@@ -327,10 +398,15 @@
- @color/tidalwave_onSurface
- @color/tidalwave_surfaceVariant
- @color/tidalwave_onSurfaceVariant
- - @color/tidalwave_outline
- - @color/tidalwave_inverseOnSurface
+ - @color/tidalwave_surfaceTint
- @color/tidalwave_inverseSurface
- - @color/tidalwave_primaryInverse
+ - @color/tidalwave_inverseOnSurface
+ - @color/tidalwave_outline
+ - @color/tidalwave_surfaceContainer
+ - @color/tidalwave_surfaceContainerHigh
+ - @color/tidalwave_surfaceContainerHighest
+ - @color/tidalwave_surfaceContainerLow
+ - @color/tidalwave_surfaceContainerLowest
@@ -340,6 +416,7 @@
- @color/nord_onPrimary
- @color/nord_primaryContainer
- @color/nord_onPrimaryContainer
+ - @color/nord_inversePrimary
- @color/nord_secondary
- @color/nord_onSecondary
- @color/nord_secondaryContainer
@@ -354,14 +431,19 @@
- @color/nord_onSurface
- @color/nord_surfaceVariant
- @color/nord_onSurfaceVariant
- - @color/nord_outline
- - @color/nord_inverseOnSurface
+ - @color/nord_surfaceTint
- @color/nord_inverseSurface
- - @color/nord_primaryInverse
+ - @color/nord_inverseOnSurface
- @color/nord_onError
- @color/nord_errorContainer
- @color/nord_onErrorContainer
- - @color/nord_elevationOverlay
+ - @color/nord_outline
+ - @color/nord_outlineVariant
+ - @color/nord_surfaceContainer
+ - @color/nord_surfaceContainerHigh
+ - @color/nord_surfaceContainerHighest
+ - @color/nord_surfaceContainerLow
+ - @color/nord_surfaceContainerLowest
diff --git a/presentation-core/src/main/res/values-night/colors.xml b/presentation-core/src/main/res/values-night/colors.xml
index 9d6a4a86a6..5f79e77f6b 100644
--- a/presentation-core/src/main/res/values-night/colors.xml
+++ b/presentation-core/src/main/res/values-night/colors.xml
@@ -2,11 +2,6 @@
#202125
- #FFB4A9
- #930006
- #680003
- #FFDAD4
-
@color/md_white_1000_12
diff --git a/presentation-core/src/main/res/values-night/colors_greenapple.xml b/presentation-core/src/main/res/values-night/colors_greenapple.xml
index ecc50b64b8..2d83e66e28 100644
--- a/presentation-core/src/main/res/values-night/colors_greenapple.xml
+++ b/presentation-core/src/main/res/values-night/colors_greenapple.xml
@@ -12,25 +12,38 @@
-->
#7ADB8F
- #003915
- #005322
- #96F8A9
+ #003917
+ #017737
+ #FFFFFF
#7ADB8F
- #003915
- #005322
- #96F8A9
- #FFB3AA
- #680006
- #93000D
- #FFDAD5
- #1A1C19
- #E1E3DD
- #1A1C19
- #E1E3DD
- #414941
- #C1C8BE
- #8B9389
- #1A1C19
- #E1E3DD
- #006D2F
+ #003917
+ #017737
+ #FFFFFF
+ #FFB3AC
+ #680008
+ #C7282A
+ #FFFFFF
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
+ #0F1510
+ #DFE4DB
+ #0F1510
+ #DFE4DB
+ #3F493F
+ #BECABC
+ #889487
+ #3F493F
+ #000000
+ #DFE4DB
+ #2C322C
+ #006D32
+ #0F1510
+ #353B35
+ #0A0F0B
+ #181D18
+ #1C211C
+ #262B26
+ #313630
diff --git a/presentation-core/src/main/res/values-night/colors_lavender.xml b/presentation-core/src/main/res/values-night/colors_lavender.xml
index f9d558025a..54cdbd4502 100644
--- a/presentation-core/src/main/res/values-night/colors_lavender.xml
+++ b/presentation-core/src/main/res/values-night/colors_lavender.xml
@@ -12,26 +12,38 @@
-->
#A177FF
- #111129
+ #3D0090
#A177FF
- #111129
+ #FFFFFF
#A177FF
- #111129
+ #FFFFFF
#423271
- #111129
- #5E25E1
- #E8E8E8
- #111129
- #DEE8FF
+ #A177FF
+ #CDBDFF
+ #360096
+ #5512D8
+ #EFE6FF
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
#111129
- #DEE8FF
+ #E7E0EC
#111129
- #DEE8FF
- #2CB6B6B6
- #E8E8E8
- #A8905FFF
- #DEE8FF
- #221247
- #A177FF
- @color/lavender_primary
+ #E7E0EC
+ #3D2F6B
+ #CBC3D6
+ #958E9F
+ #4A4453
+ #000000
+ #E7E0EC
+ #322F38
+ #6D41C8
+ #111129
+ #3B3841
+ #15132d
+ #171531
+ #1D193B
+ #241f41
+ #282446
diff --git a/presentation-core/src/main/res/values-night/colors_midnightdusk.xml b/presentation-core/src/main/res/values-night/colors_midnightdusk.xml
index f10e846622..b245b1e7aa 100644
--- a/presentation-core/src/main/res/values-night/colors_midnightdusk.xml
+++ b/presentation-core/src/main/res/values-night/colors_midnightdusk.xml
@@ -15,23 +15,28 @@
#FFFFFF
#BD1C5C
#FFFFFF
+ #F02475
#F02475
- #FFFFFF
+ #16151D
#66183C
- #FFFFFF
+ #F02475
#55971C
- #FFFFFF
+ #16151D
#386412
#E5E1E5
#16151D
#E5E1E5
#16151D
#E5E1E5
- #524346
+ #281624
#D6C1C4
- #9F8C8F
+ #F02475
#333043
#FFFFFF
- #F02475
- #2C0013
+ #9F8C8F
+ #221320
+ #251522
+ #281624
+ #2D1C2A
+ #2F1F2C
\ No newline at end of file
diff --git a/presentation-core/src/main/res/values-night/colors_nord.xml b/presentation-core/src/main/res/values-night/colors_nord.xml
index 058d52a4a6..0aeb36cf9d 100644
--- a/presentation-core/src/main/res/values-night/colors_nord.xml
+++ b/presentation-core/src/main/res/values-night/colors_nord.xml
@@ -5,26 +5,32 @@
#2E3440
#88C0D0
#2E3440
+ #397E91
#81A1C1
#2E3440
#506275
- #2E3440
+ #88C0D0
#5E81AC
#000000
#5E81AC
#000000
#2E3440
#ECEFF4
- #3B4252
+ #2E3440
#ECEFF4
- #2E3440
+ #414C5C
#ECEFF4
- #D8DEE9
- #2E3440
+ #88C0D0
#D8DEE9
- #397E91
- #434C5E
+ #2E3440
+ #6d717b
+ #90939a
#2E3440
#BF616A
#000000
+ #373F4D
+ #3E4756
+ #414C5C
+ #4E5766
+ #505968
diff --git a/presentation-core/src/main/res/values-night/colors_strawberry.xml b/presentation-core/src/main/res/values-night/colors_strawberry.xml
index 79071bd14f..f1a7b4b73a 100644
--- a/presentation-core/src/main/res/values-night/colors_strawberry.xml
+++ b/presentation-core/src/main/res/values-night/colors_strawberry.xml
@@ -11,26 +11,39 @@
~ Neutral #655C5C
-->
- #FFB2B9
- #67001B
- #91002A
- #FFDADD
- #FFB2B9
- #67001B
+ #FFB2B8
+ #67001D
+ #D53855
+ #FFFFFF
+ #ED4A65
+ #201A1A
#91002A
- #FFDADD
+ #FFFFFF
#E8C08E
- #432C06
- #5D421B
- #FFDDB1
+ #201A1A
+ #775930
+ #FFF7F1
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
#201A1A
- #ECDFDF
+ #F7DCDD
#201A1A
- #ECDFDF
- #534344
- #D7C1C2
- #A08C8D
- #201A1A
- #ECDFDF
- #B61E40
+ #F7DCDD
+ #322727
+ #E1BEC0
+ #A9898B
+ #594042
+ #000000
+ #F7DCDD
+ #3D2C2D
+ #B61F40
+ #1D1011
+ #463536
+ #2C2222
+ #302525
+ #322727
+ #3C2F2F
+ #463737
diff --git a/presentation-core/src/main/res/values-night/colors_tachiyomi.xml b/presentation-core/src/main/res/values-night/colors_tachiyomi.xml
index 40f5befccf..6af256bed8 100644
--- a/presentation-core/src/main/res/values-night/colors_tachiyomi.xml
+++ b/presentation-core/src/main/res/values-night/colors_tachiyomi.xml
@@ -10,26 +10,37 @@
~ Neutral #5E5E62
-->
- #AEC6FF
- #002C71
- #00419E
- #D8E2FF
- #AEC6FF
- #002C71
- #00419E
- #D8E2FF
+ #B0C6FF
+ #002D6E
+ #00429B
+ #D9E2FF
+ #0058CA
+ #B0C6FF
+ #002D6E
+ #00429B
+ #D9E2FF
#7ADC77
- #003907
- #00530D
+ #003909
+ #005312
#95F990
- #1B1B1E
- #E4E2E6
- #1B1B1E
- #E4E2E6
- #44464E
+ #1B1B1F
+ #E3E2E6
+ #1B1B1F
+ #E3E2E6
+ #211F26
#C5C6D0
- #8E9099
- #1B1B1E
- #E4E2E6
- #0057CE
+ #B0C6FF
+ #E3E2E6
+ #1B1B1F
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
+ #8F9099
+ #44464F
+ #1A181D
+ #1E1C22
+ #211F26
+ #292730
+ #302E38
diff --git a/presentation-core/src/main/res/values-night/colors_tako.xml b/presentation-core/src/main/res/values-night/colors_tako.xml
index 63c2db1ce0..0824df1af8 100644
--- a/presentation-core/src/main/res/values-night/colors_tako.xml
+++ b/presentation-core/src/main/res/values-night/colors_tako.xml
@@ -15,10 +15,11 @@
#38294E
#F3B375
#38294E
+ #84531E
#F3B375
- #5C4D4B
- #F3B375
- #38294E
+ #38294E
+ #5C4D4B
+ #F3B375
#66577E
#F3B375
#4E4065
@@ -27,11 +28,15 @@
#E3E0F2
#21212E
#E3E0F2
- #49454E
+ #2A2A3C
#CBC4CE
- #958F99
- #1B1B1E
+ #66577E
#E5E1E6
- #84531E
- @color/tako_tertiary
+ #1B1B1E
+ #958F99
+ #20202E
+ #262636
+ #2A2A3C
+ #303044
+ #36364D
diff --git a/presentation-core/src/main/res/values-night/colors_tealturqoise.xml b/presentation-core/src/main/res/values-night/colors_tealturqoise.xml
index 69d3e4d4eb..21bff2b260 100644
--- a/presentation-core/src/main/res/values-night/colors_tealturqoise.xml
+++ b/presentation-core/src/main/res/values-night/colors_tealturqoise.xml
@@ -1,10 +1,10 @@
-
#40E0D0
#000000
#40E0D0
#000000
+ #008080
#40E0D0
#000000
#18544E
@@ -17,11 +17,15 @@
#DFDEDA
#202125
#DFDEDA
- #3F4947
+ #233133
#DFDEDA
- #899391
- #202125
+ #40E0D0
#DFDEDA
- #008080
- #18544E
+ #202125
+ #899391
+ #202C2E
+ #222F31
+ #233133
+ #28383A
+ #2F4244
diff --git a/presentation-core/src/main/res/values-night/colors_tidalwave.xml b/presentation-core/src/main/res/values-night/colors_tidalwave.xml
index 7cf425d555..c2eb634361 100644
--- a/presentation-core/src/main/res/values-night/colors_tidalwave.xml
+++ b/presentation-core/src/main/res/values-night/colors_tidalwave.xml
@@ -14,6 +14,7 @@
#003544
#004d61
#b8eaff
+ #a12b03
#5ed4fc
#003544
#004d61
@@ -26,11 +27,15 @@
#d5e3ff
#001c3b
#d5e3ff
- #40484c
+ #082b4b
#bfc8cc
- #8a9296
- #001c3b
+ #5ed4fc
#ffe3c4
- #a12b03
-
+ #001c3b
+ #8a9296
+ #072642
+ #072947
+ #082b4b
+ #093257
+ #0A3861
\ No newline at end of file
diff --git a/presentation-core/src/main/res/values-night/colors_yinyang.xml b/presentation-core/src/main/res/values-night/colors_yinyang.xml
index 0a34a2da67..1dccc74e39 100644
--- a/presentation-core/src/main/res/values-night/colors_yinyang.xml
+++ b/presentation-core/src/main/res/values-night/colors_yinyang.xml
@@ -9,6 +9,7 @@
#5A5A5A
#FFFFFF
#000000
+ #CECECE
#FFFFFF
#5A5A5A
#717171
@@ -21,10 +22,15 @@
#E6E6E6
#1E1E1E
#E6E6E6
- #4E4E4E
+ #313131
#D1D1D1
- #999999
- #1E1E1E
+ #FFFFFF
#E6E6E6
- #CECECE
+ #1E1E1E
+ #999999
+ #2A2A2A
+ #2D2D2D
+ #313131
+ #383838
+ #3F3F3F
diff --git a/presentation-core/src/main/res/values-night/colors_yotsuba.xml b/presentation-core/src/main/res/values-night/colors_yotsuba.xml
index 4ca498a189..74ddae02d8 100644
--- a/presentation-core/src/main/res/values-night/colors_yotsuba.xml
+++ b/presentation-core/src/main/res/values-night/colors_yotsuba.xml
@@ -15,6 +15,7 @@
#5F1600
#862200
#FFDBCF
+ #AE3200
#FFB59D
#5F1600
#862200
@@ -27,10 +28,15 @@
#EDE0DD
#211A18
#EDE0DD
- #53433F
+ #332723
#D8C2BC
- #A08C87
- #211A18
+ #FFB59D
#EDE0DD
- #AE3200
+ #211A18
+ #A08C87
+ #2E221F
+ #312521
+ #332723
+ #413531
+ #4C403D
diff --git a/presentation-core/src/main/res/values/colors.xml b/presentation-core/src/main/res/values/colors.xml
index 551dcc0a7e..f8acc3cf46 100644
--- a/presentation-core/src/main/res/values/colors.xml
+++ b/presentation-core/src/main/res/values/colors.xml
@@ -4,11 +4,6 @@
#1F888888
- #BA1B1B
- #FFDAD4
- #FFFFFF
- #410001
-
@color/md_black_1000_12
@@ -16,8 +11,13 @@
#54759E
- #000001
- #000000
+ #000000
+ #FFFFFF
+ #000000
+ #FFFFFF
+ #0C0C0C
+ #131313
+ #1B1B1B
#1F000000
diff --git a/presentation-core/src/main/res/values/colors_greenapple.xml b/presentation-core/src/main/res/values/colors_greenapple.xml
index 13dbf83dc5..df06d61e5f 100644
--- a/presentation-core/src/main/res/values/colors_greenapple.xml
+++ b/presentation-core/src/main/res/values/colors_greenapple.xml
@@ -11,26 +11,39 @@
~ Neutral #5D5F5B
-->
- #006D2F
+ #005927
#FFFFFF
- #96F8A9
- #002109
- #006D2F
+ #188140
+ #FFFFFF
+ #005927
#FFFFFF
- #96F8A9
- #002109
- #B91D22
+ #97f7a9
+ #000000
+ #9D0012
#FFFFFF
- #FFDAD5
- #410003
- #FBFDF7
- #1A1C19
- #FBFDF7
- #1A1C19
- #DDE5DA
- #414941
- #717970
- #F0F2EC
- #2F312E
- #7ADB8F
+ #D33131
+ #FFFFFF
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
+ #F6FBF2
+ #181D18
+ #F6FBF2
+ #181D18
+ #DAE6D7
+ #3F493F
+ #6F7A6E
+ #BECABC
+ #000000
+ #2C322C
+ #EDF2E9
+ #7ADB8F
+ #D6DCD3
+ #F6FBF2
+ #FFFFFF
+ #F0F5EC
+ #EAEFE6
+ #E4EAE1
+ #DFE4DB
diff --git a/presentation-core/src/main/res/values/colors_lavender.xml b/presentation-core/src/main/res/values/colors_lavender.xml
index 02d6274e35..dd763c2ebd 100644
--- a/presentation-core/src/main/res/values/colors_lavender.xml
+++ b/presentation-core/src/main/res/values/colors_lavender.xml
@@ -10,27 +10,39 @@
~ Neutral #EDE2FF
-->
- #7B46AF
- #EDE2FF
+ #6D41C8
+ #FFFFFF
#7B46AF
- #EDE2FF
+ #130038
#7B46AF
#EDE2FF
#C9B0E6
- #EDE2FF
+ #7B46AF
#EDE2FF
#7B46AF
- #EDE2FF
- #7B46AF
+ #6D3BF0
+ #FFFFFF
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
#EDE2FF
- #1B1B22
+ #1D1A22
#EDE2FF
- #1B1B22
- #B9B0CC
- #D849454E
- #7B46AF
- #F3EFF4
- #313033
- #D6BAFF
- @color/lavender_primary
+ #1D1A22
+ #E4D5F8
+ #4A4453
+ #7B7485
+ #CBC3D6
+ #000000
+ #322F38
+ #F5EEFA
+ #A177FF
+ #DED7E3
+ #EDE2FF
+ #DACCEC
+ #DED0F1
+ #E4D5F8
+ #EADCFD
+ #EEE2FF
diff --git a/presentation-core/src/main/res/values/colors_midnightdusk.xml b/presentation-core/src/main/res/values/colors_midnightdusk.xml
index f78b6849e8..5474063605 100644
--- a/presentation-core/src/main/res/values/colors_midnightdusk.xml
+++ b/presentation-core/src/main/res/values/colors_midnightdusk.xml
@@ -15,10 +15,11 @@
#FFFFFF
#FFD9E1
#3F0017
+ #FFB1C4
#BB0054
#FFFFFF
- #FFD9E1
- #3F0017
+ #EFBAD4
+ #D1377C
#006638
#FFFFFF
#00894b
@@ -27,11 +28,15 @@
#1C1B1F
#FFFBFF
#1C1B1F
- #F3DDE0
+ #F9E6F1
#524346
- #847376
- #F4F0F4
+ #BB0054
#313033
- #FFB1C4
- @color/midnightdusk_primary
+ #F4F0F4
+ #847376
+ #DAC0CD
+ #E8D1DD
+ #F9E6F1
+ #FCF3F8
+ #FEF9FC
diff --git a/presentation-core/src/main/res/values/colors_nord.xml b/presentation-core/src/main/res/values/colors_nord.xml
index b04ae3eecf..4cb1d411f9 100644
--- a/presentation-core/src/main/res/values/colors_nord.xml
+++ b/presentation-core/src/main/res/values/colors_nord.xml
@@ -6,6 +6,7 @@
#000000
#5E81AC
#000000
+ #8CA8CD
#81A1C1
#2E3440
#91B4D7
@@ -18,14 +19,18 @@
#2E3440
#E5E9F0
#2E3440
- #ffffff
+ #DAE0EA
#2E3440
- #4C566A
- #ECEFF4
+ #5E81AC
#3B4252
- #8CA8CD
- #D8DEE9
+ #ECEFF4
+ #2E3440
#ECEFF4
#BF616A
#000000
+ #D1D7E0
+ #D6DCE6
+ #DAE0EA
+ #E9EDF3
+ #F2F4F8
diff --git a/presentation-core/src/main/res/values/colors_strawberry.xml b/presentation-core/src/main/res/values/colors_strawberry.xml
index 97e45ba773..2a430c4530 100644
--- a/presentation-core/src/main/res/values/colors_strawberry.xml
+++ b/presentation-core/src/main/res/values/colors_strawberry.xml
@@ -11,26 +11,39 @@
~ Neutral #655C5C
-->
- #B61E40
+ #A10833
#FFFFFF
- #FFDADD
- #40000D
- #B61E40
+ #D53855
+ #FFFFFF
+ #A10833
#FFFFFF
- #FFDADD
- #40000D
- #775930
+ #D53855
+ #F6EAED
+ #5F441D
#FFFFFF
- #FFDDB1
- #2A1800
- #FCFCFC
- #201A1A
- #FCFCFC
- #201A1A
- #F4DDDD
- #534344
- #857374
- #FBEDED
- #362F2F
- #FFB2B9
+ #87683D
+ #FFFFFF
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
+ #FAFAFA
+ #261819
+ #FAFAFA
+ #261819
+ #F6EAED
+ #594042
+ #8D7071
+ #E1BEC0
+ #000000
+ #3D2C2D
+ #FFECED
+ #FFB2B8
+ #EED4D5
+ #FFF8F7
+ #F7DCDD
+ #FDE2E3
+ #F6EAED
+ #FFF0F0
+ #FFFFFF
diff --git a/presentation-core/src/main/res/values/colors_tachiyomi.xml b/presentation-core/src/main/res/values/colors_tachiyomi.xml
index e5f4f5ed83..37f2a9ff03 100644
--- a/presentation-core/src/main/res/values/colors_tachiyomi.xml
+++ b/presentation-core/src/main/res/values/colors_tachiyomi.xml
@@ -10,26 +10,37 @@
~ Neutral #5E5E62
-->
- #0057CE
+ #0058CA
#FFFFFF
- #D8E2FF
- #001947
- #0057CE
+ #D9E2FF
+ #001945
+ #B0C6FF
+ #0058CA
#FFFFFF
- #D8E2FF
- #001947
- #006E17
+ #D9E2FF
+ #001945
+ #006E1B
#FFFFFF
#95F990
- #002202
- #FDFBFF
- #1B1B1E
- #FDFBFF
- #1B1B1E
- #E1E2EC
- #44464E
- #757780
+ #002203
+ #FEFBFF
+ #1B1B1F
+ #FEFBFF
+ #1B1B1F
+ #F3EDF7
+ #44464F
+ #0058CA
+ #303034
#F2F0F4
- #303033
- #AEC6FF
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
+ #757780
+ #C5C6D0
+ #F5F1F8
+ #F7F2FA
+ #F3EDF7
+ #FCF7FF
+ #FCF7FF
diff --git a/presentation-core/src/main/res/values/colors_tako.xml b/presentation-core/src/main/res/values/colors_tako.xml
index 6a002cd2cc..373970a044 100644
--- a/presentation-core/src/main/res/values/colors_tako.xml
+++ b/presentation-core/src/main/res/values/colors_tako.xml
@@ -15,10 +15,11 @@
#F3B375
#66577E
#F3B375
+ #D6BAFF
#66577E
#F3B375
#C8BED0
- #F3B375
+ #66577E
#F3B375
#574360
#FDD6B0
@@ -29,9 +30,13 @@
#1B1B22
#E8E0EB
#49454E
- #7A757E
- #F3EFF4
+ #66577E
#313033
- #D6BAFF
- @color/tako_primary
+ #F3EFF4
+ #7A757E
+ #D7D0DA
+ #DFD8E2
+ #E8E0EB
+ #EEE6F1
+ #F7EEFA
diff --git a/presentation-core/src/main/res/values/colors_tealturqoise.xml b/presentation-core/src/main/res/values/colors_tealturqoise.xml
index c9b1e0a9dc..0bff8baaa3 100644
--- a/presentation-core/src/main/res/values/colors_tealturqoise.xml
+++ b/presentation-core/src/main/res/values/colors_tealturqoise.xml
@@ -1,13 +1,13 @@
-
#008080
#FFFFFF
#008080
#FFFFFF
+ #40E0D0
#008080
#FFFFFF
- #BFDFDF
+ #CFE5E4
#008080
#FF7F7F
#000000
@@ -17,11 +17,15 @@
#050505
#FAFAFA
#050505
- #DAE5E2
+ #EBF3F1
#050505
- #6F7977
- #FAFAFA
+ #BFDFDF
#050505
- #40E0D0
- #BFDFDF
+ #FAFAFA
+ #6F7977
+ #E1E9E7
+ #E6EEEC
+ #EBF3F1
+ #F0F8F6
+ #F7FFFD
diff --git a/presentation-core/src/main/res/values/colors_tidalwave.xml b/presentation-core/src/main/res/values/colors_tidalwave.xml
index 8ae6942d5f..e66f7aed50 100644
--- a/presentation-core/src/main/res/values/colors_tidalwave.xml
+++ b/presentation-core/src/main/res/values/colors_tidalwave.xml
@@ -15,9 +15,10 @@
#ffffff
#B4D4DF
#001f28
+ #ff987f
#006780
#ffffff
- #b8eaff
+ #9AE1FF
#001f28
#92f7bc
#001c3b
@@ -27,10 +28,15 @@
#001c3b
#fdfbff
#001c3b
- #dce4e8
+ #e8eff5
#40484c
- #70787c
- #ffe3c4
+ #006780
#020400
- #ff987f
+ #ffe3c4
+ #70787c
+ #e2e8ec
+ #e5ecf1
+ #e8eff5
+ #edf4fA
+ #f5faff
\ No newline at end of file
diff --git a/presentation-core/src/main/res/values/colors_yinyang.xml b/presentation-core/src/main/res/values/colors_yinyang.xml
index c6d2cefbdd..e54ea0f6f8 100644
--- a/presentation-core/src/main/res/values/colors_yinyang.xml
+++ b/presentation-core/src/main/res/values/colors_yinyang.xml
@@ -9,6 +9,7 @@
#FFFFFF
#000000
#FFFFFF
+ #A6A6A6
#000000
#FFFFFF
#DDDDDD
@@ -21,10 +22,15 @@
#222222
#FDFDFD
#222222
- #EDEDED
+ #E8E8E8
#515151
- #838383
- #F4F4F4
+ #000000
#333333
- #A6A6A6
+ #F4F4F4
+ #838383
+ #CFCFCF
+ #DADADA
+ #E8E8E8
+ #ECECEC
+ #EFEFEF
diff --git a/presentation-core/src/main/res/values/colors_yotsuba.xml b/presentation-core/src/main/res/values/colors_yotsuba.xml
index 79c662f7fb..81fd136114 100644
--- a/presentation-core/src/main/res/values/colors_yotsuba.xml
+++ b/presentation-core/src/main/res/values/colors_yotsuba.xml
@@ -15,9 +15,10 @@
#FFFFFF
#FFDBCF
#3B0A00
+ #FFB59D
#AE3200
#FFFFFF
- #FFDBCF
+ #EBCDC2
#3B0A00
#6B5E2F
#FFFFFF
@@ -27,10 +28,15 @@
#211A18
#FCFCFC
#211A18
- #F5DED8
+ #F6EBE7
#53433F
- #85736E
- #FBEEEB
+ #AE3200
#362F2D
- #FFB59D
+ #FBEEEB
+ #85736E
+ #ECE3E0
+ #F1E7E4
+ #F6EBE7
+ #FAF4F2
+ #FBF6F4