diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/calendar/PlayerCalendar.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/calendar/PlayerCalendar.java
index 7e2222a38..7262d2843 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/calendar/PlayerCalendar.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/calendar/PlayerCalendar.java
@@ -6,6 +6,8 @@ package com.djrapitops.plan.utilities.html.graphs.calendar;
 
 import com.djrapitops.plan.data.container.PlayerKill;
 import com.djrapitops.plan.data.container.Session;
+import com.djrapitops.plan.system.settings.theme.Theme;
+import com.djrapitops.plan.system.settings.theme.ThemeVal;
 import com.djrapitops.plan.utilities.FormatUtils;
 import com.djrapitops.plugin.api.TimeAmount;
 
@@ -51,7 +53,7 @@ public class PlayerCalendar {
 
             series.append(",{title: 'Playtime: ").append(FormatUtils.formatTimeAmount(playtime))
                     .append("',start:'").append(day)
-                    .append("',color: '#4CAF50'")
+                    .append("',color: '").append(Theme.getValue(ThemeVal.GREEN)).append("'")
                     .append("}");
 
             series.append(",{title: 'Sessions: ").append(sessionCount)
@@ -88,7 +90,7 @@ public class PlayerCalendar {
                 series.append(",{title: 'Killed: ").append(kill.getVictim())
                         .append("',start:").append(time)
                         .append(",end:").append(time + fiveMinutes)
-                        .append(",color: 'red'")
+                        .append(",color: '").append(Theme.getValue(ThemeVal.RED)).append("'")
                         .append("}");
             }
         }
@@ -98,6 +100,6 @@ public class PlayerCalendar {
         String registered = FormatUtils.formatTimeStampYear(this.registered);
 
         series.append("{title: 'Registered: ").append(registered).append("'," +
-                "start: ").append(this.registered).append(",color: '#8BC34A'}");
+                "start: ").append(this.registered).append(",color: '").append(Theme.getValue(ThemeVal.LIGHT_GREEN)).append("'}");
     }
 }
\ No newline at end of file
diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/calendar/ServerCalendar.java b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/calendar/ServerCalendar.java
index c1ec725ca..1697b29b1 100644
--- a/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/calendar/ServerCalendar.java
+++ b/Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/calendar/ServerCalendar.java
@@ -5,6 +5,8 @@
 package com.djrapitops.plan.utilities.html.graphs.calendar;
 
 import com.djrapitops.plan.data.container.Session;
+import com.djrapitops.plan.system.settings.theme.Theme;
+import com.djrapitops.plan.system.settings.theme.ThemeVal;
 import com.djrapitops.plan.utilities.FormatUtils;
 
 import java.util.*;
@@ -43,7 +45,7 @@ public class ServerCalendar {
 
             series.append(",{title: 'New: ").append(newPlayers)
                     .append("',start:'").append(day)
-                    .append("',color: '#8BC34A'")
+                    .append("',color: '").append(Theme.getValue(ThemeVal.LIGHT_GREEN)).append("'")
                     .append("}");
         }
 
@@ -62,12 +64,12 @@ public class ServerCalendar {
 
             series.append(",{title: 'Playtime: ").append(FormatUtils.formatTimeAmount(playtime))
                     .append("',start:'").append(day)
-                    .append("',color: '#4CAF50'")
+                    .append("',color: '").append(Theme.getValue(ThemeVal.GREEN)).append("'")
                     .append("}");
 
             series.append(",{title: 'Sessions: ").append(sessionCount)
                     .append("',start:'").append(day)
-                    .append("',color: '#009688'")
+                    .append("',color: '").append(Theme.getValue(ThemeVal.TEAL)).append("'")
                     .append("}");
 
             series.append(",{title: 'Unique: ").append(uniquePlayers)