Index: acquia_marina.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/acquia_marina/acquia_marina.info,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 acquia_marina.info
--- acquia_marina.info	25 May 2009 09:33:09 -0000	1.2.2.1
+++ acquia_marina.info	27 May 2009 08:49:00 -0000
@@ -5,6 +5,9 @@ description = <a href="http://www.acquia
 
 core = 6.x
 engine = phptemplate
+
+color = TRUE
+
 stylesheets[all][] = style.css
 stylesheets[all][] = icons.css
 regions[sidebar_first] = sidebar first
Index: style.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/acquia_marina/style.css,v
retrieving revision 1.5.2.2
diff -u -p -r1.5.2.2 style.css
--- style.css	25 May 2009 10:39:26 -0000	1.5.2.2
+++ style.css	27 May 2009 08:49:01 -0000
@@ -76,7 +76,7 @@ h6 {
 /*****************/
 
 a {
-  color: #27638C;
+  color: #27638C; /* t: nav link */
   margin: 0;
   padding: 0;
   text-decoration: none;
@@ -84,7 +84,7 @@ a {
 
 a:link,
 a:visited {
-  color: #27638C;
+  color: #27638C; /* t: nav link */
 }  
 
 a:hover,
@@ -875,7 +875,7 @@ body.layout-first-main-last #sidebar-las
 #sidebar-first h2.block-title,
 #sidebar-last h2.block-title,
 #postscript-wrapper h2.block-title {
-  background-color: #94CE18;
+  background-color: #94CE18; /* t: sidebar head bg */
   color: #fff;
   padding: 8px 8px 6px 46px;
   text-align: right;
@@ -1141,8 +1141,8 @@ div.rounded-inside {
 }
   
 #primary-menu ul.menu li ul li {
-  background: #94CE18;
-  border-bottom: 1px solid #83A638;
+  background: #94CE18; /* t: active local/dropdown bg */
+  border-bottom: 1px solid #83A638; /* t: active local/dropdown bg */
   float: left;
   font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
   font-size: 0.916em;
@@ -1287,29 +1287,29 @@ body.layout-main-last #breadcrumb {
 
 #content-tabs ul.secondary li a:link,
 #content-tabs ul.secondary li a:visited {
-  color: #27638C;
+  color: #27638C; /* t: tab link color */
   font-size: 1em;
   line-height: 1.1em;
 }
 
 #content-tabs ul.primary li a.active:link,
 #content-tabs ul.primary li a.active:visited {
-  border-bottom: 4px solid #94CE18;
-  color: #27638C;
+  border-bottom: 4px solid #94CE18; /* t: active local/dropdown bg */
+  color: #27638C; /* t: tab link color */
   padding-bottom: 2px;
 }
 
 #content-tabs ul.secondary li a.active:link,
 #content-tabs ul.secondary li a.active:visited {
-  border-bottom: 4px solid #94CE18;
-  color: #27638C;
+  border-bottom: 4px solid #94CE18; /* t: active local/dropdown bg */
+  color: #27638C; /* t: tab link color */
   padding-bottom: 2px;
 }
 
 #content-tabs ul.primary li a:hover,
 #content-tabs ul.secondary li a:hover {
-  border-bottom: 4px solid #94CE18;
-  color: #4A95C8;
+  border-bottom: 4px solid #94CE18; /* t: active local/dropdown bg */
+  color: #4A95C8; /* t: tab link color (h) */
   padding-bottom: 2px;
 }
 
@@ -1926,3 +1926,9 @@ blockquote a:link {
     margin: 0 3%;
   }
 }
