Redhill: clean up conflict.

redhill/functions.php

@@ -81,12 +81,17 @@
 				array(
 					'name'  => __( 'Primary', 'redhill' ),
 					'slug'  => 'primary',
-					'color' => $primary,
+					'color' => '#CA2017',
 				),
 				array(
 					'name'  => __( 'Secondary', 'redhill' ),
 					'slug'  => 'secondary',
-					'color' => $secondary,
+					'color' => '#007FDB',
+				),
+				array(
+					'name'  => __( 'Dark Gray', 'redhill' ),
+					'slug'  => 'foreground-dark',
+					'color' => '#111111',
 				),
 				array(
 					'name'  => __( 'Background', 'redhill' ),
@@ -96,7 +101,22 @@
 				array(
 					'name'  => __( 'Foreground', 'redhill' ),
 					'slug'  => 'foreground',
-					'color' => $foreground,
+					'color' => '#444444',
+				),
+				array(
+					'name'  => __( 'Light Gray', 'redhill' ),
+					'slug'  => 'foreground-light',
+					'color' => '#666666',
+				),
+				array(
+					'name'  => __( 'Lighter Gray', 'varia' ),
+					'slug'  => 'background-dark',
+					'color' => '#DDDDDD',
+				),
+				array(
+					'name'  => __( 'Subtle Gray', 'varia' ),
+					'slug'  => 'background-light',
+					'color' => '#FAFAFA',
 				),
 				array(
 					'name'  => __( 'Foreground Light', 'redhill' ),

redhill/inc/wpcom.php

@@ -1,21 +0,0 @@
-<?
-/**
- * Adds support for wp.com-specific theme functions.
- *
- * @global array $themecolors
- */
-function redhill_wpcom_setup() {
-	global $themecolors;
-
-	// Set theme colors for third party services.
-	if ( ! isset( $themecolors ) ) {
-		$themecolors = array(
-			'bg'     => 'white', // $config-global--color-background-default
-			'border' => 'DDDDDD', // $config-global--color-border-default
-			'text'   => '222222', // $config-global--color-foreground-default
-			'link'   => 'CA2017', // $config-global--color-primary-default
-			'url'    => 'CA2017', // $config-global--color-primary-default
-		);
-	}
-}
-add_action( 'after_setup_theme', 'redhill_wpcom_setup' );