
(cherry picked from commit ad57fde1c55984f3235ce86a7505e3675039b1dc) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt # app/src/main/res/values/themes.xml
(cherry picked from commit ad57fde1c55984f3235ce86a7505e3675039b1dc) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt # app/src/main/res/values/themes.xml