diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 308978fe4..51795d246 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -93,23 +93,9 @@ CPTableViewDraggingDestinationFeedbackStyleSourceList = 1;
 CPTableViewDropOn = 0;
 CPTableViewDropAbove = 1;
 
-CPSourceListGradient = "CPSourceListGradient";
-CPSourceListTopLineColor = "CPSourceListTopLineColor";
-CPSourceListBottomLineColor = "CPSourceListBottomLineColor";
-
-var CPTableViewSourceListUnfocusedSelectionColor = @{
-            CPSourceListGradient: CGGradientCreateWithColorComponents(
-                                     CGColorSpaceCreateDeviceRGB(),
-                                     [
-                                         (218.0 / 255), (223.0 / 255), (234.0 / 255), 1.0,
-                                         (178.0 / 255), (181.0 / 255), (190.0 / 255), 1.0,
-                                     ],
-                                     [0, 1],
-                                     2
-                                 ),
-            CPSourceListTopLineColor: [CPColor colorWithCalibratedRed:192.0 / 255.0 green:195.0 / 255.0 blue:205.0 / 255.0 alpha:1.0],
-            CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:151.0 / 255.0 green:153.0 / 255.0 blue:160.0 / 255.0 alpha:1.0],
-        };
+CPSourceListGradient = @"CPSourceListGradient";
+CPSourceListTopLineColor = @"CPSourceListTopLineColor";
+CPSourceListBottomLineColor = @"CPSourceListBottomLineColor";
 
 // TODO: add docs
 
@@ -224,6 +210,8 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     CPArray             _alternatingRowBackgroundColors;
 
     unsigned            _selectionHighlightStyle;
+    CPColor             _unfocusedSelectionHighlightColor;
+    CPDictionary        _unfocusedSourceListSelectionColor;
     CPTableColumn       _currentHighlightedTableColumn;
     unsigned            _gridStyleMask;
 
@@ -385,6 +373,8 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     if (!_alternatingRowBackgroundColors)
         _alternatingRowBackgroundColors = [[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"]];
 
+    [self _updateUnfocusedSelectionColors];
+
     _tableColumnRanges = [];
     _dirtyTableColumnRangeIndex = 0;
     _numberOfHiddenColumns = 0;
@@ -852,6 +842,7 @@ NOT YET IMPLEMENTED
         return;
 
     [self setValue:aColor forThemeAttribute:@"selection-color"];
+    [self _updateUnfocusedSelectionColors];
 
     [self setNeedsDisplay:YES];
 }
@@ -878,6 +869,7 @@ NOT YET IMPLEMENTED
 - (void)setSelectionGradientColors:(CPDictionary)aDictionary
 {
     [self setValue:aDictionary forThemeAttribute:@"sourcelist-selection-color"];
+    [self _updateUnfocusedSelectionColors];
 
     [self setNeedsDisplay:YES];
 }
@@ -895,6 +887,42 @@ NOT YET IMPLEMENTED
     return [self currentValueForThemeAttribute:@"sourcelist-selection-color"];
 }
 
+- (void)_updateUnfocusedSelectionColors
+{
+    _unfocusedSelectionHighlightColor = [self _unfocusedSelectionColorFromColor:[self selectionHighlightColor] saturation:0];
+
+    var sourceListColors = [self selectionGradientColors];
+
+    _unfocusedSourceListSelectionColor = @{
+        CPSourceListGradient: [self _unfocusedGradientFromGradient:[sourceListColors objectForKey:CPSourceListGradient]],
+        CPSourceListTopLineColor: [self _unfocusedSelectionColorFromColor:[sourceListColors objectForKey:CPSourceListTopLineColor] saturation:0.2],
+        CPSourceListBottomLineColor: [self _unfocusedSelectionColorFromColor:[sourceListColors objectForKey:CPSourceListBottomLineColor] saturation:0.2]
+    }
+}
+
+- (CPColor)_unfocusedSelectionColorFromColor:(CPColor)aColor saturation:(float)saturation
+{
+    var hsb = [aColor hsbComponents];
+
+    return [CPColor colorWithHue:hsb[0] saturation:hsb[1] * saturation brightness:hsb[2]];
+}
+
+- (CGGradient)_unfocusedGradientFromGradient:(CGGradient)aGradient
+{
+    var colors = [aGradient.colors copy],
+        count = [colors count];
+
+    while (count--)
+    {
+        var rgba = colors[count].components,
+            hsb = [self _unfocusedSelectionColorFromColor:[CPColor colorWithRed:rgba[0] green:rgba[1] blue:rgba[2] alpha:rgba[3]] saturation:0.2];
+
+        colors[count] = CGColorCreate(aGradient.colorspace, [[hsb components] copy]);
+    }
+
+    return CGGradientCreateWithColors(aGradient.colorspace, colors, aGradient.locations);
+}
+
 /*!
     Sets the grid color in the non highlighted state.
     @param aColor a CPColor
@@ -4106,13 +4134,13 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 
     if (drawGradient)
     {
-        var gradientCache = focused ? [self selectionGradientColors] : CPTableViewSourceListUnfocusedSelectionColor,
+        var gradientCache = focused ? [self selectionGradientColors] : _unfocusedSourceListSelectionColor,
             topLineColor = [gradientCache objectForKey:CPSourceListTopLineColor],
             bottomLineColor = [gradientCache objectForKey:CPSourceListBottomLineColor],
             gradientColor = [gradientCache objectForKey:CPSourceListGradient];
     }
 
-    var normalSelectionHighlightColor = focused ? [self selectionHighlightColor] : [CPColor secondarySelectedControlColor];
+    var normalSelectionHighlightColor = focused ? [self selectionHighlightColor] : _unfocusedSelectionHighlightColor;
 
     // don't do these lookups if there are no group rows
     if ([_groupRows count])
diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j
index 8b769ee9b..8f8771bbc 100755
--- a/AppKit/Themes/Aristo/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo/ThemeDescriptors.j
@@ -1843,7 +1843,7 @@ var themedButtonValues = nil,
         sourceListSelectionColor = @{
             CPSourceListGradient: CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [98.0 / 255.0, 143.0 / 210.0, 209.0 / 255.0, 1.0, 46.0 / 255.0, 88.0 / 176.0, 208.0 / 255.0,1.0], [0,1], 2),
             CPSourceListTopLineColor: [CPColor colorWithCalibratedRed:81.0 / 255.0 green:127.0 / 255.0 blue:200.0 / 255.0 alpha:1.0],
-            CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:34.0 / 255.0 green:63.0 / 255.0 blue:123.0 / 255.0 alpha:1.0],
+            CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:34.0 / 255.0 green:63.0 / 255.0 blue:123.0 / 255.0 alpha:1.0]
         },
 
         themedTableViewValues =
diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j
index 72678bccf..b9229297b 100644
--- a/AppKit/Themes/Aristo2/ThemeDescriptors.j
+++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j
@@ -1304,7 +1304,7 @@ var themedButtonValues = nil,
                 2
             ),
             CPSourceListTopLineColor: [CPColor colorWithCalibratedRed:70.0 / 255.0 green:107.0 / 255.0 blue:215.0 / 255.0 alpha:1.0],
-            CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:42.0 / 255.0 green:74.0 / 255.0 blue:177.0 / 255.0 alpha:1.0],
+            CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:42.0 / 255.0 green:74.0 / 255.0 blue:177.0 / 255.0 alpha:1.0]
         },
 
         themedTableViewValues =