diff --git a/Applications/TextMate/src/Favorites.mm b/Applications/TextMate/src/Favorites.mm
index 9836f237..79a524c9 100644
--- a/Applications/TextMate/src/Favorites.mm
+++ b/Applications/TextMate/src/Favorites.mm
@@ -69,8 +69,8 @@ static NSUInteger const kOakSourceIndexFavorites      = 1;
 		OakScopeBarView* scopeBar = [OakScopeBarView new];
 		scopeBar.labels = self.sourceListLabels;
 
-		OakBackgroundFillView* topDivider    = OakCreateHorizontalLine([NSColor darkGrayColor], [NSColor colorWithCalibratedWhite:0.551 alpha:1]);
-		OakBackgroundFillView* bottomDivider = OakCreateHorizontalLine([NSColor grayColor], [NSColor lightGrayColor]);
+		OakBackgroundFillView* topDivider    = OakCreateHorizontalLine(OakBackgroundFillViewStyleDivider);
+		OakBackgroundFillView* bottomDivider = OakCreateHorizontalLine(OakBackgroundFillViewStyleDivider);
 
 		NSDictionary* views = @{
 			@"scopeBar":           scopeBar,
diff --git a/Frameworks/OakFilterList/src/BundleItemChooser.mm b/Frameworks/OakFilterList/src/BundleItemChooser.mm
index 061b197e..c5880e17 100644
--- a/Frameworks/OakFilterList/src/BundleItemChooser.mm
+++ b/Frameworks/OakFilterList/src/BundleItemChooser.mm
@@ -471,8 +471,8 @@ static std::vector<bundles::item_ptr> relevant_items_in_scope (scope::context_t
 		self.scopeBar = [OakScopeBarView new];
 		self.scopeBar.labels = _sourceListLabels;
 
-		self.topDivider          = OakCreateHorizontalLine([NSColor darkGrayColor], [NSColor colorWithCalibratedWhite:0.551 alpha:1]),
-		self.bottomDivider       = OakCreateHorizontalLine([NSColor grayColor], [NSColor lightGrayColor]);
+		self.topDivider          = OakCreateHorizontalLine(OakBackgroundFillViewStyleDivider),
+		self.bottomDivider       = OakCreateHorizontalLine(OakBackgroundFillViewStyleDivider);
 
 		self.selectButton                  = OakCreateButton(@"Select");
 		self.selectButton.font             = [NSFont messageFontOfSize:[NSFont smallSystemFontSize]];
diff --git a/Frameworks/OakFilterList/src/FileChooser.mm b/Frameworks/OakFilterList/src/FileChooser.mm
index fb3ad890..a90ce0ce 100644
--- a/Frameworks/OakFilterList/src/FileChooser.mm
+++ b/Frameworks/OakFilterList/src/FileChooser.mm
@@ -264,8 +264,8 @@ static NSDictionary* globs_for_path (std::string const& path)
 		_progressIndicator.controlSize          = NSControlSizeSmall;
 		_progressIndicator.displayedWhenStopped = NO;
 
-		OakBackgroundFillView* topDivider    = OakCreateHorizontalLine([NSColor darkGrayColor], [NSColor colorWithCalibratedWhite:0.551 alpha:1]);
-		OakBackgroundFillView* bottomDivider = OakCreateHorizontalLine([NSColor grayColor], [NSColor lightGrayColor]);
+		OakBackgroundFillView* topDivider    = OakCreateHorizontalLine(OakBackgroundFillViewStyleDivider);
+		OakBackgroundFillView* bottomDivider = OakCreateHorizontalLine(OakBackgroundFillViewStyleDivider);
 
 		NSDictionary* views = @{
 			@"scopeBar":           scopeBar,
diff --git a/Frameworks/OakFilterList/src/SymbolChooser.mm b/Frameworks/OakFilterList/src/SymbolChooser.mm
index 8c148990..d1651fa0 100644
--- a/Frameworks/OakFilterList/src/SymbolChooser.mm
+++ b/Frameworks/OakFilterList/src/SymbolChooser.mm
@@ -41,7 +41,7 @@ static SymbolChooserItem* CreateItem (OakDocument* document, text::pos_t const&
 	{
 		self.window.title = @"Jump to Symbol";
 
-		OakBackgroundFillView* bottomDivider = OakCreateHorizontalLine([NSColor grayColor], [NSColor lightGrayColor]);
+		OakBackgroundFillView* bottomDivider = OakCreateHorizontalLine(OakBackgroundFillViewStyleDivider);
 
 		NSDictionary* views = @{
 			@"scrollView":         self.scrollView,