diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/TimelinePanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/TimelinePanel.java
index 1b198cccb6..87f170ccab 100644
--- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/TimelinePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/ui/TimelinePanel.java
@@ -58,7 +58,6 @@ public class TimelinePanel extends BaseDataSourceSummaryPanel {
     private static final long serialVersionUID = 1L;
     private static final DateFormat EARLIEST_LATEST_FORMAT = getUtcFormat("MMM d, yyyy");
     private static final DateFormat CHART_FORMAT = getUtcFormat("MMM d");
-    private static final Color CHART_COLOR = Color.BLUE;
     private static final int MOST_RECENT_DAYS_COUNT = 30;
 
     /**
@@ -114,8 +113,8 @@ public class TimelinePanel extends BaseDataSourceSummaryPanel {
         return date == null ? null : formatter.format(date);
     }
 
-    private static final Color FILE_EVT_COLOR = new Color(1, 87, 155);
-    private static final Color ARTIFACT_EVT_COLOR = new Color(76, 175, 80);
+    private static final Color FILE_EVT_COLOR = new Color(228, 22, 28);
+    private static final Color ARTIFACT_EVT_COLOR = new Color(21, 227, 100);
 
     /**
      * Converts DailyActivityAmount data retrieved from TimelineSummary into
diff --git a/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartPanel.java b/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartPanel.java
index 4656e93815..3f3822f7c2 100644
--- a/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/datasourcesummary/uiutils/BarChartPanel.java
@@ -46,7 +46,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
      */
     public static class BarChartSeries {
 
-        private final Comparable key;
+        private final Comparable<?> key;
         private final Color color;
         private final List<BarChartItem> items;
 
@@ -56,7 +56,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
          * @param color The color for this series.
          * @param items The bars to be displayed for this series.
          */
-        public BarChartSeries(Comparable key, Color color, List<BarChartItem> items) {
+        public BarChartSeries(Comparable<?> key, Color color, List<BarChartItem> items) {
             this.key = key;
             this.color = color;
             this.items = (items == null) ? Collections.emptyList() : Collections.unmodifiableList(items);
@@ -79,7 +79,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
         /**
          * @return The key for this item.
          */
-        public Comparable getKey() {
+        public Comparable<?> getKey() {
             return key;
         }
     }
@@ -89,7 +89,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
      */
     public static class BarChartItem {
 
-        private final Comparable key;
+        private final Comparable<?> key;
         private final double value;
 
         /**
@@ -99,7 +99,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
          * toString().
          * @param value The value for this item.
          */
-        public BarChartItem(Comparable key, double value) {
+        public BarChartItem(Comparable<?> key, double value) {
             this.key = key;
             this.value = value;
         }
@@ -107,7 +107,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
         /**
          * @return The key for this item.
          */
-        public Comparable getKey() {
+        public Comparable<?> getKey() {
             return key;
         }