+
+/* For color.module editor fields */
+input.hex {
+  background: none;
+  background-image: none;
+}
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/acquia_marina/template.php,v
retrieving revision 1.3.2.2
diff -u -p -r1.3.2.2 template.php
--- template.php	26 May 2009 06:35:52 -0000	1.3.2.2
+++ template.php	27 May 2009 08:49:02 -0000
@@ -674,3 +674,249 @@ function css_count($array) {
 function _themesettings_link($prefix, $suffix, $text, $path, $options) {
   return $prefix . (($text) ? l($text, $path, $options) : '') . $suffix;
 }
+
+/**
+ * Implements hook_color()
+ * Color replacement methods: 'shift' (base, link, text), 'tag' (navbar, navbarlink)
+ *                            custom tag replacement
+ * Image generation: Yes (header)
+ * @todo Complete this!  See http://drupal.org/node/444396
+ */
+function acquia_marina_color() {
+  /**
+   *  $color = array() (Required)
+   *  For essential scheme information.
+   */
+  $color = array(
+    /**
+     * 'replacement methods'
+     * Declare replacement replacement methods in the 'replacement methods' array, 
+     * in the order you want them to work.
+     *   They are comprised different algorithms to change your colors.
+     * replacement methods like 'shift' can accept different options and behave differently.
+     * To change the order of the replacement methods color replacement, put them in order.
+     */
+    'replacement methods' => array(
+      /**
+       * 'tag' method
+       * Replaces custom tags in stylesheet based on fieldname.
+       */
+      'tag' => TRUE,
+    ),
+
+    'fields' => array('page background', 'submit button', 'sidebar head bg', 'tabs',
+      'top header solid', 'header image top', 'header image bottom', 'tab link color',
+      'tab link color (h)', 'active local/dropdown bg', 'dropdown link color',
+      'dropdown link color (h)', 'nav link',
+    ),
+
+    'premade schemes' => array(
+      'Acquia Marina' => array(
+        'page background' => '#F4F7E7',
+        'submit button' => '#a4d520',  // Green,
+        'tabs' => '#a4d520',
+        'top header solid' => '#bfec58',
+        'header image top' => '#4e97c1', 
+        'header image bottom' => '#23739d',
+        'sidebar head bg' => '#94CE18',
+        'tab link color' => '#27638C',
+        'tab link color (h)' => '#4A95C8',
+        'active local/dropdown bg' => '#94CE18',
+        'dropdown link color' => '#154B6F',
+        'dropdown link color (h)' => '#FFFFFF',
+        'nav link' => '#27638C',
+      ),
+    ),
+
+    /**
+     * 'reference scheme' (Required)
+     * A scheme name from one in your 'premade schemes' list.
+     * On schemes which use the 'base', 'link' or 'text' flag, always mention this.
+     * Other schemes will be shifted against the fields of the reference one.
+     */
+    'reference scheme' => 'Acquia Marina',
+
+    /**
+     * 'default scheme' (Required)
+     * A scheme name from one in your 'premade schemes' list.
+     */
+    'default scheme' => 'Acquia Marina',
+
+    /**
+     * 'stylesheets' (Required)
+     * CSS file relative to the root of your theme.
+     * Can mention an array of stylesheets.
+     * @todo Add other CSS files?
+     */
+    'stylesheets' => array(
+      'style.css',
+    ),
+
+    /**
+     * 'blend target' (Required)
+     * I almost to completely remove this, we'll see...
+     */
+    'blend target' => '#666666',
+  );
+
+
+  $color['images']['page background'] = array(
+    /**
+     * 'file' (Required)
+     * Path to your source image in terms of theme's root.
+     */
+    'file' => 'images/color/blank-content-gradient.png',
+
+    'fill' => array(
+      array('type' => 'solid',
+        'x' => 0,
+        'y' => 0,
+        'width' => 5,
+        'height' => 55,
+        'colors' => array('page background'),
+      ),
+    ),
+
+    'slices' => array(
+      'images/content-gradient.png' => array(
+        'x' => 0,
+        'y' => 0,
+        'width' => 5,
+        'height' => 55
+      ),
+    )
+  );
+
+  $color['images']['submit button'] = array(
+    'file' => 'images/color/blank-blue-button.png',
+
+    'fill' => array(
+      array('type' => 'solid',
+        'x' => 0,
+        'y' => 0,
+        'width' => 600,
+        'height' => 40,
+        'colors' => array('submit button'),
+      ),
+    ),
+
+    'slices' => array(
+      'images/blue-button.png' => array(
+        'x' => 0,
+        'y' => 0,
+        'width' => 600,
+        'height' => 40
+      ),
+    )
+  );
+
+  $color['images']['tab left'] = array(
+    'file' => 'images/color/blank-tab-left.png',
+
+    'transparent color' => '#000000',
+
+    'fill' => array(
+      array('type' => 'solid',
+        'x' => 2,
+        'y' => 29,
+        'width' => 56,
+        'height' => 1,
+        'colors' => array('tabs'),
+      ),
+      array('type' => 'solid',
+        'x' => 1,
+        'y' => 30,
+        'width' => 57,
+        'height' => 1,
+        'colors' => array('tabs'),
+      ),
+      array('type' => 'solid',
+        'x' => 0,
+        'y' => 31,
+        'width' => 58,
+        'height' => 27,
+        'colors' => array('tabs'),
+      ),
+    ),
+
+    'slices' => array(
+      'images/tab-left.png' => array(
+      'x' => 0,
+      'y' => 0,
+      'width' => 18,
+      'height' => 58
+    ),
+    )
+  );
+
+  $color['images']['tab right'] = array(
+    'file' => 'images/color/blank-tab-right.png',
+
+    'transparent color' => '#000000',
+
+    'fill' => array(
+      array('type' => 'solid',
+        'x' => 0,
+        'y' => 29,
+        'width' => 398,
+        'height' => 1,
+        'colors' => array('tabs'),
+      ),
+      array('type' => 'solid',
+        'x' => 0,
+        'y' => 30,
+        'width' => 399,
+        'height' => 1,
+        'colors' => array('tabs'),
+      ),
+      array('type' => 'solid',
+        'x' => 0,
+        'y' => 31,
+        'width' => 400,
+        'height' => 27,
+        'colors' => array('tabs'),
+      ),
+    ),
+
+    'slices' => array(
+      'images/tab-right.png' => array(
+        'x' => 0,
+        'y' => 0,
+        'width' => 400,
+        'height' => 58
+      ),
+    )
+  );
+
+  $color['images']['header image'] = array(
+    'file' => 'images/color/blank-preface-wrapper-bg.png',
+
+    'fill' => array(
+      array('type' => 'solid',
+        'x' => 0,
+        'y' => 0,
+        'width' => 2,
+        'height' => 5,
+        'colors' => array('top header solid'),
+      ),
+      array('type' => 'y-gradient',
+        'x' => 0,
+        'y' => 6,
+        'width' => 2,
+        'height' => 178,
+        'colors' => array('header image top', 'header image bottom'),
+      ),
+    ),
+
+    'slices' => array(
+      'images/preface-wrapper-bg.png' => array(
+        'x' => 0,
+        'y' => 0,
+        'width' => 2,
+        'height' => 183
+      ),
+    )
+  );
+
+  return $color;
+}