From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sat, 26 Sep 2020 16:47:44 +0000 (+0300)
Subject: themes: secondary==primary, a bit closer primaryDark, no calculations
X-Git-Tag: v0.16.0~43
X-Git-Url: https://git.ktnx.net/?a=commitdiff_plain;h=90a85bc89663b4877004053545add5da273f24f3;p=mobile-ledger.git

themes: secondary==primary, a bit closer primaryDark, no calculations

all intermediate colours are calculated as a weighted average of the
nearest theme color. this keeps the color calculations in one place --
tools/gen-styles.pl
---

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
index d33608a6..81450c9a 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileThemedActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -30,7 +30,8 @@ import net.ktnx.mobileledger.utils.Colors;
 public class ProfileThemedActivity extends CrashReportingActivity {
     protected MobileLedgerProfile mProfile;
     protected void setupProfileColors() {
-        Colors.setupTheme(this, mProfile);
+        final int themeHue = (mProfile == null) ? -1 : mProfile.getThemeHue();
+        Colors.setupTheme(this, themeHue);
     }
     @Override
     protected void onStart() {
diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
index fdaacd5c..9d0c6aaa 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/Colors.java
@@ -23,58 +23,54 @@ import android.content.res.Resources;
 import android.util.TypedValue;
 
 import androidx.annotation.ColorInt;
-import androidx.annotation.ColorLong;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.lifecycle.MutableLiveData;
 
 import net.ktnx.mobileledger.BuildConfig;
 import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.HueRing;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Objects;
 
-import static java.lang.Math.abs;
 import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class Colors {
     public static final int DEFAULT_HUE_DEG = 261;
-    public static final int THEME_HUE_STEP_DEG = 5;
-    public static final int baseHueStep = 60;
     public static final MutableLiveData<Integer> themeWatch = new MutableLiveData<>(0);
-    private static final float blueLightness = 0.665f;
-    private static final float yellowLightness = 0.350f;
     private static final int[][] EMPTY_STATES = new int[][]{new int[0]};
     private static final int SWIPE_COLOR_COUNT = 6;
+    private static final int[] themeIDs =
+            {R.style.AppTheme_default, R.style.AppTheme_000, R.style.AppTheme_005,
+             R.style.AppTheme_010, R.style.AppTheme_015, R.style.AppTheme_020, R.style.AppTheme_025,
+             R.style.AppTheme_030, R.style.AppTheme_035, R.style.AppTheme_040, R.style.AppTheme_045,
+             R.style.AppTheme_050, R.style.AppTheme_055, R.style.AppTheme_060, R.style.AppTheme_065,
+             R.style.AppTheme_070, R.style.AppTheme_075, R.style.AppTheme_080, R.style.AppTheme_085,
+             R.style.AppTheme_090, R.style.AppTheme_095, R.style.AppTheme_100, R.style.AppTheme_105,
+             R.style.AppTheme_110, R.style.AppTheme_115, R.style.AppTheme_120, R.style.AppTheme_125,
+             R.style.AppTheme_130, R.style.AppTheme_135, R.style.AppTheme_140, R.style.AppTheme_145,
+             R.style.AppTheme_150, R.style.AppTheme_155, R.style.AppTheme_160, R.style.AppTheme_165,
+             R.style.AppTheme_170, R.style.AppTheme_175, R.style.AppTheme_180, R.style.AppTheme_185,
+             R.style.AppTheme_190, R.style.AppTheme_195, R.style.AppTheme_200, R.style.AppTheme_205,
+             R.style.AppTheme_210, R.style.AppTheme_215, R.style.AppTheme_220, R.style.AppTheme_225,
+             R.style.AppTheme_230, R.style.AppTheme_235, R.style.AppTheme_240, R.style.AppTheme_245,
+             R.style.AppTheme_250, R.style.AppTheme_255, R.style.AppTheme_260, R.style.AppTheme_265,
+             R.style.AppTheme_270, R.style.AppTheme_275, R.style.AppTheme_280, R.style.AppTheme_285,
+             R.style.AppTheme_290, R.style.AppTheme_295, R.style.AppTheme_300, R.style.AppTheme_305,
+             R.style.AppTheme_310, R.style.AppTheme_315, R.style.AppTheme_320, R.style.AppTheme_325,
+             R.style.AppTheme_330, R.style.AppTheme_335, R.style.AppTheme_340, R.style.AppTheme_345,
+             R.style.AppTheme_350, R.style.AppTheme_355,
+             };
+    private static final HashMap<Integer, Integer> themePrimaryColor = new HashMap<>();
     public static @ColorInt
     int secondary;
     @ColorInt
     public static int tableRowDarkBG;
     public static int profileThemeId = -1;
-    private static final int[] themeIDs =
-            {R.style.AppTheme_000, R.style.AppTheme_005, R.style.AppTheme_010, R.style.AppTheme_015,
-             R.style.AppTheme_020, R.style.AppTheme_025, R.style.AppTheme_030, R.style.AppTheme_035,
-             R.style.AppTheme_040, R.style.AppTheme_045, R.style.AppTheme_050, R.style.AppTheme_055,
-             R.style.AppTheme_060, R.style.AppTheme_065, R.style.AppTheme_070, R.style.AppTheme_075,
-             R.style.AppTheme_080, R.style.AppTheme_085, R.style.AppTheme_090, R.style.AppTheme_095,
-             R.style.AppTheme_100, R.style.AppTheme_105, R.style.AppTheme_110, R.style.AppTheme_115,
-             R.style.AppTheme_120, R.style.AppTheme_125, R.style.AppTheme_130, R.style.AppTheme_135,
-             R.style.AppTheme_140, R.style.AppTheme_145, R.style.AppTheme_150, R.style.AppTheme_155,
-             R.style.AppTheme_160, R.style.AppTheme_165, R.style.AppTheme_170, R.style.AppTheme_175,
-             R.style.AppTheme_180, R.style.AppTheme_185, R.style.AppTheme_190, R.style.AppTheme_195,
-             R.style.AppTheme_200, R.style.AppTheme_205, R.style.AppTheme_210, R.style.AppTheme_215,
-             R.style.AppTheme_220, R.style.AppTheme_225, R.style.AppTheme_230, R.style.AppTheme_235,
-             R.style.AppTheme_240, R.style.AppTheme_245, R.style.AppTheme_250, R.style.AppTheme_255,
-             R.style.AppTheme_260, R.style.AppTheme_265, R.style.AppTheme_270, R.style.AppTheme_275,
-             R.style.AppTheme_280, R.style.AppTheme_285, R.style.AppTheme_290, R.style.AppTheme_295,
-             R.style.AppTheme_300, R.style.AppTheme_305, R.style.AppTheme_310, R.style.AppTheme_315,
-             R.style.AppTheme_320, R.style.AppTheme_325, R.style.AppTheme_330, R.style.AppTheme_335,
-             R.style.AppTheme_340, R.style.AppTheme_345, R.style.AppTheme_350, R.style.AppTheme_355,
-             };
     public static void refreshColors(Resources.Theme theme) {
         TypedValue tv = new TypedValue();
         theme.resolveAttribute(R.attr.table_row_dark_bg, tv, true);
@@ -82,118 +78,54 @@ public class Colors {
         theme.resolveAttribute(R.attr.colorSecondary, tv, true);
         secondary = tv.data;
 
-        // trigger theme observers
-        themeWatch.postValue(themeWatch.getValue() + 1);
-    }
-    public static @ColorInt
-    int hslColor(float hueRatio, float saturation, float lightness) {
-        return 0xff000000 | hslTriplet(hueRatio, saturation, lightness);
-    }
-    public static @ColorInt
-    int hslTriplet(float hueRatio, float saturation, float lightness) {
-        @ColorLong long result;
-        float h = hueRatio * 6;
-        float c = (1 - abs(2f * lightness - 1)) * saturation;
-        float h_mod_2 = h % 2;
-        float x = c * (1 - Math.abs(h_mod_2 - 1));
-        int r, g, b;
-        float m = lightness - c / 2f;
-
-        if (h < 1 || h == 6)
-            return tupleToColor(c + m, x + m, 0 + m);
-        if (h < 2)
-            return tupleToColor(x + m, c + m, 0 + m);
-        if (h < 3)
-            return tupleToColor(0 + m, c + m, x + m);
-        if (h < 4)
-            return tupleToColor(0 + m, x + m, c + m);
-        if (h < 5)
-            return tupleToColor(x + m, 0 + m, c + m);
-        if (h < 6)
-            return tupleToColor(c + m, 0 + m, x + m);
-
-        throw new IllegalArgumentException(String.format(
-                "Unexpected value for h (%1.3f) while converting hsl(%1.3f, %1.3f, %1.3f) to rgb",
-                h, hueRatio, saturation, lightness));
-    }
-    public static @ColorInt
-    int tupleToColor(float r, float g, float b) {
-        int r_int = Math.round(255 * r);
-        int g_int = Math.round(255 * g);
-        int b_int = Math.round(255 * b);
-        return (r_int << 16) | (g_int << 8) | b_int;
-    }
-    public static float baseHueLightness(int baseHueDegrees) {
-        switch (baseHueDegrees % 360) {
-            case 0:
-                return 0.550f;   // red
-            case 60:
-                return 0.250f;  // yellow
-            case 120:
-                return 0.290f;  // green
-            case 180:
-                return 0.300f;  // cyan
-            case 240:
-                return 0.710f;  // blue
-            case 300:
-                return 0.450f;   // magenta
-            default:
-                throw new IllegalStateException(
-                        String.format(Locale.US, "baseHueLightness called with invalid value %d",
-                                baseHueDegrees));
+        if (themePrimaryColor.size() == 0) {
+            for (int themeId : themeIDs) {
+                Resources.Theme tmpTheme = theme.getResources()
+                                                .newTheme();
+                tmpTheme.applyStyle(themeId, true);
+                tmpTheme.resolveAttribute(R.attr.colorPrimary, tv, false);
+                themePrimaryColor.put(themeId, tv.data);
+            }
         }
-    }
-    public static float hueLightness(int hueDegrees) {
-        int mod = hueDegrees % baseHueStep;
-        int x0 = hueDegrees - mod;
-        int x1 = x0 + baseHueStep;
 
-        float y0 = baseHueLightness(x0);
-        float y1 = baseHueLightness(x1);
-
-        return y0 + (hueDegrees - x0) * (y1 - y0) / (x1 - x0);
+        // trigger theme observers
+        themeWatch.postValue(themeWatch.getValue() + 1);
     }
     public static @ColorInt
     int getPrimaryColorForHue(int hueDegrees) {
-        int result = hslColor(hueDegrees / 360f, 0.845f, hueLightness(hueDegrees));
-//        debug("colors", String.format(Locale.ENGLISH, "getPrimaryColorForHue(%d) = %x",
-//        hueDegrees,
-//                result));
-        return result;
-    }
-    public static void setupTheme(Activity activity) {
-        MobileLedgerProfile profile = Data.getProfile();
-        setupTheme(activity, profile);
-    }
-    public static void setupTheme(Activity activity, @Nullable MobileLedgerProfile profile) {
-        final int themeHue = (profile == null) ? -1 : profile.getThemeHue();
-        setupTheme(activity, themeHue);
+        if (hueDegrees == DEFAULT_HUE_DEG)
+            return Objects.requireNonNull(themePrimaryColor.get(R.style.AppTheme_default));
+        int mod = hueDegrees % HueRing.hueStepDegrees;
+        if (mod == 0) {
+            int themeId = getThemeIdForHue(hueDegrees);
+            Integer result = Objects.requireNonNull(themePrimaryColor.get(themeId));
+            debug("colors",
+                    String.format(Locale.US, "getPrimaryColorForHue(%d) = %x", hueDegrees, result));
+            return result;
+        }
+        else {
+            int x0 = hueDegrees - mod;
+            int x1 = (x0 + HueRing.hueStepDegrees) % 360;
+            float y0 = Objects.requireNonNull(themePrimaryColor.get(getThemeIdForHue(x0)));
+            float y1 = Objects.requireNonNull(themePrimaryColor.get(getThemeIdForHue(x1)));
+            return Math.round(y0 + hueDegrees * (y1 - y0) / (x1 - x0));
+        }
     }
     public static int getThemeIdForHue(int themeHue) {
-        int themeId = -1;
+        int themeIndex = -1;
         if (themeHue == 360)
             themeHue = 0;
         if ((themeHue >= 0) && (themeHue < 360) && (themeHue != DEFAULT_HUE_DEG)) {
-            int index;
             if ((themeHue % HueRing.hueStepDegrees) != 0) {
                 Logger.warn("profiles",
                         String.format(Locale.US, "Adjusting unexpected hue %d", themeHue));
-                index = Math.round(1f * themeHue / HueRing.hueStepDegrees);
+                themeIndex = Math.round(1f * themeHue / HueRing.hueStepDegrees);
             }
             else
-                index = themeHue / HueRing.hueStepDegrees;
-
-            themeId = themeIDs[index];
-        }
-
-        if (themeId < 0) {
-            themeId = R.style.AppTheme_default;
-            debug("profiles",
-                    String.format(Locale.ENGLISH, "Theme hue %d not supported, using the default",
-                            themeHue));
+                themeIndex = themeHue / HueRing.hueStepDegrees;
         }
 
-        return themeId;
+        return themeIDs[themeIndex + 1];    // 0 is the default theme
     }
     public static void setupTheme(Activity activity, int themeHue) {
         int themeId = getThemeIdForHue(themeHue);
@@ -292,10 +224,10 @@ public class Colors {
             chosenHue = (chosenIntervalStart + (largestInterval / 2)) % 360;
         }
 
-        final int mod = chosenHue % THEME_HUE_STEP_DEG;
+        final int mod = chosenHue % HueRing.hueStepDegrees;
         if (mod != 0) {
-            if (mod > THEME_HUE_STEP_DEG / 2)
-                chosenHue += (THEME_HUE_STEP_DEG - mod); // 13 += (5-3) = 15
+            if (mod > HueRing.hueStepDegrees / 2)
+                chosenHue += (HueRing.hueStepDegrees - mod); // 13 += (5-3) = 15
             else
                 chosenHue -= mod;       // 12 -= 2 = 10
         }
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index de08d714..3d6fbf90 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -45,8 +45,8 @@
     <style name="AppTheme.default" parent="AppTheme">
         <item name="colorPrimary">#935ff2</item>
         <item name="colorPrimaryTransparent">#00935ff2</item>
-        <item name="colorSecondary">#6920ed</item>
-        <item name="colorPrimaryDark">#6920ed</item>
+        <item name="colorSecondary">#935ff2</item>
+        <item name="colorPrimaryDark">#6f35d8</item>
         <item name="table_row_dark_bg">#1d0647</item>
         <item name="table_row_light_bg">#13042f</item>
     </style>
@@ -54,8 +54,8 @@
     <style name="AppTheme.000" parent="AppTheme">
         <item name="colorPrimary">#ee3232</item>
         <item name="colorPrimaryTransparent">#00ee3232</item>
-        <item name="colorSecondary">#d61111</item>
-        <item name="colorPrimaryDark">#d61111</item>
+        <item name="colorSecondary">#ee3232</item>
+        <item name="colorPrimaryDark">#c22525</item>
         <item name="table_row_dark_bg">#470606</item>
         <item name="table_row_light_bg">#2f0404</item>
     </style>
@@ -63,8 +63,8 @@
     <style name="AppTheme.005" parent="AppTheme">
         <item name="colorPrimary">#ed3625</item>
         <item name="colorPrimaryTransparent">#00ed3625</item>
-        <item name="colorSecondary">#cb2010</item>
-        <item name="colorPrimaryDark">#cb2010</item>
+        <item name="colorSecondary">#ed3625</item>
+        <item name="colorPrimaryDark">#b83023</item>
         <item name="table_row_dark_bg">#470b06</item>
         <item name="table_row_light_bg">#2f0704</item>
     </style>
@@ -72,8 +72,8 @@
     <style name="AppTheme.010" parent="AppTheme">
         <item name="colorPrimary">#ec3915</item>
         <item name="colorPrimaryTransparent">#00ec3915</item>
-        <item name="colorSecondary">#be2d0f</item>
-        <item name="colorPrimaryDark">#be2d0f</item>
+        <item name="colorSecondary">#ec3915</item>
+        <item name="colorPrimaryDark">#ad3821</item>
         <item name="table_row_dark_bg">#471106</item>
         <item name="table_row_light_bg">#2f0b04</item>
     </style>
@@ -81,8 +81,8 @@
     <style name="AppTheme.015" parent="AppTheme">
         <item name="colorPrimary">#e24612</item>
         <item name="colorPrimaryTransparent">#00e24612</item>
-        <item name="colorSecondary">#b5380f</item>
-        <item name="colorPrimaryDark">#b5380f</item>
+        <item name="colorSecondary">#e24612</item>
+        <item name="colorPrimaryDark">#a4411f</item>
         <item name="table_row_dark_bg">#471606</item>
         <item name="table_row_light_bg">#2f0f04</item>
     </style>
@@ -90,8 +90,8 @@
     <style name="AppTheme.020" parent="AppTheme">
         <item name="colorPrimary">#d75311</item>
         <item name="colorPrimaryTransparent">#00d75311</item>
-        <item name="colorSecondary">#ac430e</item>
-        <item name="colorPrimaryDark">#ac430e</item>
+        <item name="colorSecondary">#d75311</item>
+        <item name="colorPrimaryDark">#9c481e</item>
         <item name="table_row_dark_bg">#471b06</item>
         <item name="table_row_light_bg">#2f1204</item>
     </style>
@@ -99,8 +99,8 @@
     <style name="AppTheme.025" parent="AppTheme">
         <item name="colorPrimary">#cb5e10</item>
         <item name="colorPrimaryTransparent">#00cb5e10</item>
-        <item name="colorSecondary">#a24b0d</item>
-        <item name="colorPrimaryDark">#a24b0d</item>
+        <item name="colorSecondary">#cb5e10</item>
+        <item name="colorPrimaryDark">#934e1c</item>
         <item name="table_row_dark_bg">#472106</item>
         <item name="table_row_light_bg">#2f1604</item>
     </style>
@@ -108,8 +108,8 @@
     <style name="AppTheme.030" parent="AppTheme">
         <item name="colorPrimary">#bf670f</item>
         <item name="colorPrimaryTransparent">#00bf670f</item>
-        <item name="colorSecondary">#98520c</item>
-        <item name="colorPrimaryDark">#98520c</item>
+        <item name="colorSecondary">#bf670f</item>
+        <item name="colorPrimaryDark">#8a521a</item>
         <item name="table_row_dark_bg">#472606</item>
         <item name="table_row_light_bg">#2f1a04</item>
     </style>
@@ -117,8 +117,8 @@
     <style name="AppTheme.035" parent="AppTheme">
         <item name="colorPrimary">#b26e0e</item>
         <item name="colorPrimaryTransparent">#00b26e0e</item>
-        <item name="colorSecondary">#8f580c</item>
-        <item name="colorPrimaryDark">#8f580c</item>
+        <item name="colorSecondary">#b26e0e</item>
+        <item name="colorPrimaryDark">#825619</item>
         <item name="table_row_dark_bg">#472c06</item>
         <item name="table_row_light_bg">#2f1d04</item>
     </style>
@@ -126,8 +126,8 @@
     <style name="AppTheme.040" parent="AppTheme">
         <item name="colorPrimary">#a7740e</item>
         <item name="colorPrimaryTransparent">#00a7740e</item>
-        <item name="colorSecondary">#865d0b</item>
-        <item name="colorPrimaryDark">#865d0b</item>
+        <item name="colorSecondary">#a7740e</item>
+        <item name="colorPrimaryDark">#795917</item>
         <item name="table_row_dark_bg">#473106</item>
         <item name="table_row_light_bg">#2f2104</item>
     </style>
@@ -135,8 +135,8 @@
     <style name="AppTheme.045" parent="AppTheme">
         <item name="colorPrimary">#9d790d</item>
         <item name="colorPrimaryTransparent">#009d790d</item>
-        <item name="colorSecondary">#7d610a</item>
-        <item name="colorPrimaryDark">#7d610a</item>
+        <item name="colorSecondary">#9d790d</item>
+        <item name="colorPrimaryDark">#725b16</item>
         <item name="table_row_dark_bg">#473706</item>
         <item name="table_row_light_bg">#2f2404</item>
     </style>
@@ -144,8 +144,8 @@
     <style name="AppTheme.050" parent="AppTheme">
         <item name="colorPrimary">#937d0c</item>
         <item name="colorPrimaryTransparent">#00937d0c</item>
-        <item name="colorSecondary">#76640a</item>
-        <item name="colorPrimaryDark">#76640a</item>
+        <item name="colorSecondary">#937d0c</item>
+        <item name="colorPrimaryDark">#6b5c14</item>
         <item name="table_row_dark_bg">#473c06</item>
         <item name="table_row_light_bg">#2f2804</item>
     </style>
@@ -153,8 +153,8 @@
     <style name="AppTheme.055" parent="AppTheme">
         <item name="colorPrimary">#8b800b</item>
         <item name="colorPrimaryTransparent">#008b800b</item>
-        <item name="colorSecondary">#6f6609</item>
-        <item name="colorPrimaryDark">#6f6609</item>
+        <item name="colorSecondary">#8b800b</item>
+        <item name="colorPrimaryDark">#655e13</item>
         <item name="table_row_dark_bg">#474106</item>
         <item name="table_row_light_bg">#2f2c04</item>
     </style>
@@ -162,8 +162,8 @@
     <style name="AppTheme.060" parent="AppTheme">
         <item name="colorPrimary">#82820b</item>
         <item name="colorPrimaryTransparent">#0082820b</item>
-        <item name="colorSecondary">#686808</item>
-        <item name="colorPrimaryDark">#686808</item>
+        <item name="colorSecondary">#82820b</item>
+        <item name="colorPrimaryDark">#5f5f12</item>
         <item name="table_row_dark_bg">#474706</item>
         <item name="table_row_light_bg">#2f2f04</item>
     </style>
@@ -171,8 +171,8 @@
     <style name="AppTheme.065" parent="AppTheme">
         <item name="colorPrimary">#7a840b</item>
         <item name="colorPrimaryTransparent">#007a840b</item>
-        <item name="colorSecondary">#626a09</item>
-        <item name="colorPrimaryDark">#626a09</item>
+        <item name="colorSecondary">#7a840b</item>
+        <item name="colorPrimaryDark">#596012</item>
         <item name="table_row_dark_bg">#414706</item>
         <item name="table_row_light_bg">#2c2f04</item>
     </style>
@@ -180,8 +180,8 @@
     <style name="AppTheme.070" parent="AppTheme">
         <item name="colorPrimary">#72870b</item>
         <item name="colorPrimaryTransparent">#0072870b</item>
-        <item name="colorSecondary">#5b6c09</item>
-        <item name="colorPrimaryDark">#5b6c09</item>
+        <item name="colorSecondary">#72870b</item>
+        <item name="colorPrimaryDark">#556213</item>
         <item name="table_row_dark_bg">#3c4706</item>
         <item name="table_row_light_bg">#282f04</item>
     </style>
@@ -189,8 +189,8 @@
     <style name="AppTheme.075" parent="AppTheme">
         <item name="colorPrimary">#69890b</item>
         <item name="colorPrimaryTransparent">#0069890b</item>
-        <item name="colorSecondary">#546d09</item>
-        <item name="colorPrimaryDark">#546d09</item>
+        <item name="colorSecondary">#69890b</item>
+        <item name="colorPrimaryDark">#4f6313</item>
         <item name="table_row_dark_bg">#374706</item>
         <item name="table_row_light_bg">#242f04</item>
     </style>
@@ -198,8 +198,8 @@
     <style name="AppTheme.080" parent="AppTheme">
         <item name="colorPrimary">#608b0b</item>
         <item name="colorPrimaryTransparent">#00608b0b</item>
-        <item name="colorSecondary">#4d6f09</item>
-        <item name="colorPrimaryDark">#4d6f09</item>
+        <item name="colorSecondary">#608b0b</item>
+        <item name="colorPrimaryDark">#4a6513</item>
         <item name="table_row_dark_bg">#314706</item>
         <item name="table_row_light_bg">#212f04</item>
     </style>
@@ -207,8 +207,8 @@
     <style name="AppTheme.085" parent="AppTheme">
         <item name="colorPrimary">#568c0b</item>
         <item name="colorPrimaryTransparent">#00568c0b</item>
-        <item name="colorSecondary">#457009</item>
-        <item name="colorPrimaryDark">#457009</item>
+        <item name="colorSecondary">#568c0b</item>
+        <item name="colorPrimaryDark">#436513</item>
         <item name="table_row_dark_bg">#2c4706</item>
         <item name="table_row_light_bg">#1d2f04</item>
     </style>
@@ -216,8 +216,8 @@
     <style name="AppTheme.090" parent="AppTheme">
         <item name="colorPrimary">#4d8e0b</item>
         <item name="colorPrimaryTransparent">#004d8e0b</item>
-        <item name="colorSecondary">#3d7109</item>
-        <item name="colorPrimaryDark">#3d7109</item>
+        <item name="colorSecondary">#4d8e0b</item>
+        <item name="colorPrimaryDark">#3d6714</item>
         <item name="table_row_dark_bg">#264706</item>
         <item name="table_row_light_bg">#1a2f04</item>
     </style>
@@ -225,8 +225,8 @@
     <style name="AppTheme.095" parent="AppTheme">
         <item name="colorPrimary">#428e0c</item>
         <item name="colorPrimaryTransparent">#00428e0c</item>
-        <item name="colorSecondary">#357209</item>
-        <item name="colorPrimaryDark">#357209</item>
+        <item name="colorSecondary">#428e0c</item>
+        <item name="colorPrimaryDark">#376714</item>
         <item name="table_row_dark_bg">#214706</item>
         <item name="table_row_light_bg">#162f04</item>
     </style>
@@ -234,8 +234,8 @@
     <style name="AppTheme.100" parent="AppTheme">
         <item name="colorPrimary">#38900c</item>
         <item name="colorPrimaryTransparent">#0038900c</item>
-        <item name="colorSecondary">#2d7309</item>
-        <item name="colorPrimaryDark">#2d7309</item>
+        <item name="colorSecondary">#38900c</item>
+        <item name="colorPrimaryDark">#306914</item>
         <item name="table_row_dark_bg">#1b4706</item>
         <item name="table_row_light_bg">#122f04</item>
     </style>
@@ -243,8 +243,8 @@
     <style name="AppTheme.105" parent="AppTheme">
         <item name="colorPrimary">#2d910c</item>
         <item name="colorPrimaryTransparent">#002d910c</item>
-        <item name="colorSecondary">#247409</item>
-        <item name="colorPrimaryDark">#247409</item>
+        <item name="colorSecondary">#2d910c</item>
+        <item name="colorPrimaryDark">#296a14</item>
         <item name="table_row_dark_bg">#164706</item>
         <item name="table_row_light_bg">#0f2f04</item>
     </style>
@@ -252,8 +252,8 @@
     <style name="AppTheme.110" parent="AppTheme">
         <item name="colorPrimary">#22910c</item>
         <item name="colorPrimaryTransparent">#0022910c</item>
-        <item name="colorSecondary">#1b7409</item>
-        <item name="colorPrimaryDark">#1b7409</item>
+        <item name="colorSecondary">#22910c</item>
+        <item name="colorPrimaryDark">#226a14</item>
         <item name="table_row_dark_bg">#114706</item>
         <item name="table_row_light_bg">#0b2f04</item>
     </style>
@@ -261,8 +261,8 @@
     <style name="AppTheme.115" parent="AppTheme">
         <item name="colorPrimary">#17920c</item>
         <item name="colorPrimaryTransparent">#0017920c</item>
-        <item name="colorSecondary">#12750a</item>
-        <item name="colorPrimaryDark">#12750a</item>
+        <item name="colorSecondary">#17920c</item>
+        <item name="colorPrimaryDark">#1b6a14</item>
         <item name="table_row_dark_bg">#0b4706</item>
         <item name="table_row_light_bg">#072f04</item>
     </style>
@@ -270,8 +270,8 @@
     <style name="AppTheme.120" parent="AppTheme">
         <item name="colorPrimary">#0c920c</item>
         <item name="colorPrimaryTransparent">#000c920c</item>
-        <item name="colorSecondary">#0a750a</item>
-        <item name="colorPrimaryDark">#0a750a</item>
+        <item name="colorSecondary">#0c920c</item>
+        <item name="colorPrimaryDark">#146a14</item>
         <item name="table_row_dark_bg">#064706</item>
         <item name="table_row_light_bg">#042f04</item>
     </style>
@@ -279,8 +279,8 @@
     <style name="AppTheme.125" parent="AppTheme">
         <item name="colorPrimary">#0c9217</item>
         <item name="colorPrimaryTransparent">#000c9217</item>
-        <item name="colorSecondary">#0a7512</item>
-        <item name="colorPrimaryDark">#0a7512</item>
+        <item name="colorSecondary">#0c9217</item>
+        <item name="colorPrimaryDark">#146a1b</item>
         <item name="table_row_dark_bg">#06470b</item>
         <item name="table_row_light_bg">#042f07</item>
     </style>
@@ -288,8 +288,8 @@
     <style name="AppTheme.130" parent="AppTheme">
         <item name="colorPrimary">#0c9222</item>
         <item name="colorPrimaryTransparent">#000c9222</item>
-        <item name="colorSecondary">#0a751b</item>
-        <item name="colorPrimaryDark">#0a751b</item>
+        <item name="colorSecondary">#0c9222</item>
+        <item name="colorPrimaryDark">#146a23</item>
         <item name="table_row_dark_bg">#064711</item>
         <item name="table_row_light_bg">#042f0b</item>
     </style>
@@ -297,8 +297,8 @@
     <style name="AppTheme.135" parent="AppTheme">
         <item name="colorPrimary">#0c922d</item>
         <item name="colorPrimaryTransparent">#000c922d</item>
-        <item name="colorSecondary">#0a7524</item>
-        <item name="colorPrimaryDark">#0a7524</item>
+        <item name="colorSecondary">#0c922d</item>
+        <item name="colorPrimaryDark">#146a2a</item>
         <item name="table_row_dark_bg">#064716</item>
         <item name="table_row_light_bg">#042f0f</item>
     </style>
@@ -306,8 +306,8 @@
     <style name="AppTheme.140" parent="AppTheme">
         <item name="colorPrimary">#0c9138</item>
         <item name="colorPrimaryTransparent">#000c9138</item>
-        <item name="colorSecondary">#09742d</item>
-        <item name="colorPrimaryDark">#09742d</item>
+        <item name="colorSecondary">#0c9138</item>
+        <item name="colorPrimaryDark">#146a31</item>
         <item name="table_row_dark_bg">#06471b</item>
         <item name="table_row_light_bg">#042f12</item>
     </style>
@@ -315,8 +315,8 @@
     <style name="AppTheme.145" parent="AppTheme">
         <item name="colorPrimary">#0c9143</item>
         <item name="colorPrimaryTransparent">#000c9143</item>
-        <item name="colorSecondary">#097436</item>
-        <item name="colorPrimaryDark">#097436</item>
+        <item name="colorSecondary">#0c9143</item>
+        <item name="colorPrimaryDark">#146a38</item>
         <item name="table_row_dark_bg">#064721</item>
         <item name="table_row_light_bg">#042f16</item>
     </style>
@@ -324,8 +324,8 @@
     <style name="AppTheme.150" parent="AppTheme">
         <item name="colorPrimary">#0c904e</item>
         <item name="colorPrimaryTransparent">#000c904e</item>
-        <item name="colorSecondary">#09733e</item>
-        <item name="colorPrimaryDark">#09733e</item>
+        <item name="colorSecondary">#0c904e</item>
+        <item name="colorPrimaryDark">#14693e</item>
         <item name="table_row_dark_bg">#064726</item>
         <item name="table_row_light_bg">#042f1a</item>
     </style>
@@ -333,8 +333,8 @@
     <style name="AppTheme.155" parent="AppTheme">
         <item name="colorPrimary">#0c9059</item>
         <item name="colorPrimaryTransparent">#000c9059</item>
-        <item name="colorSecondary">#097347</item>
-        <item name="colorPrimaryDark">#097347</item>
+        <item name="colorSecondary">#0c9059</item>
+        <item name="colorPrimaryDark">#146945</item>
         <item name="table_row_dark_bg">#06472c</item>
         <item name="table_row_light_bg">#042f1d</item>
     </style>
@@ -342,8 +342,8 @@
     <style name="AppTheme.160" parent="AppTheme">
         <item name="colorPrimary">#0c8f63</item>
         <item name="colorPrimaryTransparent">#000c8f63</item>
-        <item name="colorSecondary">#097350</item>
-        <item name="colorPrimaryDark">#097350</item>
+        <item name="colorSecondary">#0c8f63</item>
+        <item name="colorPrimaryDark">#14684c</item>
         <item name="table_row_dark_bg">#064731</item>
         <item name="table_row_light_bg">#042f21</item>
     </style>
@@ -351,8 +351,8 @@
     <style name="AppTheme.165" parent="AppTheme">
         <item name="colorPrimary">#0c8e6e</item>
         <item name="colorPrimaryTransparent">#000c8e6e</item>
-        <item name="colorSecondary">#097258</item>
-        <item name="colorPrimaryDark">#097258</item>
+        <item name="colorSecondary">#0c8e6e</item>
+        <item name="colorPrimaryDark">#146753</item>
         <item name="table_row_dark_bg">#064737</item>
         <item name="table_row_light_bg">#042f24</item>
     </style>
@@ -360,8 +360,8 @@
     <style name="AppTheme.170" parent="AppTheme">
         <item name="colorPrimary">#0c8e79</item>
         <item name="colorPrimaryTransparent">#000c8e79</item>
-        <item name="colorSecondary">#097261</item>
-        <item name="colorPrimaryDark">#097261</item>
+        <item name="colorSecondary">#0c8e79</item>
+        <item name="colorPrimaryDark">#14675a</item>
         <item name="table_row_dark_bg">#06473c</item>
         <item name="table_row_light_bg">#042f28</item>
     </style>
@@ -369,8 +369,8 @@
     <style name="AppTheme.175" parent="AppTheme">
         <item name="colorPrimary">#0b8e83</item>
         <item name="colorPrimaryTransparent">#000b8e83</item>
-        <item name="colorSecondary">#097169</item>
-        <item name="colorPrimaryDark">#097169</item>
+        <item name="colorSecondary">#0b8e83</item>
+        <item name="colorPrimaryDark">#146760</item>
         <item name="table_row_dark_bg">#064741</item>
         <item name="table_row_light_bg">#042f2c</item>
     </style>
@@ -378,8 +378,8 @@
     <style name="AppTheme.180" parent="AppTheme">
         <item name="colorPrimary">#0b8d8d</item>
         <item name="colorPrimaryTransparent">#000b8d8d</item>
-        <item name="colorSecondary">#097070</item>
-        <item name="colorPrimaryDark">#097070</item>
+        <item name="colorSecondary">#0b8d8d</item>
+        <item name="colorPrimaryDark">#136666</item>
         <item name="table_row_dark_bg">#064747</item>
         <item name="table_row_light_bg">#042f2f</item>
     </style>
@@ -387,8 +387,8 @@
     <style name="AppTheme.185" parent="AppTheme">
         <item name="colorPrimary">#0c8b97</item>
         <item name="colorPrimaryTransparent">#000c8b97</item>
-        <item name="colorSecondary">#0a7079</item>
-        <item name="colorPrimaryDark">#0a7079</item>
+        <item name="colorSecondary">#0c8b97</item>
+        <item name="colorPrimaryDark">#15666e</item>
         <item name="table_row_dark_bg">#064147</item>
         <item name="table_row_light_bg">#042c2f</item>
     </style>
@@ -396,8 +396,8 @@
     <style name="AppTheme.190" parent="AppTheme">
         <item name="colorPrimary">#0d89a2</item>
         <item name="colorPrimaryTransparent">#000d89a2</item>
-        <item name="colorSecondary">#0b6e82</item>
-        <item name="colorPrimaryDark">#0b6e82</item>
+        <item name="colorSecondary">#0d89a2</item>
+        <item name="colorPrimaryDark">#166676</item>
         <item name="table_row_dark_bg">#063c47</item>
         <item name="table_row_light_bg">#04282f</item>
     </style>
@@ -405,8 +405,8 @@
     <style name="AppTheme.195" parent="AppTheme">
         <item name="colorPrimary">#0e88b0</item>
         <item name="colorPrimaryTransparent">#000e88b0</item>
-        <item name="colorSecondary">#0b6d8d</item>
-        <item name="colorPrimaryDark">#0b6d8d</item>
+        <item name="colorSecondary">#0e88b0</item>
+        <item name="colorPrimaryDark">#186680</item>
         <item name="table_row_dark_bg">#063747</item>
         <item name="table_row_light_bg">#04242f</item>
     </style>
@@ -414,8 +414,8 @@
     <style name="AppTheme.200" parent="AppTheme">
         <item name="colorPrimary">#1086c0</item>
         <item name="colorPrimaryTransparent">#001086c0</item>
-        <item name="colorSecondary">#0d6b9a</item>
-        <item name="colorPrimaryDark">#0d6b9a</item>
+        <item name="colorSecondary">#1086c0</item>
+        <item name="colorPrimaryDark">#1b668c</item>
         <item name="table_row_dark_bg">#063147</item>
         <item name="table_row_light_bg">#04212f</item>
     </style>
@@ -423,8 +423,8 @@
     <style name="AppTheme.205" parent="AppTheme">
         <item name="colorPrimary">#1182d2</item>
         <item name="colorPrimaryTransparent">#001182d2</item>
-        <item name="colorSecondary">#0e68a8</item>
-        <item name="colorPrimaryDark">#0e68a8</item>
+        <item name="colorSecondary">#1182d2</item>
+        <item name="colorPrimaryDark">#1d6599</item>
         <item name="table_row_dark_bg">#062c47</item>
         <item name="table_row_light_bg">#041d2f</item>
     </style>
@@ -432,8 +432,8 @@
     <style name="AppTheme.210" parent="AppTheme">
         <item name="colorPrimary">#137de8</item>
         <item name="colorPrimaryTransparent">#00137de8</item>
-        <item name="colorSecondary">#0f64ba</item>
-        <item name="colorPrimaryDark">#0f64ba</item>
+        <item name="colorSecondary">#137de8</item>
+        <item name="colorPrimaryDark">#2064a9</item>
         <item name="table_row_dark_bg">#062647</item>
         <item name="table_row_light_bg">#041a2f</item>
     </style>
@@ -441,17 +441,17 @@
     <style name="AppTheme.215" parent="AppTheme">
         <item name="colorPrimary">#297bee</item>
         <item name="colorPrimaryTransparent">#00297bee</item>
-        <item name="colorSecondary">#1160ce</item>
-        <item name="colorPrimaryDark">#1160ce</item>
+        <item name="colorSecondary">#297bee</item>
+        <item name="colorPrimaryDark">#2463bb</item>
         <item name="table_row_dark_bg">#062147</item>
         <item name="table_row_light_bg">#04162f</item>
     </style>
 
     <style name="AppTheme.220" parent="AppTheme">
-        <item name="colorPrimary">#3d78ef</item>
-        <item name="colorPrimaryTransparent">#003d78ef</item>
-        <item name="colorSecondary">#1256de</item>
-        <item name="colorPrimaryDark">#1256de</item>
+        <item name="colorPrimary">#3e79ef</item>
+        <item name="colorPrimaryTransparent">#003e79ef</item>
+        <item name="colorSecondary">#3e79ef</item>
+        <item name="colorPrimaryDark">#275dca</item>
         <item name="table_row_dark_bg">#061b47</item>
         <item name="table_row_light_bg">#04122f</item>
     </style>
@@ -459,8 +459,8 @@
     <style name="AppTheme.225" parent="AppTheme">
         <item name="colorPrimary">#4d76f1</item>
         <item name="colorPrimaryTransparent">#004d76f1</item>
-        <item name="colorSecondary">#1349eb</item>
-        <item name="colorPrimaryDark">#1349eb</item>
+        <item name="colorSecondary">#4d76f1</item>
+        <item name="colorPrimaryDark">#2954d5</item>
         <item name="table_row_dark_bg">#061647</item>
         <item name="table_row_light_bg">#040f2f</item>
     </style>
@@ -468,8 +468,8 @@
     <style name="AppTheme.230" parent="AppTheme">
         <item name="colorPrimary">#5a73f2</item>
         <item name="colorPrimaryTransparent">#005a73f2</item>
-        <item name="colorSecondary">#1d3fed</item>
-        <item name="colorPrimaryDark">#1d3fed</item>
+        <item name="colorSecondary">#5a73f2</item>
+        <item name="colorPrimaryDark">#314dd8</item>
         <item name="table_row_dark_bg">#061147</item>
         <item name="table_row_light_bg">#040b2f</item>
     </style>
@@ -477,8 +477,8 @@
     <style name="AppTheme.235" parent="AppTheme">
         <item name="colorPrimary">#6470f2</item>
         <item name="colorPrimaryTransparent">#006470f2</item>
-        <item name="colorSecondary">#2536ed</item>
-        <item name="colorPrimaryDark">#2536ed</item>
+        <item name="colorSecondary">#6470f2</item>
+        <item name="colorPrimaryDark">#3946d9</item>
         <item name="table_row_dark_bg">#060b47</item>
         <item name="table_row_light_bg">#04072f</item>
     </style>
@@ -486,8 +486,8 @@
     <style name="AppTheme.240" parent="AppTheme">
         <item name="colorPrimary">#6e6ef3</item>
         <item name="colorPrimaryTransparent">#006e6ef3</item>
-        <item name="colorSecondary">#2c2cee</item>
-        <item name="colorPrimaryDark">#2c2cee</item>
+        <item name="colorSecondary">#6e6ef3</item>
+        <item name="colorPrimaryDark">#4040db</item>
         <item name="table_row_dark_bg">#060647</item>
         <item name="table_row_light_bg">#04042f</item>
     </style>
@@ -495,8 +495,8 @@
     <style name="AppTheme.245" parent="AppTheme">
         <item name="colorPrimary">#766bf3</item>
         <item name="colorPrimaryTransparent">#00766bf3</item>
-        <item name="colorSecondary">#3a2aee</item>
-        <item name="colorPrimaryDark">#3a2aee</item>
+        <item name="colorSecondary">#766bf3</item>
+        <item name="colorPrimaryDark">#4b3eda</item>
         <item name="table_row_dark_bg">#0b0647</item>
         <item name="table_row_light_bg">#07042f</item>
     </style>
@@ -504,8 +504,8 @@
     <style name="AppTheme.250" parent="AppTheme">
         <item name="colorPrimary">#7f68f3</item>
         <item name="colorPrimaryTransparent">#007f68f3</item>
-        <item name="colorSecondary">#4928ee</item>
-        <item name="colorPrimaryDark">#4928ee</item>
+        <item name="colorSecondary">#7f68f3</item>
+        <item name="colorPrimaryDark">#563cda</item>
         <item name="table_row_dark_bg">#110647</item>
         <item name="table_row_light_bg">#0b042f</item>
     </style>
@@ -513,8 +513,8 @@
     <style name="AppTheme.255" parent="AppTheme">
         <item name="colorPrimary">#8864f2</item>
         <item name="colorPrimaryTransparent">#008864f2</item>
-        <item name="colorSecondary">#5725ed</item>
-        <item name="colorPrimaryDark">#5725ed</item>
+        <item name="colorSecondary">#8864f2</item>
+        <item name="colorPrimaryDark">#6139d9</item>
         <item name="table_row_dark_bg">#160647</item>
         <item name="table_row_light_bg">#0f042f</item>
     </style>
@@ -522,8 +522,8 @@
     <style name="AppTheme.260" parent="AppTheme">
         <item name="colorPrimary">#9161f2</item>
         <item name="colorPrimaryTransparent">#009161f2</item>
-        <item name="colorSecondary">#6622ed</item>
-        <item name="colorPrimaryDark">#6622ed</item>
+        <item name="colorSecondary">#9161f2</item>
+        <item name="colorPrimaryDark">#6c36d9</item>
         <item name="table_row_dark_bg">#1b0647</item>
         <item name="table_row_light_bg">#12042f</item>
     </style>
@@ -531,8 +531,8 @@
     <style name="AppTheme.265" parent="AppTheme">
         <item name="colorPrimary">#9a5bf2</item>
         <item name="colorPrimaryTransparent">#009a5bf2</item>
-        <item name="colorSecondary">#741ded</item>
-        <item name="colorPrimaryDark">#741ded</item>
+        <item name="colorSecondary">#9a5bf2</item>
+        <item name="colorPrimaryDark">#7732d8</item>
         <item name="table_row_dark_bg">#210647</item>
         <item name="table_row_light_bg">#16042f</item>
     </style>
@@ -540,8 +540,8 @@
     <style name="AppTheme.270" parent="AppTheme">
         <item name="colorPrimary">#a355f1</item>
         <item name="colorPrimaryTransparent">#00a355f1</item>
-        <item name="colorSecondary">#8319ec</item>
-        <item name="colorPrimaryDark">#8319ec</item>
+        <item name="colorSecondary">#a355f1</item>
+        <item name="colorPrimaryDark">#832ed7</item>
         <item name="table_row_dark_bg">#260647</item>
         <item name="table_row_light_bg">#1a042f</item>
     </style>
@@ -549,8 +549,8 @@
     <style name="AppTheme.275" parent="AppTheme">
         <item name="colorPrimary">#ad4ff1</item>
         <item name="colorPrimaryTransparent">#00ad4ff1</item>
-        <item name="colorSecondary">#9214ec</item>
-        <item name="colorPrimaryDark">#9214ec</item>
+        <item name="colorSecondary">#ad4ff1</item>
+        <item name="colorPrimaryDark">#8e29d6</item>
         <item name="table_row_dark_bg">#2c0647</item>
         <item name="table_row_light_bg">#1d042f</item>
     </style>
@@ -558,8 +558,8 @@
     <style name="AppTheme.280" parent="AppTheme">
         <item name="colorPrimary">#b746f0</item>
         <item name="colorPrimaryTransparent">#00b746f0</item>
-        <item name="colorSecondary">#9f13e5</item>
-        <item name="colorPrimaryDark">#9f13e5</item>
+        <item name="colorSecondary">#b746f0</item>
+        <item name="colorPrimaryDark">#9828d0</item>
         <item name="table_row_dark_bg">#310647</item>
         <item name="table_row_light_bg">#21042f</item>
     </style>
@@ -567,8 +567,8 @@
     <style name="AppTheme.285" parent="AppTheme">
         <item name="colorPrimary">#c23bef</item>
         <item name="colorPrimaryTransparent">#00c23bef</item>
-        <item name="colorSecondary">#aa12dc</item>
-        <item name="colorPrimaryDark">#aa12dc</item>
+        <item name="colorSecondary">#c23bef</item>
+        <item name="colorPrimaryDark">#a026c8</item>
         <item name="table_row_dark_bg">#370647</item>
         <item name="table_row_light_bg">#24042f</item>
     </style>
@@ -576,8 +576,8 @@
     <style name="AppTheme.290" parent="AppTheme">
         <item name="colorPrimary">#cd2aee</item>
         <item name="colorPrimaryTransparent">#00cd2aee</item>
-        <item name="colorSecondary">#af11cf</item>
-        <item name="colorPrimaryDark">#af11cf</item>
+        <item name="colorSecondary">#cd2aee</item>
+        <item name="colorPrimaryDark">#a224bc</item>
         <item name="table_row_dark_bg">#3c0647</item>
         <item name="table_row_light_bg">#28042f</item>
     </style>
@@ -585,8 +585,8 @@
     <style name="AppTheme.295" parent="AppTheme">
         <item name="colorPrimary">#d713e9</item>
         <item name="colorPrimaryTransparent">#00d713e9</item>
-        <item name="colorSecondary">#ac0fba</item>
-        <item name="colorPrimaryDark">#ac0fba</item>
+        <item name="colorSecondary">#d713e9</item>
+        <item name="colorPrimaryDark">#9e20a9</item>
         <item name="table_row_dark_bg">#410647</item>
         <item name="table_row_light_bg">#2c042f</item>
     </style>
@@ -594,8 +594,8 @@
     <style name="AppTheme.300" parent="AppTheme">
         <item name="colorPrimary">#dc12dc</item>
         <item name="colorPrimaryTransparent">#00dc12dc</item>
-        <item name="colorSecondary">#b00eb0</item>
-        <item name="colorPrimaryDark">#b00eb0</item>
+        <item name="colorSecondary">#dc12dc</item>
+        <item name="colorPrimaryDark">#a01ea0</item>
         <item name="table_row_dark_bg">#470647</item>
         <item name="table_row_light_bg">#2f042f</item>
     </style>
@@ -603,8 +603,8 @@
     <style name="AppTheme.305" parent="AppTheme">
         <item name="colorPrimary">#e112cf</item>
         <item name="colorPrimaryTransparent">#00e112cf</item>
-        <item name="colorSecondary">#b40fa6</item>
-        <item name="colorPrimaryDark">#b40fa6</item>
+        <item name="colorSecondary">#e112cf</item>
+        <item name="colorPrimaryDark">#a31f98</item>
         <item name="table_row_dark_bg">#470641</item>
         <item name="table_row_light_bg">#2f042c</item>
     </style>
@@ -612,8 +612,8 @@
     <style name="AppTheme.310" parent="AppTheme">
         <item name="colorPrimary">#e413c1</item>
         <item name="colorPrimaryTransparent">#00e413c1</item>
-        <item name="colorSecondary">#b70f9b</item>
-        <item name="colorPrimaryDark">#b70f9b</item>
+        <item name="colorSecondary">#e413c1</item>
+        <item name="colorPrimaryDark">#a6208f</item>
         <item name="table_row_dark_bg">#47063c</item>
         <item name="table_row_light_bg">#2f0428</item>
     </style>
@@ -621,8 +621,8 @@
     <style name="AppTheme.315" parent="AppTheme">
         <item name="colorPrimary">#e813b3</item>
         <item name="colorPrimaryTransparent">#00e813b3</item>
-        <item name="colorSecondary">#ba0f8f</item>
-        <item name="colorPrimaryDark">#ba0f8f</item>
+        <item name="colorSecondary">#e813b3</item>
+        <item name="colorPrimaryDark">#a92086</item>
         <item name="table_row_dark_bg">#470637</item>
         <item name="table_row_light_bg">#2f0424</item>
     </style>
@@ -630,8 +630,8 @@
     <style name="AppTheme.320" parent="AppTheme">
         <item name="colorPrimary">#eb13a3</item>
         <item name="colorPrimaryTransparent">#00eb13a3</item>
-        <item name="colorSecondary">#bc0f82</item>
-        <item name="colorPrimaryDark">#bc0f82</item>
+        <item name="colorSecondary">#eb13a3</item>
+        <item name="colorPrimaryDark">#ab217d</item>
         <item name="table_row_dark_bg">#470631</item>
         <item name="table_row_light_bg">#2f0421</item>
     </style>
@@ -639,8 +639,8 @@
     <style name="AppTheme.325" parent="AppTheme">
         <item name="colorPrimary">#ec1a95</item>
         <item name="colorPrimaryTransparent">#00ec1a95</item>
-        <item name="colorSecondary">#c21078</item>
-        <item name="colorPrimaryDark">#c21078</item>
+        <item name="colorSecondary">#ec1a95</item>
+        <item name="colorPrimaryDark">#b02275</item>
         <item name="table_row_dark_bg">#47062c</item>
         <item name="table_row_light_bg">#2f041d</item>
     </style>
@@ -648,8 +648,8 @@
     <style name="AppTheme.330" parent="AppTheme">
         <item name="colorPrimary">#ed2087</item>
         <item name="colorPrimaryTransparent">#00ed2087</item>
-        <item name="colorSecondary">#c7106c</item>
-        <item name="colorPrimaryDark">#c7106c</item>
+        <item name="colorSecondary">#ed2087</item>
+        <item name="colorPrimaryDark">#b5226c</item>
         <item name="table_row_dark_bg">#470626</item>
         <item name="table_row_light_bg">#2f041a</item>
     </style>
@@ -657,8 +657,8 @@
     <style name="AppTheme.335" parent="AppTheme">
         <item name="colorPrimary">#ed2679</item>
         <item name="colorPrimaryTransparent">#00ed2679</item>
-        <item name="colorSecondary">#cc115f</item>
-        <item name="colorPrimaryDark">#cc115f</item>
+        <item name="colorSecondary">#ed2679</item>
+        <item name="colorPrimaryDark">#b92362</item>
         <item name="table_row_dark_bg">#470621</item>
         <item name="table_row_light_bg">#2f0416</item>
     </style>
@@ -666,8 +666,8 @@
     <style name="AppTheme.340" parent="AppTheme">
         <item name="colorPrimary">#ee2a6b</item>
         <item name="colorPrimaryTransparent">#00ee2a6b</item>
-        <item name="colorSecondary">#cf1150</item>
-        <item name="colorPrimaryDark">#cf1150</item>
+        <item name="colorSecondary">#ee2a6b</item>
+        <item name="colorPrimaryDark">#bc2456</item>
         <item name="table_row_dark_bg">#47061b</item>
         <item name="table_row_light_bg">#2f0412</item>
     </style>
@@ -675,8 +675,8 @@
     <style name="AppTheme.345" parent="AppTheme">
         <item name="colorPrimary">#ee2d5d</item>
         <item name="colorPrimaryTransparent">#00ee2d5d</item>
-        <item name="colorSecondary">#d11141</item>
-        <item name="colorPrimaryDark">#d11141</item>
+        <item name="colorSecondary">#ee2d5d</item>
+        <item name="colorPrimaryDark">#be244b</item>
         <item name="table_row_dark_bg">#470616</item>
         <item name="table_row_light_bg">#2f040f</item>
     </style>
@@ -684,8 +684,8 @@
     <style name="AppTheme.350" parent="AppTheme">
         <item name="colorPrimary">#ee2f4f</item>
         <item name="colorPrimaryTransparent">#00ee2f4f</item>
-        <item name="colorSecondary">#d31132</item>
-        <item name="colorPrimaryDark">#d31132</item>
+        <item name="colorSecondary">#ee2f4f</item>
+        <item name="colorPrimaryDark">#c0253e</item>
         <item name="table_row_dark_bg">#470611</item>
         <item name="table_row_light_bg">#2f040b</item>
     </style>
@@ -693,8 +693,8 @@
     <style name="AppTheme.355" parent="AppTheme">
         <item name="colorPrimary">#ee3141</item>
         <item name="colorPrimaryTransparent">#00ee3141</item>
-        <item name="colorSecondary">#d51122</item>
-        <item name="colorPrimaryDark">#d51122</item>
+        <item name="colorSecondary">#ee3141</item>
+        <item name="colorPrimaryDark">#c12532</item>
         <item name="table_row_dark_bg">#47060b</item>
         <item name="table_row_light_bg">#2f0407</item>
     </style>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9ac40fba..d7977654 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -49,8 +49,8 @@
     <style name="AppTheme.default" parent="AppTheme">
         <item name="colorPrimary">#935ff2</item>
         <item name="colorPrimaryTransparent">#00935ff2</item>
-        <item name="colorSecondary">#6920ed</item>
-        <item name="colorPrimaryDark">#6920ed</item>
+        <item name="colorSecondary">#935ff2</item>
+        <item name="colorPrimaryDark">#6f35d8</item>
         <item name="table_row_dark_bg">#efe7fd</item>
         <item name="table_row_light_bg">#f9f6fe</item>
     </style>
@@ -58,8 +58,8 @@
     <style name="AppTheme.000" parent="AppTheme">
         <item name="colorPrimary">#ee3232</item>
         <item name="colorPrimaryTransparent">#00ee3232</item>
-        <item name="colorSecondary">#d61111</item>
-        <item name="colorPrimaryDark">#d61111</item>
+        <item name="colorSecondary">#ee3232</item>
+        <item name="colorPrimaryDark">#c22525</item>
         <item name="table_row_dark_bg">#fde7e7</item>
         <item name="table_row_light_bg">#fef6f6</item>
     </style>
@@ -67,8 +67,8 @@
     <style name="AppTheme.005" parent="AppTheme">
         <item name="colorPrimary">#ed3625</item>
         <item name="colorPrimaryTransparent">#00ed3625</item>
-        <item name="colorSecondary">#cb2010</item>
-        <item name="colorPrimaryDark">#cb2010</item>
+        <item name="colorSecondary">#ed3625</item>
+        <item name="colorPrimaryDark">#b83023</item>
         <item name="table_row_dark_bg">#fde9e7</item>
         <item name="table_row_light_bg">#fef6f6</item>
     </style>
@@ -76,8 +76,8 @@
     <style name="AppTheme.010" parent="AppTheme">
         <item name="colorPrimary">#ec3915</item>
         <item name="colorPrimaryTransparent">#00ec3915</item>
-        <item name="colorSecondary">#be2d0f</item>
-        <item name="colorPrimaryDark">#be2d0f</item>
+        <item name="colorSecondary">#ec3915</item>
+        <item name="colorPrimaryDark">#ad3821</item>
         <item name="table_row_dark_bg">#fdebe7</item>
         <item name="table_row_light_bg">#fef7f6</item>
     </style>
@@ -85,8 +85,8 @@
     <style name="AppTheme.015" parent="AppTheme">
         <item name="colorPrimary">#e24612</item>
         <item name="colorPrimaryTransparent">#00e24612</item>
-        <item name="colorSecondary">#b5380f</item>
-        <item name="colorPrimaryDark">#b5380f</item>
+        <item name="colorSecondary">#e24612</item>
+        <item name="colorPrimaryDark">#a4411f</item>
         <item name="table_row_dark_bg">#fdede7</item>
         <item name="table_row_light_bg">#fef8f6</item>
     </style>
@@ -94,8 +94,8 @@
     <style name="AppTheme.020" parent="AppTheme">
         <item name="colorPrimary">#d75311</item>
         <item name="colorPrimaryTransparent">#00d75311</item>
-        <item name="colorSecondary">#ac430e</item>
-        <item name="colorPrimaryDark">#ac430e</item>
+        <item name="colorSecondary">#d75311</item>
+        <item name="colorPrimaryDark">#9c481e</item>
         <item name="table_row_dark_bg">#fdefe7</item>
         <item name="table_row_light_bg">#fef8f6</item>
     </style>
@@ -103,8 +103,8 @@
     <style name="AppTheme.025" parent="AppTheme">
         <item name="colorPrimary">#cb5e10</item>
         <item name="colorPrimaryTransparent">#00cb5e10</item>
-        <item name="colorSecondary">#a24b0d</item>
-        <item name="colorPrimaryDark">#a24b0d</item>
+        <item name="colorSecondary">#cb5e10</item>
+        <item name="colorPrimaryDark">#934e1c</item>
         <item name="table_row_dark_bg">#fdf0e7</item>
         <item name="table_row_light_bg">#fef9f6</item>
     </style>
@@ -112,8 +112,8 @@
     <style name="AppTheme.030" parent="AppTheme">
         <item name="colorPrimary">#bf670f</item>
         <item name="colorPrimaryTransparent">#00bf670f</item>
-        <item name="colorSecondary">#98520c</item>
-        <item name="colorPrimaryDark">#98520c</item>
+        <item name="colorSecondary">#bf670f</item>
+        <item name="colorPrimaryDark">#8a521a</item>
         <item name="table_row_dark_bg">#fdf2e7</item>
         <item name="table_row_light_bg">#fefaf6</item>
     </style>
@@ -121,8 +121,8 @@
     <style name="AppTheme.035" parent="AppTheme">
         <item name="colorPrimary">#b26e0e</item>
         <item name="colorPrimaryTransparent">#00b26e0e</item>
-        <item name="colorSecondary">#8f580c</item>
-        <item name="colorPrimaryDark">#8f580c</item>
+        <item name="colorSecondary">#b26e0e</item>
+        <item name="colorPrimaryDark">#825619</item>
         <item name="table_row_dark_bg">#fdf4e7</item>
         <item name="table_row_light_bg">#fefbf6</item>
     </style>
@@ -130,8 +130,8 @@
     <style name="AppTheme.040" parent="AppTheme">
         <item name="colorPrimary">#a7740e</item>
         <item name="colorPrimaryTransparent">#00a7740e</item>
-        <item name="colorSecondary">#865d0b</item>
-        <item name="colorPrimaryDark">#865d0b</item>
+        <item name="colorSecondary">#a7740e</item>
+        <item name="colorPrimaryDark">#795917</item>
         <item name="table_row_dark_bg">#fdf6e7</item>
         <item name="table_row_light_bg">#fefbf6</item>
     </style>
@@ -139,8 +139,8 @@
     <style name="AppTheme.045" parent="AppTheme">
         <item name="colorPrimary">#9d790d</item>
         <item name="colorPrimaryTransparent">#009d790d</item>
-        <item name="colorSecondary">#7d610a</item>
-        <item name="colorPrimaryDark">#7d610a</item>
+        <item name="colorSecondary">#9d790d</item>
+        <item name="colorPrimaryDark">#725b16</item>
         <item name="table_row_dark_bg">#fdf8e7</item>
         <item name="table_row_light_bg">#fefcf6</item>
     </style>
@@ -148,8 +148,8 @@
     <style name="AppTheme.050" parent="AppTheme">
         <item name="colorPrimary">#937d0c</item>
         <item name="colorPrimaryTransparent">#00937d0c</item>
-        <item name="colorSecondary">#76640a</item>
-        <item name="colorPrimaryDark">#76640a</item>
+        <item name="colorSecondary">#937d0c</item>
+        <item name="colorPrimaryDark">#6b5c14</item>
         <item name="table_row_dark_bg">#fdf9e7</item>
         <item name="table_row_light_bg">#fefdf6</item>
     </style>
@@ -157,8 +157,8 @@
     <style name="AppTheme.055" parent="AppTheme">
         <item name="colorPrimary">#8b800b</item>
         <item name="colorPrimaryTransparent">#008b800b</item>
-        <item name="colorSecondary">#6f6609</item>
-        <item name="colorPrimaryDark">#6f6609</item>
+        <item name="colorSecondary">#8b800b</item>
+        <item name="colorPrimaryDark">#655e13</item>
         <item name="table_row_dark_bg">#fdfbe7</item>
         <item name="table_row_light_bg">#fefef6</item>
     </style>
@@ -166,8 +166,8 @@
     <style name="AppTheme.060" parent="AppTheme">
         <item name="colorPrimary">#82820b</item>
         <item name="colorPrimaryTransparent">#0082820b</item>
-        <item name="colorSecondary">#686808</item>
-        <item name="colorPrimaryDark">#686808</item>
+        <item name="colorSecondary">#82820b</item>
+        <item name="colorPrimaryDark">#5f5f12</item>
         <item name="table_row_dark_bg">#fdfde7</item>
         <item name="table_row_light_bg">#fefef6</item>
     </style>
@@ -175,8 +175,8 @@
     <style name="AppTheme.065" parent="AppTheme">
         <item name="colorPrimary">#7a840b</item>
         <item name="colorPrimaryTransparent">#007a840b</item>
-        <item name="colorSecondary">#626a09</item>
-        <item name="colorPrimaryDark">#626a09</item>
+        <item name="colorSecondary">#7a840b</item>
+        <item name="colorPrimaryDark">#596012</item>
         <item name="table_row_dark_bg">#fbfde7</item>
         <item name="table_row_light_bg">#fefef6</item>
     </style>
@@ -184,8 +184,8 @@
     <style name="AppTheme.070" parent="AppTheme">
         <item name="colorPrimary">#72870b</item>
         <item name="colorPrimaryTransparent">#0072870b</item>
-        <item name="colorSecondary">#5b6c09</item>
-        <item name="colorPrimaryDark">#5b6c09</item>
+        <item name="colorSecondary">#72870b</item>
+        <item name="colorPrimaryDark">#556213</item>
         <item name="table_row_dark_bg">#f9fde7</item>
         <item name="table_row_light_bg">#fdfef6</item>
     </style>
@@ -193,8 +193,8 @@
     <style name="AppTheme.075" parent="AppTheme">
         <item name="colorPrimary">#69890b</item>
         <item name="colorPrimaryTransparent">#0069890b</item>
-        <item name="colorSecondary">#546d09</item>
-        <item name="colorPrimaryDark">#546d09</item>
+        <item name="colorSecondary">#69890b</item>
+        <item name="colorPrimaryDark">#4f6313</item>
         <item name="table_row_dark_bg">#f8fde7</item>
         <item name="table_row_light_bg">#fcfef6</item>
     </style>
@@ -202,8 +202,8 @@
     <style name="AppTheme.080" parent="AppTheme">
         <item name="colorPrimary">#608b0b</item>
         <item name="colorPrimaryTransparent">#00608b0b</item>
-        <item name="colorSecondary">#4d6f09</item>
-        <item name="colorPrimaryDark">#4d6f09</item>
+        <item name="colorSecondary">#608b0b</item>
+        <item name="colorPrimaryDark">#4a6513</item>
         <item name="table_row_dark_bg">#f6fde7</item>
         <item name="table_row_light_bg">#fbfef6</item>
     </style>
@@ -211,8 +211,8 @@
     <style name="AppTheme.085" parent="AppTheme">
         <item name="colorPrimary">#568c0b</item>
         <item name="colorPrimaryTransparent">#00568c0b</item>
-        <item name="colorSecondary">#457009</item>
-        <item name="colorPrimaryDark">#457009</item>
+        <item name="colorSecondary">#568c0b</item>
+        <item name="colorPrimaryDark">#436513</item>
         <item name="table_row_dark_bg">#f4fde7</item>
         <item name="table_row_light_bg">#fbfef6</item>
     </style>
@@ -220,8 +220,8 @@
     <style name="AppTheme.090" parent="AppTheme">
         <item name="colorPrimary">#4d8e0b</item>
         <item name="colorPrimaryTransparent">#004d8e0b</item>
-        <item name="colorSecondary">#3d7109</item>
-        <item name="colorPrimaryDark">#3d7109</item>
+        <item name="colorSecondary">#4d8e0b</item>
+        <item name="colorPrimaryDark">#3d6714</item>
         <item name="table_row_dark_bg">#f2fde7</item>
         <item name="table_row_light_bg">#fafef6</item>
     </style>
@@ -229,8 +229,8 @@
     <style name="AppTheme.095" parent="AppTheme">
         <item name="colorPrimary">#428e0c</item>
         <item name="colorPrimaryTransparent">#00428e0c</item>
-        <item name="colorSecondary">#357209</item>
-        <item name="colorPrimaryDark">#357209</item>
+        <item name="colorSecondary">#428e0c</item>
+        <item name="colorPrimaryDark">#376714</item>
         <item name="table_row_dark_bg">#f0fde7</item>
         <item name="table_row_light_bg">#f9fef6</item>
     </style>
@@ -238,8 +238,8 @@
     <style name="AppTheme.100" parent="AppTheme">
         <item name="colorPrimary">#38900c</item>
         <item name="colorPrimaryTransparent">#0038900c</item>
-        <item name="colorSecondary">#2d7309</item>
-        <item name="colorPrimaryDark">#2d7309</item>
+        <item name="colorSecondary">#38900c</item>
+        <item name="colorPrimaryDark">#306914</item>
         <item name="table_row_dark_bg">#effde7</item>
         <item name="table_row_light_bg">#f8fef6</item>
     </style>
@@ -247,8 +247,8 @@
     <style name="AppTheme.105" parent="AppTheme">
         <item name="colorPrimary">#2d910c</item>
         <item name="colorPrimaryTransparent">#002d910c</item>
-        <item name="colorSecondary">#247409</item>
-        <item name="colorPrimaryDark">#247409</item>
+        <item name="colorSecondary">#2d910c</item>
+        <item name="colorPrimaryDark">#296a14</item>
         <item name="table_row_dark_bg">#edfde7</item>
         <item name="table_row_light_bg">#f8fef6</item>
     </style>
@@ -256,8 +256,8 @@
     <style name="AppTheme.110" parent="AppTheme">
         <item name="colorPrimary">#22910c</item>
         <item name="colorPrimaryTransparent">#0022910c</item>
-        <item name="colorSecondary">#1b7409</item>
-        <item name="colorPrimaryDark">#1b7409</item>
+        <item name="colorSecondary">#22910c</item>
+        <item name="colorPrimaryDark">#226a14</item>
         <item name="table_row_dark_bg">#ebfde7</item>
         <item name="table_row_light_bg">#f7fef6</item>
     </style>
@@ -265,8 +265,8 @@
     <style name="AppTheme.115" parent="AppTheme">
         <item name="colorPrimary">#17920c</item>
         <item name="colorPrimaryTransparent">#0017920c</item>
-        <item name="colorSecondary">#12750a</item>
-        <item name="colorPrimaryDark">#12750a</item>
+        <item name="colorSecondary">#17920c</item>
+        <item name="colorPrimaryDark">#1b6a14</item>
         <item name="table_row_dark_bg">#e9fde7</item>
         <item name="table_row_light_bg">#f6fef6</item>
     </style>
@@ -274,8 +274,8 @@
     <style name="AppTheme.120" parent="AppTheme">
         <item name="colorPrimary">#0c920c</item>
         <item name="colorPrimaryTransparent">#000c920c</item>
-        <item name="colorSecondary">#0a750a</item>
-        <item name="colorPrimaryDark">#0a750a</item>
+        <item name="colorSecondary">#0c920c</item>
+        <item name="colorPrimaryDark">#146a14</item>
         <item name="table_row_dark_bg">#e7fde7</item>
         <item name="table_row_light_bg">#f6fef6</item>
     </style>
@@ -283,8 +283,8 @@
     <style name="AppTheme.125" parent="AppTheme">
         <item name="colorPrimary">#0c9217</item>
         <item name="colorPrimaryTransparent">#000c9217</item>
-        <item name="colorSecondary">#0a7512</item>
-        <item name="colorPrimaryDark">#0a7512</item>
+        <item name="colorSecondary">#0c9217</item>
+        <item name="colorPrimaryDark">#146a1b</item>
         <item name="table_row_dark_bg">#e7fde9</item>
         <item name="table_row_light_bg">#f6fef6</item>
     </style>
@@ -292,8 +292,8 @@
     <style name="AppTheme.130" parent="AppTheme">
         <item name="colorPrimary">#0c9222</item>
         <item name="colorPrimaryTransparent">#000c9222</item>
-        <item name="colorSecondary">#0a751b</item>
-        <item name="colorPrimaryDark">#0a751b</item>
+        <item name="colorSecondary">#0c9222</item>
+        <item name="colorPrimaryDark">#146a23</item>
         <item name="table_row_dark_bg">#e7fdeb</item>
         <item name="table_row_light_bg">#f6fef7</item>
     </style>
@@ -301,8 +301,8 @@
     <style name="AppTheme.135" parent="AppTheme">
         <item name="colorPrimary">#0c922d</item>
         <item name="colorPrimaryTransparent">#000c922d</item>
-        <item name="colorSecondary">#0a7524</item>
-        <item name="colorPrimaryDark">#0a7524</item>
+        <item name="colorSecondary">#0c922d</item>
+        <item name="colorPrimaryDark">#146a2a</item>
         <item name="table_row_dark_bg">#e7fded</item>
         <item name="table_row_light_bg">#f6fef8</item>
     </style>
@@ -310,8 +310,8 @@
     <style name="AppTheme.140" parent="AppTheme">
         <item name="colorPrimary">#0c9138</item>
         <item name="colorPrimaryTransparent">#000c9138</item>
-        <item name="colorSecondary">#09742d</item>
-        <item name="colorPrimaryDark">#09742d</item>
+        <item name="colorSecondary">#0c9138</item>
+        <item name="colorPrimaryDark">#146a31</item>
         <item name="table_row_dark_bg">#e7fdef</item>
         <item name="table_row_light_bg">#f6fef8</item>
     </style>
@@ -319,8 +319,8 @@
     <style name="AppTheme.145" parent="AppTheme">
         <item name="colorPrimary">#0c9143</item>
         <item name="colorPrimaryTransparent">#000c9143</item>
-        <item name="colorSecondary">#097436</item>
-        <item name="colorPrimaryDark">#097436</item>
+        <item name="colorSecondary">#0c9143</item>
+        <item name="colorPrimaryDark">#146a38</item>
         <item name="table_row_dark_bg">#e7fdf0</item>
         <item name="table_row_light_bg">#f6fef9</item>
     </style>
@@ -328,8 +328,8 @@
     <style name="AppTheme.150" parent="AppTheme">
         <item name="colorPrimary">#0c904e</item>
         <item name="colorPrimaryTransparent">#000c904e</item>
-        <item name="colorSecondary">#09733e</item>
-        <item name="colorPrimaryDark">#09733e</item>
+        <item name="colorSecondary">#0c904e</item>
+        <item name="colorPrimaryDark">#14693e</item>
         <item name="table_row_dark_bg">#e7fdf2</item>
         <item name="table_row_light_bg">#f6fefa</item>
     </style>
@@ -337,8 +337,8 @@
     <style name="AppTheme.155" parent="AppTheme">
         <item name="colorPrimary">#0c9059</item>
         <item name="colorPrimaryTransparent">#000c9059</item>
-        <item name="colorSecondary">#097347</item>
-        <item name="colorPrimaryDark">#097347</item>
+        <item name="colorSecondary">#0c9059</item>
+        <item name="colorPrimaryDark">#146945</item>
         <item name="table_row_dark_bg">#e7fdf4</item>
         <item name="table_row_light_bg">#f6fefb</item>
     </style>
@@ -346,8 +346,8 @@
     <style name="AppTheme.160" parent="AppTheme">
         <item name="colorPrimary">#0c8f63</item>
         <item name="colorPrimaryTransparent">#000c8f63</item>
-        <item name="colorSecondary">#097350</item>
-        <item name="colorPrimaryDark">#097350</item>
+        <item name="colorSecondary">#0c8f63</item>
+        <item name="colorPrimaryDark">#14684c</item>
         <item name="table_row_dark_bg">#e7fdf6</item>
         <item name="table_row_light_bg">#f6fefb</item>
     </style>
@@ -355,8 +355,8 @@
     <style name="AppTheme.165" parent="AppTheme">
         <item name="colorPrimary">#0c8e6e</item>
         <item name="colorPrimaryTransparent">#000c8e6e</item>
-        <item name="colorSecondary">#097258</item>
-        <item name="colorPrimaryDark">#097258</item>
+        <item name="colorSecondary">#0c8e6e</item>
+        <item name="colorPrimaryDark">#146753</item>
         <item name="table_row_dark_bg">#e7fdf8</item>
         <item name="table_row_light_bg">#f6fefc</item>
     </style>
@@ -364,8 +364,8 @@
     <style name="AppTheme.170" parent="AppTheme">
         <item name="colorPrimary">#0c8e79</item>
         <item name="colorPrimaryTransparent">#000c8e79</item>
-        <item name="colorSecondary">#097261</item>
-        <item name="colorPrimaryDark">#097261</item>
+        <item name="colorSecondary">#0c8e79</item>
+        <item name="colorPrimaryDark">#14675a</item>
         <item name="table_row_dark_bg">#e7fdf9</item>
         <item name="table_row_light_bg">#f6fefd</item>
     </style>
@@ -373,8 +373,8 @@
     <style name="AppTheme.175" parent="AppTheme">
         <item name="colorPrimary">#0b8e83</item>
         <item name="colorPrimaryTransparent">#000b8e83</item>
-        <item name="colorSecondary">#097169</item>
-        <item name="colorPrimaryDark">#097169</item>
+        <item name="colorSecondary">#0b8e83</item>
+        <item name="colorPrimaryDark">#146760</item>
         <item name="table_row_dark_bg">#e7fdfb</item>
         <item name="table_row_light_bg">#f6fefe</item>
     </style>
@@ -382,8 +382,8 @@
     <style name="AppTheme.180" parent="AppTheme">
         <item name="colorPrimary">#0b8d8d</item>
         <item name="colorPrimaryTransparent">#000b8d8d</item>
-        <item name="colorSecondary">#097070</item>
-        <item name="colorPrimaryDark">#097070</item>
+        <item name="colorSecondary">#0b8d8d</item>
+        <item name="colorPrimaryDark">#136666</item>
         <item name="table_row_dark_bg">#e7fdfd</item>
         <item name="table_row_light_bg">#f6fefe</item>
     </style>
@@ -391,8 +391,8 @@
     <style name="AppTheme.185" parent="AppTheme">
         <item name="colorPrimary">#0c8b97</item>
         <item name="colorPrimaryTransparent">#000c8b97</item>
-        <item name="colorSecondary">#0a7079</item>
-        <item name="colorPrimaryDark">#0a7079</item>
+        <item name="colorSecondary">#0c8b97</item>
+        <item name="colorPrimaryDark">#15666e</item>
         <item name="table_row_dark_bg">#e7fbfd</item>
         <item name="table_row_light_bg">#f6fefe</item>
     </style>
@@ -400,8 +400,8 @@
     <style name="AppTheme.190" parent="AppTheme">
         <item name="colorPrimary">#0d89a2</item>
         <item name="colorPrimaryTransparent">#000d89a2</item>
-        <item name="colorSecondary">#0b6e82</item>
-        <item name="colorPrimaryDark">#0b6e82</item>
+        <item name="colorSecondary">#0d89a2</item>
+        <item name="colorPrimaryDark">#166676</item>
         <item name="table_row_dark_bg">#e7f9fd</item>
         <item name="table_row_light_bg">#f6fdfe</item>
     </style>
@@ -409,8 +409,8 @@
     <style name="AppTheme.195" parent="AppTheme">
         <item name="colorPrimary">#0e88b0</item>
         <item name="colorPrimaryTransparent">#000e88b0</item>
-        <item name="colorSecondary">#0b6d8d</item>
-        <item name="colorPrimaryDark">#0b6d8d</item>
+        <item name="colorSecondary">#0e88b0</item>
+        <item name="colorPrimaryDark">#186680</item>
         <item name="table_row_dark_bg">#e7f8fd</item>
         <item name="table_row_light_bg">#f6fcfe</item>
     </style>
@@ -418,8 +418,8 @@
     <style name="AppTheme.200" parent="AppTheme">
         <item name="colorPrimary">#1086c0</item>
         <item name="colorPrimaryTransparent">#001086c0</item>
-        <item name="colorSecondary">#0d6b9a</item>
-        <item name="colorPrimaryDark">#0d6b9a</item>
+        <item name="colorSecondary">#1086c0</item>
+        <item name="colorPrimaryDark">#1b668c</item>
         <item name="table_row_dark_bg">#e7f6fd</item>
         <item name="table_row_light_bg">#f6fbfe</item>
     </style>
@@ -427,8 +427,8 @@
     <style name="AppTheme.205" parent="AppTheme">
         <item name="colorPrimary">#1182d2</item>
         <item name="colorPrimaryTransparent">#001182d2</item>
-        <item name="colorSecondary">#0e68a8</item>
-        <item name="colorPrimaryDark">#0e68a8</item>
+        <item name="colorSecondary">#1182d2</item>
+        <item name="colorPrimaryDark">#1d6599</item>
         <item name="table_row_dark_bg">#e7f4fd</item>
         <item name="table_row_light_bg">#f6fbfe</item>
     </style>
@@ -436,8 +436,8 @@
     <style name="AppTheme.210" parent="AppTheme">
         <item name="colorPrimary">#137de8</item>
         <item name="colorPrimaryTransparent">#00137de8</item>
-        <item name="colorSecondary">#0f64ba</item>
-        <item name="colorPrimaryDark">#0f64ba</item>
+        <item name="colorSecondary">#137de8</item>
+        <item name="colorPrimaryDark">#2064a9</item>
         <item name="table_row_dark_bg">#e7f2fd</item>
         <item name="table_row_light_bg">#f6fafe</item>
     </style>
@@ -445,8 +445,8 @@
     <style name="AppTheme.215" parent="AppTheme">
         <item name="colorPrimary">#297bee</item>
         <item name="colorPrimaryTransparent">#00297bee</item>
-        <item name="colorSecondary">#1160ce</item>
-        <item name="colorPrimaryDark">#1160ce</item>
+        <item name="colorSecondary">#297bee</item>
+        <item name="colorPrimaryDark">#2463bb</item>
         <item name="table_row_dark_bg">#e7f0fd</item>
         <item name="table_row_light_bg">#f6f9fe</item>
     </style>
@@ -454,8 +454,8 @@
     <style name="AppTheme.220" parent="AppTheme">
         <item name="colorPrimary">#3d78ef</item>
         <item name="colorPrimaryTransparent">#003d78ef</item>
-        <item name="colorSecondary">#1256de</item>
-        <item name="colorPrimaryDark">#1256de</item>
+        <item name="colorSecondary">#3d78ef</item>
+        <item name="colorPrimaryDark">#265dc9</item>
         <item name="table_row_dark_bg">#e7effd</item>
         <item name="table_row_light_bg">#f6f8fe</item>
     </style>
@@ -463,8 +463,8 @@
     <style name="AppTheme.225" parent="AppTheme">
         <item name="colorPrimary">#4d76f1</item>
         <item name="colorPrimaryTransparent">#004d76f1</item>
-        <item name="colorSecondary">#1349eb</item>
-        <item name="colorPrimaryDark">#1349eb</item>
+        <item name="colorSecondary">#4d76f1</item>
+        <item name="colorPrimaryDark">#2954d5</item>
         <item name="table_row_dark_bg">#e7edfd</item>
         <item name="table_row_light_bg">#f6f8fe</item>
     </style>
@@ -472,8 +472,8 @@
     <style name="AppTheme.230" parent="AppTheme">
         <item name="colorPrimary">#5a73f2</item>
         <item name="colorPrimaryTransparent">#005a73f2</item>
-        <item name="colorSecondary">#1d3fed</item>
-        <item name="colorPrimaryDark">#1d3fed</item>
+        <item name="colorSecondary">#5a73f2</item>
+        <item name="colorPrimaryDark">#314dd8</item>
         <item name="table_row_dark_bg">#e7ebfd</item>
         <item name="table_row_light_bg">#f6f7fe</item>
     </style>
@@ -481,8 +481,8 @@
     <style name="AppTheme.235" parent="AppTheme">
         <item name="colorPrimary">#6470f2</item>
         <item name="colorPrimaryTransparent">#006470f2</item>
-        <item name="colorSecondary">#2536ed</item>
-        <item name="colorPrimaryDark">#2536ed</item>
+        <item name="colorSecondary">#6470f2</item>
+        <item name="colorPrimaryDark">#3946d9</item>
         <item name="table_row_dark_bg">#e7e9fd</item>
         <item name="table_row_light_bg">#f6f6fe</item>
     </style>
@@ -490,8 +490,8 @@
     <style name="AppTheme.240" parent="AppTheme">
         <item name="colorPrimary">#6e6ef3</item>
         <item name="colorPrimaryTransparent">#006e6ef3</item>
-        <item name="colorSecondary">#2c2cee</item>
-        <item name="colorPrimaryDark">#2c2cee</item>
+        <item name="colorSecondary">#6e6ef3</item>
+        <item name="colorPrimaryDark">#4040db</item>
         <item name="table_row_dark_bg">#e7e7fd</item>
         <item name="table_row_light_bg">#f6f6fe</item>
     </style>
@@ -499,8 +499,8 @@
     <style name="AppTheme.245" parent="AppTheme">
         <item name="colorPrimary">#766bf3</item>
         <item name="colorPrimaryTransparent">#00766bf3</item>
-        <item name="colorSecondary">#3a2aee</item>
-        <item name="colorPrimaryDark">#3a2aee</item>
+        <item name="colorSecondary">#766bf3</item>
+        <item name="colorPrimaryDark">#4b3eda</item>
         <item name="table_row_dark_bg">#e9e7fd</item>
         <item name="table_row_light_bg">#f6f6fe</item>
     </style>
@@ -508,8 +508,8 @@
     <style name="AppTheme.250" parent="AppTheme">
         <item name="colorPrimary">#7f68f3</item>
         <item name="colorPrimaryTransparent">#007f68f3</item>
-        <item name="colorSecondary">#4928ee</item>
-        <item name="colorPrimaryDark">#4928ee</item>
+        <item name="colorSecondary">#7f68f3</item>
+        <item name="colorPrimaryDark">#563cda</item>
         <item name="table_row_dark_bg">#ebe7fd</item>
         <item name="table_row_light_bg">#f7f6fe</item>
     </style>
@@ -517,8 +517,8 @@
     <style name="AppTheme.255" parent="AppTheme">
         <item name="colorPrimary">#8864f2</item>
         <item name="colorPrimaryTransparent">#008864f2</item>
-        <item name="colorSecondary">#5725ed</item>
-        <item name="colorPrimaryDark">#5725ed</item>
+        <item name="colorSecondary">#8864f2</item>
+        <item name="colorPrimaryDark">#6139d9</item>
         <item name="table_row_dark_bg">#ede7fd</item>
         <item name="table_row_light_bg">#f8f6fe</item>
     </style>
@@ -526,8 +526,8 @@
     <style name="AppTheme.260" parent="AppTheme">
         <item name="colorPrimary">#9161f2</item>
         <item name="colorPrimaryTransparent">#009161f2</item>
-        <item name="colorSecondary">#6622ed</item>
-        <item name="colorPrimaryDark">#6622ed</item>
+        <item name="colorSecondary">#9161f2</item>
+        <item name="colorPrimaryDark">#6c36d9</item>
         <item name="table_row_dark_bg">#efe7fd</item>
         <item name="table_row_light_bg">#f8f6fe</item>
     </style>
@@ -535,8 +535,8 @@
     <style name="AppTheme.265" parent="AppTheme">
         <item name="colorPrimary">#9a5bf2</item>
         <item name="colorPrimaryTransparent">#009a5bf2</item>
-        <item name="colorSecondary">#741ded</item>
-        <item name="colorPrimaryDark">#741ded</item>
+        <item name="colorSecondary">#9a5bf2</item>
+        <item name="colorPrimaryDark">#7732d8</item>
         <item name="table_row_dark_bg">#f0e7fd</item>
         <item name="table_row_light_bg">#f9f6fe</item>
     </style>
@@ -544,8 +544,8 @@
     <style name="AppTheme.270" parent="AppTheme">
         <item name="colorPrimary">#a355f1</item>
         <item name="colorPrimaryTransparent">#00a355f1</item>
-        <item name="colorSecondary">#8319ec</item>
-        <item name="colorPrimaryDark">#8319ec</item>
+        <item name="colorSecondary">#a355f1</item>
+        <item name="colorPrimaryDark">#832ed7</item>
         <item name="table_row_dark_bg">#f2e7fd</item>
         <item name="table_row_light_bg">#faf6fe</item>
     </style>
@@ -553,8 +553,8 @@
     <style name="AppTheme.275" parent="AppTheme">
         <item name="colorPrimary">#ad4ff1</item>
         <item name="colorPrimaryTransparent">#00ad4ff1</item>
-        <item name="colorSecondary">#9214ec</item>
-        <item name="colorPrimaryDark">#9214ec</item>
+        <item name="colorSecondary">#ad4ff1</item>
+        <item name="colorPrimaryDark">#8e29d6</item>
         <item name="table_row_dark_bg">#f4e7fd</item>
         <item name="table_row_light_bg">#fbf6fe</item>
     </style>
@@ -562,8 +562,8 @@
     <style name="AppTheme.280" parent="AppTheme">
         <item name="colorPrimary">#b746f0</item>
         <item name="colorPrimaryTransparent">#00b746f0</item>
-        <item name="colorSecondary">#9f13e5</item>
-        <item name="colorPrimaryDark">#9f13e5</item>
+        <item name="colorSecondary">#b746f0</item>
+        <item name="colorPrimaryDark">#9828d0</item>
         <item name="table_row_dark_bg">#f6e7fd</item>
         <item name="table_row_light_bg">#fbf6fe</item>
     </style>
@@ -571,8 +571,8 @@
     <style name="AppTheme.285" parent="AppTheme">
         <item name="colorPrimary">#c23bef</item>
         <item name="colorPrimaryTransparent">#00c23bef</item>
-        <item name="colorSecondary">#aa12dc</item>
-        <item name="colorPrimaryDark">#aa12dc</item>
+        <item name="colorSecondary">#c23bef</item>
+        <item name="colorPrimaryDark">#a026c8</item>
         <item name="table_row_dark_bg">#f8e7fd</item>
         <item name="table_row_light_bg">#fcf6fe</item>
     </style>
@@ -580,8 +580,8 @@
     <style name="AppTheme.290" parent="AppTheme">
         <item name="colorPrimary">#cd2aee</item>
         <item name="colorPrimaryTransparent">#00cd2aee</item>
-        <item name="colorSecondary">#af11cf</item>
-        <item name="colorPrimaryDark">#af11cf</item>
+        <item name="colorSecondary">#cd2aee</item>
+        <item name="colorPrimaryDark">#a224bc</item>
         <item name="table_row_dark_bg">#f9e7fd</item>
         <item name="table_row_light_bg">#fdf6fe</item>
     </style>
@@ -589,8 +589,8 @@
     <style name="AppTheme.295" parent="AppTheme">
         <item name="colorPrimary">#d713e9</item>
         <item name="colorPrimaryTransparent">#00d713e9</item>
-        <item name="colorSecondary">#ac0fba</item>
-        <item name="colorPrimaryDark">#ac0fba</item>
+        <item name="colorSecondary">#d713e9</item>
+        <item name="colorPrimaryDark">#9e20a9</item>
         <item name="table_row_dark_bg">#fbe7fd</item>
         <item name="table_row_light_bg">#fef6fe</item>
     </style>
@@ -598,8 +598,8 @@
     <style name="AppTheme.300" parent="AppTheme">
         <item name="colorPrimary">#dc12dc</item>
         <item name="colorPrimaryTransparent">#00dc12dc</item>
-        <item name="colorSecondary">#b00eb0</item>
-        <item name="colorPrimaryDark">#b00eb0</item>
+        <item name="colorSecondary">#dc12dc</item>
+        <item name="colorPrimaryDark">#a01ea0</item>
         <item name="table_row_dark_bg">#fde7fd</item>
         <item name="table_row_light_bg">#fef6fe</item>
     </style>
@@ -607,8 +607,8 @@
     <style name="AppTheme.305" parent="AppTheme">
         <item name="colorPrimary">#e112cf</item>
         <item name="colorPrimaryTransparent">#00e112cf</item>
-        <item name="colorSecondary">#b40fa6</item>
-        <item name="colorPrimaryDark">#b40fa6</item>
+        <item name="colorSecondary">#e112cf</item>
+        <item name="colorPrimaryDark">#a31f98</item>
         <item name="table_row_dark_bg">#fde7fb</item>
         <item name="table_row_light_bg">#fef6fe</item>
     </style>
@@ -616,8 +616,8 @@
     <style name="AppTheme.310" parent="AppTheme">
         <item name="colorPrimary">#e413c1</item>
         <item name="colorPrimaryTransparent">#00e413c1</item>
-        <item name="colorSecondary">#b70f9b</item>
-        <item name="colorPrimaryDark">#b70f9b</item>
+        <item name="colorSecondary">#e413c1</item>
+        <item name="colorPrimaryDark">#a6208f</item>
         <item name="table_row_dark_bg">#fde7f9</item>
         <item name="table_row_light_bg">#fef6fd</item>
     </style>
@@ -625,8 +625,8 @@
     <style name="AppTheme.315" parent="AppTheme">
         <item name="colorPrimary">#e813b3</item>
         <item name="colorPrimaryTransparent">#00e813b3</item>
-        <item name="colorSecondary">#ba0f8f</item>
-        <item name="colorPrimaryDark">#ba0f8f</item>
+        <item name="colorSecondary">#e813b3</item>
+        <item name="colorPrimaryDark">#a92086</item>
         <item name="table_row_dark_bg">#fde7f8</item>
         <item name="table_row_light_bg">#fef6fc</item>
     </style>
@@ -634,8 +634,8 @@
     <style name="AppTheme.320" parent="AppTheme">
         <item name="colorPrimary">#eb13a3</item>
         <item name="colorPrimaryTransparent">#00eb13a3</item>
-        <item name="colorSecondary">#bc0f82</item>
-        <item name="colorPrimaryDark">#bc0f82</item>
+        <item name="colorSecondary">#eb13a3</item>
+        <item name="colorPrimaryDark">#ab217d</item>
         <item name="table_row_dark_bg">#fde7f6</item>
         <item name="table_row_light_bg">#fef6fb</item>
     </style>
@@ -643,8 +643,8 @@
     <style name="AppTheme.325" parent="AppTheme">
         <item name="colorPrimary">#ec1a95</item>
         <item name="colorPrimaryTransparent">#00ec1a95</item>
-        <item name="colorSecondary">#c21078</item>
-        <item name="colorPrimaryDark">#c21078</item>
+        <item name="colorSecondary">#ec1a95</item>
+        <item name="colorPrimaryDark">#b02275</item>
         <item name="table_row_dark_bg">#fde7f4</item>
         <item name="table_row_light_bg">#fef6fb</item>
     </style>
@@ -652,8 +652,8 @@
     <style name="AppTheme.330" parent="AppTheme">
         <item name="colorPrimary">#ed2087</item>
         <item name="colorPrimaryTransparent">#00ed2087</item>
-        <item name="colorSecondary">#c7106c</item>
-        <item name="colorPrimaryDark">#c7106c</item>
+        <item name="colorSecondary">#ed2087</item>
+        <item name="colorPrimaryDark">#b5226c</item>
         <item name="table_row_dark_bg">#fde7f2</item>
         <item name="table_row_light_bg">#fef6fa</item>
     </style>
@@ -661,8 +661,8 @@
     <style name="AppTheme.335" parent="AppTheme">
         <item name="colorPrimary">#ed2679</item>
         <item name="colorPrimaryTransparent">#00ed2679</item>
-        <item name="colorSecondary">#cc115f</item>
-        <item name="colorPrimaryDark">#cc115f</item>
+        <item name="colorSecondary">#ed2679</item>
+        <item name="colorPrimaryDark">#b92362</item>
         <item name="table_row_dark_bg">#fde7f0</item>
         <item name="table_row_light_bg">#fef6f9</item>
     </style>
@@ -670,8 +670,8 @@
     <style name="AppTheme.340" parent="AppTheme">
         <item name="colorPrimary">#ee2a6b</item>
         <item name="colorPrimaryTransparent">#00ee2a6b</item>
-        <item name="colorSecondary">#cf1150</item>
-        <item name="colorPrimaryDark">#cf1150</item>
+        <item name="colorSecondary">#ee2a6b</item>
+        <item name="colorPrimaryDark">#bc2456</item>
         <item name="table_row_dark_bg">#fde7ef</item>
         <item name="table_row_light_bg">#fef6f8</item>
     </style>
@@ -679,8 +679,8 @@
     <style name="AppTheme.345" parent="AppTheme">
         <item name="colorPrimary">#ee2d5d</item>
         <item name="colorPrimaryTransparent">#00ee2d5d</item>
-        <item name="colorSecondary">#d11141</item>
-        <item name="colorPrimaryDark">#d11141</item>
+        <item name="colorSecondary">#ee2d5d</item>
+        <item name="colorPrimaryDark">#be244b</item>
         <item name="table_row_dark_bg">#fde7ed</item>
         <item name="table_row_light_bg">#fef6f8</item>
     </style>
@@ -688,8 +688,8 @@
     <style name="AppTheme.350" parent="AppTheme">
         <item name="colorPrimary">#ee2f4f</item>
         <item name="colorPrimaryTransparent">#00ee2f4f</item>
-        <item name="colorSecondary">#d31132</item>
-        <item name="colorPrimaryDark">#d31132</item>
+        <item name="colorSecondary">#ee2f4f</item>
+        <item name="colorPrimaryDark">#c0253e</item>
         <item name="table_row_dark_bg">#fde7eb</item>
         <item name="table_row_light_bg">#fef6f7</item>
     </style>
@@ -697,8 +697,8 @@
     <style name="AppTheme.355" parent="AppTheme">
         <item name="colorPrimary">#ee3141</item>
         <item name="colorPrimaryTransparent">#00ee3141</item>
-        <item name="colorSecondary">#d51122</item>
-        <item name="colorPrimaryDark">#d51122</item>
+        <item name="colorSecondary">#ee3141</item>
+        <item name="colorPrimaryDark">#c12532</item>
         <item name="table_row_dark_bg">#fde7e9</item>
         <item name="table_row_light_bg">#fef6f6</item>
     </style>
diff --git a/tools/gen-styles b/tools/gen-styles
index 25002e74..64cebf27 100644
--- a/tools/gen-styles
+++ b/tools/gen-styles
@@ -245,8 +245,8 @@ sub outputThemes {
 
 sub bestLightnessForHue {
     my ( $h, $s ) = @_;
-    my $targetContrast = 4.07;
-    my $white = Color::sRGB->WHITE;
+    my $targetContrast = $opt_night ? 5.16 : 4.07;
+    my $white = $opt_night ? Color::sRGB->BLACK : Color::sRGB->WHITE;
     my $bestLightness;
     my $bestContrast;
     for ( my $l = 0; $l < 1; $l += 0.002 ) {
@@ -301,10 +301,12 @@ sub hslStyleForHue {
 	# linear interpolation
         #my $l1 = $y0 + 1.0 * ( $hue - $x0 ) * ( $y1 - $y0 ) / ( $x1 - $x0 );
         my $l1 = bestLightnessForHue( $hue / 360.0, $S );
+        #$l1 += ( 1 - $l1 ) * 0.20 if $opt_night;
 
-	my $l2 = $l1 * 0.80;
-	my $l3 = $opt_night ? 0.150 : 0.950;
-	my $l4 = $opt_night ? 0.100 : 0.980;
+        #my $l2 = $opt_night ? ( $l1 + ( 1 - $l1 ) * 0.15 ) : $l1 * 0.85;
+        my $l2 = $l1 * 0.80;
+        my $l3 = $opt_night ? 0.150                        : 0.950;
+        my $l4 = $opt_night ? 0.100                        : 0.980;
 
 	my $result = "";
 	my $indent = "$baseIndent    ";
@@ -328,9 +330,9 @@ sub hslStyleForHue {
         $result .= sprintf "$indent<item name=\"%s\">#00%s</item>\n",
             'colorPrimaryTransparent', hslHex( $hue, $S, $l1 );
         $result .= sprintf "$indent<item name=\"%s\">#%s</item>\n",
-            'colorSecondary', hslHex( $hue, $S, $l2 );
+            'colorSecondary', hslHex( $hue, $S, $l1 );
         $result .= sprintf "$indent<item name=\"%s\">#%s</item>\n",
-            'colorPrimaryDark', hslHex( $hue, $S, $l2 );
+            'colorPrimaryDark', hslHex( $hue, $S*0.8, $l2 );
         $result .= sprintf "$indent<item name=\"%s\">#%s</item>\n",
             'table_row_dark_bg', hslHex( $hue, $S, $l3 );
         $result .= sprintf "$indent<item name=\"%s\">#%s</item>\n",