diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt
index 82910d38df..a66c117da5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/Themes.kt
@@ -50,7 +50,8 @@ enum class Themes(@StyleRes val styleRes: Int, val nightMode: Int, @StringRes va
     ),
     LIME(
         R.style.Theme_Tachiyomi_FlatLime,
-        AppCompatDelegate.MODE_NIGHT_YES,
+        AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM,
+        R.string.lime_time,
         R.string.flat_lime
     ),
     YOTSUBA(
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 34794a2703..0ff494754d 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -38,6 +38,15 @@
     <color name="primaryVariantStrawberry">#2B2320</color>
     <color name="backgroundStrawberries">#1a1716</color>
 
+    <!-- Flat Lime Theme -->
+    <color name="primaryLime">#7CF7A5</color>
+    <color name="secondaryLime">#4AF88A</color>
+    <color name="primaryVariantLime">@color/primaryVariantTachiyomi</color>
+    <color name="primaryInverseLime">#09933c</color>
+    <color name="backgroundLime">#202125</color>
+    <color name="secondaryVariantLime">#cbffe0</color>
+    <color name="downloadBadgeLime">#304E51</color>
+
     <!-- Tako Theme -->
     <color name="primaryTako">#fccd9f</color>
     <color name="primaryVariantTako">#292828</color>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index e5c88ad234..0000000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.Tachiyomi.FlatLime">
-        <item name="colorPrimary">@color/primaryLime</item>
-        <item name="colorPrimaryInverse">@color/primaryInverseLime</item>
-        <item name="colorSecondary">@color/secondaryLime</item>
-        <item name="colorControlHighlight">@color/rippleColorLime</item>
-        <item name="colorSecondaryVariant">@color/secondaryVariantLime</item>
-        <item name="colorPrimaryVariant">@color/dialogLime</item>
-        <item name="colorSurface">@color/backgroundLime</item>
-        <item name="background">@color/backgroundLime</item>
-        <item name="colorOnSecondary">@color/colorOnLime</item>
-        <item name="colorTertiary">@color/download_badge_light</item>
-        <item name="colorOnTertiary">@color/md_white_1000</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dca38a4719..32e716f69a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -98,17 +98,14 @@
     <color name="appBarTextTealSapphire">#DE0a302e</color>
 
     <!-- Flat Lime Theme -->
-    <color name="primaryLime">#7CF7A5</color>
-    <color name="primaryInverseLime">#09933c</color>
-    <color name="secondaryLime">#4AF88A</color>
+    <color name="primaryLime">#57BD79</color>
+    <color name="primaryVariantLime">#D9ECE0</color>
+    <color name="primaryInverseLime">#AEDFC0</color>
+    <color name="secondaryLime">#1DA750</color>
+    <color name="secondaryVariantLime">#065124</color>
     <color name="rippleColorLime">#1F4AF88A</color>
-    <color name="textColorPrimaryLime">@color/md_white_1000</color>
-    <color name="textColorSecondaryLime">@color/md_white_1000_76</color>
-    <color name="textColorHintLime">@color/md_white_1000_50</color>
-    <color name="backgroundLime">#202125</color>
-    <color name="secondaryVariantLime">#cbffe0</color>
-    <color name="dialogLime">#282A2E</color>
-    <color name="colorOnLime">#2C2D32</color>
+    <color name="backgroundLime">#E9EFEB</color>
+    <color name="downloadBadgeLime">#80CAD3</color>
 
     <!-- Strawberry Daiquiri Theme -->
     <color name="primaryStrawberry">#d31d3b</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ea231122b5..e514ed7cb6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -666,6 +666,7 @@
     <string name="teal_ocean">Teal Ocean</string>
     <string name="sapphire_dusk">Sapphire Dusk</string>
     <string name="hot_pink">Hot Pink</string>
+    <string name="lime_time">Lime Time</string>
     <string name="flat_lime">Flat Lime</string>
     <string name="white_theme">Pure White</string>
     <string name="locale">Locale</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c71f72d9e1..7cc1247c8d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -95,12 +95,25 @@
         <item name="readerBackground">@color/md_black_1000</item>
     </style>
 
-    <style name="Theme.Tachiyomi.FlatLime"/>
     <style name="ThemeOverlay.Tachiyomi.AllBlue" parent="">
         <item name="colorSurface">@color/legacyBlue</item>
         <item name="colorPrimaryVariant">@color/legacyBlue</item>
     </style>
 
+    <style name="Theme.Tachiyomi.FlatLime">
+        <item name="colorPrimary">@color/primaryLime</item>
+        <item name="colorPrimaryVariant">@color/primaryVariantLime</item>
+        <item name="colorPrimaryInverse">@color/primaryInverseLime</item>
+        <item name="colorSecondary">@color/secondaryLime</item>
+        <item name="colorOnSecondary">@color/textColorPrimaryInverse</item>
+        <item name="colorControlHighlight">@color/rippleColorLime</item>
+        <item name="colorSecondaryVariant">@color/secondaryVariantLime</item>
+        <item name="colorSurface">@color/backgroundLime</item>
+        <item name="background">@color/backgroundLime</item>
+        <item name="colorTertiary">@color/downloadBadgeLime</item>
+        <item name="colorOnTertiary">@color/colorOnDownloadBadgeDayNight</item>
+    </style>
+
     <style name="Theme.Tachiyomi.MidnightDusk">
         <item name="colorPrimary">@color/primaryDuskDawn</item>
         <item name="colorPrimaryInverse">@color/primaryInverseDuskDawn</item>