diff --git a/README.md b/README.md
index ae5c2f7..6dcb828 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ By default this includes the fonts and the font-color. The Palette colours are f
 	if($brand) {
 		$fields->insertAfter(
 			ColorPaletteField::create(
-				"Color", "Color", $brand->getPalette()
+				"Color", "Color", $brand->getFullPalette()
 			), "Intro"
 		);
 	}
@@ -39,16 +39,16 @@ The other variables provided can be called in a template with:
 ``$Brand.Logo``   
 ``$Brand.BodyBackgroundColour``
 
-To get the hex value of a colour from a colourpalette in youir template you can do something like this:
+To get the hex value of a colour from a colourpalette in your template you can do something like this:
 
-	<% if $Colour %>$Brand.getColorFromPalette($Color)<% else %>$Brand.getColorFromPalette($Level(1).Color)<% end_if %>
+	<% if $Colour %>$Brand.getHex($Color)<% else %>$Brand.getHex($Level(1).Color)<% end_if %>
 
 ## Subsite support
 This module can work with subsites with the addition of the SubsiteModelExtension from adrexia/subsite-modeladmins (specifically, the onBeforeWrite and augmentSQL functions). You can install this via composer require, or just take the bits you need:
 
 ``composer require adrexia/subsite-modeladmins``
 
-### Setup: 
+### Setup:
 In your yml config:
 
 	Brand:
diff --git a/_config/config.yml b/_config/config.yml
index 5a538dc..3caf2bb 100644
--- a/_config/config.yml
+++ b/_config/config.yml
@@ -1,5 +1,5 @@
 ---
-Name: brandconfig
+Name: brand
 ---
 SiteTree:
   extensions:
diff --git a/code/Brand.php b/code/Brand.php
index 16e44f8..0dbd730 100644
--- a/code/Brand.php
+++ b/code/Brand.php
@@ -2,6 +2,11 @@
 
 class Brand extends DataObject implements PermissionProvider {
 	private static $db = array(
+		"ContrastColour1" => 'Varchar(255)',
+		"ContrastColour2" => 'Varchar(255)',
+		"ContrastColour3" => 'Varchar(255)',
+		"ContrastColour4" => 'Varchar(255)',
+
 		"PaletteColour1" => 'Varchar(255)',
 		"PaletteColour2" => 'Varchar(255)',
 		"PaletteColour3" => 'Varchar(255)',
@@ -11,10 +16,17 @@ class Brand extends DataObject implements PermissionProvider {
 
 		"BodyBackgroundColour" => 'Varchar(255)',
 		"BodyFontColour" => 'Varchar(255)',
+		"BodyLinkColour" => 'Varchar(255)',
+		"BodyLinkHoverColour" => 'Varchar(255)',
+
+		"MenuBackgroundColour" => 'Varchar(255)',
+		"MenuFontColour" => 'Varchar(255)',
 
 		"FontImportURLS" => "Text",
 		"HeadingFont" => "Varchar(255)",
-		"BodyFont" => "Varchar(255)"
+		"BodyFont" => "Varchar(255)",
+		"BaseFontSize" => "Int",
+		"MainHeadingFontSize" => "Int"
 	);
 
 	private static $has_one = array(
@@ -22,69 +34,142 @@ class Brand extends DataObject implements PermissionProvider {
 		'Favicon' => 'Image'
 	);
 
+	private static $defaults = array(
+		"ContrastColour1" => '#333333',
+		"ContrastColour2" => '#29c407',
+		"ContrastColour3" => '#e7e7e7',
+		"ContrastColour4" => '#ffffff',
+
+		"PaletteColour1" => '#600083',
+		"PaletteColour2" => '#ffffff',
+		"PaletteColour3" => '#29c407',
+		"PaletteColour4" => '#decafe',
+		"PaletteColour5" => '#e00a95',
+		"PaletteColour6" => '#077fc4'
+	);
 
 	public function getCMSFields() {
-		$fields = parent::getCMSFields();
+		$this->beforeUpdateCMSFields(function ($fields) {
+			$fields->addFieldsToTab('Root.Palette',
+				LiteralField::create('ContrastColours', '<p class="message">Constrast colours are usually grey scale, and include both light and dark variations</p>')
+			);
 
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('ContrastColour1', '1st Contrast Colour')
+			);
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('ContrastColour2', '2nd Contrast Colour')
+			);
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('ContrastColour3', '3rd Contrast Colour')
+			);
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('ContrastColour4', '4th Contrast Colour')
+			);
 
-		$fields->addFieldsToTab('Root.Colours',
-			LiteralField::create('BodyColours', '<p class="message">Please choose a default body background colour and a contrasting font colour</p>')
-		);
+			$fields->addFieldsToTab('Root.Palette',
+				LiteralField::create('PaletteColours', '<p class="message">The palette defined here will be used to provide colour options on pages and objects throughout your site</p>')
+			);
 
-		$fields->addFieldsToTab('Root.Colours',
-			ColorField::create('BodyBackgroundColour')
-		);
-		$fields->addFieldsToTab('Root.Colours',
-			ColorField::create('BodyFontColour')
-		);
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('PaletteColour1', '1st Brand Colour')
+			);
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('PaletteColour2', '2nd Brand Colour')
+			);
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('PaletteColour3', '3rd Brand Colour')
+			);
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('PaletteColour4', '4th Brand Colour')
+			);
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('PaletteColour5', '5th Brand Colour')
+			);
+			$fields->addFieldsToTab('Root.Palette',
+				ColorField::create('PaletteColour6', '6th Brand Colour')
+			);
 
-		$fields->addFieldsToTab('Root.Colours',
-			LiteralField::create('PaletteColours', '<p class="message">The palette defined here will be used to provide colour options on pages and objects throughout your site</p>')
-		);
-		$fields->addFieldsToTab('Root.Colours',
-			ColorField::create('PaletteColour1')
-		);
-		$fields->addFieldsToTab('Root.Colours',
-			ColorField::create('PaletteColour2')
-		);
-		$fields->addFieldsToTab('Root.Colours',
-			ColorField::create('PaletteColour3')
-		);
-		$fields->addFieldsToTab('Root.Colours',
-			ColorField::create('PaletteColour4')
-		);
-		$fields->addFieldsToTab('Root.Colours',
-			ColorField::create('PaletteColour5')
-		);
-		$fields->addFieldsToTab('Root.Colours',
-			ColorField::create('PaletteColour6')
-		);
 
-		$fields->addFieldsToTab('Root.Fonts', $fontURLS = TextareaField::create('FontImportURLS'));
-		$fontURLS->setDescription('One font import statement per line. Example from google fonts: @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700,300,600|Pacifico); <br /> Find more fonts here: https://www.google.com/fonts');
 
-		$fields->addFieldsToTab('Root.Fonts', $headingFont = TextField::create('HeadingFont'));
-		$headingFont->setDescription('e.g. Open Sans. Note: should be in the same case as the import url above');
+			$fields->addFieldsToTab('Root.Colours',
+				LiteralField::create('BodyLit', '<h3>Body</h3>')
+			);
+
+			$fields->addFieldsToTab('Root.Colours',
+				ColorPaletteField::create('BodyBackgroundColour', 'Body background colour', $this->getFullPalette())
+			);
+			$fields->addFieldsToTab('Root.Colours',
+				ColorPaletteField::create('BodyFontColour', 'Body font colour', $this->getFullPalette())
+			);
+			$fields->addFieldsToTab('Root.Colours',
+				ColorPaletteField::create('BodyLinkColour', 'Link colour', $this->getFullPalette())
+			);
+			$fields->addFieldsToTab('Root.Colours',
+				ColorPaletteField::create('BodyLinkHoverColour', 'Link hover colour', $this->getFullPalette())
+			);
+
+			$fields->addFieldsToTab('Root.Colours',
+				LiteralField::create('MenuLit', '<h3>Menu</h3>')
+			);
+
+			$fields->addFieldsToTab('Root.Colours',
+				ColorPaletteField::create('MenuBackgroundColour', 'Menu background colour', $this->getFullPalette())
+			);
+			$fields->addFieldsToTab('Root.Colours',
+				ColorPaletteField::create('MenuFontColour', 'Menu font colour', $this->getFullPalette())
+			);
+
+			$fields->addFieldsToTab('Root.Fonts', $fontURLS = TextareaField::create('FontImportURLS'));
+			$fontURLS->setDescription('One font import statement per line. Example from google fonts: @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700,300,600|Pacifico); <br /> Find more fonts here: https://www.google.com/fonts');
 
-		$fields->addFieldsToTab('Root.Fonts', $headingFont = TextField::create('BodyFont'));
-		$headingFont->setDescription('e.g. Open Sans. Note: should be in the same case as the import url above');
+			$fields->addFieldsToTab('Root.Fonts', $headingFont = TextField::create('HeadingFont'));
+			$headingFont->setDescription('e.g. Open Sans. Note: should be in the same case as the import url above');
 
-		$fields->addFieldToTab('Root.Logos', $logoField = new UploadField('Logo', 'Logo'));
-		$logoField->getValidator()->setAllowedExtensions(array('jpg', 'jpeg', 'png', 'gif', 'svg'));
-		$logoField->setConfig('allowedMaxFileNumber', 1);
-		$logoField->setFolderName('Uploads/brand');
+			$fields->addFieldsToTab('Root.Fonts', $headingFont = TextField::create('BodyFont'));
+			$headingFont->setDescription('e.g. Open Sans. Note: should be in the same case as the import url above');
 
-		$fields->addFieldToTab('Root.Logos', $favField = new UploadField('Favicon', 'Favicon'));
-		$favField->getValidator()->setAllowedExtensions(array('ico', 'png'));
-		$favField->setConfig('allowedMaxFileNumber', 1);
-		$favField->setFolderName('Uploads/brand');
+			$fields->addFieldsToTab('Root.Fonts', $baseFont = TextField::create('BaseFontSize'));
+			$baseFont->setDescription('Base Body Font size (in pixels)');
 
-		$fields->removeByName('Main');
+			$fields->addFieldsToTab('Root.Fonts', $h1Font = TextField::create('MainHeadingFontSize'));
+			$h1Font->setDescription('Size of the page heading text (in pixels)');
 
-		return $fields;
+			$fields->addFieldToTab('Root.Logos', $logoField = new UploadField('Logo', 'Logo'));
+			$logoField->getValidator()->setAllowedExtensions(array('jpg', 'jpeg', 'png', 'gif', 'svg'));
+			$logoField->setConfig('allowedMaxFileNumber', 1);
+			$logoField->setFolderName('Uploads/brand');
+
+			$fields->addFieldToTab('Root.Logos', $favField = new UploadField('Favicon', 'Favicon'));
+			$favField->getValidator()->setAllowedExtensions(array('ico', 'png'));
+			$favField->setConfig('allowedMaxFileNumber', 1);
+			$favField->setFolderName('Uploads/brand');
+
+			$fields->removeByName('Main');
+		});
+		return parent::getCMSFields();
 	}
 
-	public function getPalette() {
+	/**
+	 * Returns the CMS defined contrasting colours palette.
+	 *
+	 * @return Array
+	 */
+	public function getContrastColours() {
+		return array(
+			"ContrastColour1" => $this->ContrastColour1,
+			"ContrastColour2" => $this->ContrastColour2,
+			"ContrastColour3" => $this->ContrastColour3,
+			"ContrastColour4" => $this->ContrastColour4
+		);
+	}
+
+	/**
+	 * Returns the CMS defined Brand colours palette.
+	 *
+	 * @return Array
+	 */
+	public function getPaletteColours() {
 		return array(
 			'PaletteColour1' => $this->PaletteColour1,
 			'PaletteColour2' => $this->PaletteColour2,
@@ -95,8 +180,34 @@ public function getPalette() {
 		);
 	}
 
-	public function getColorFromPalette($index) {
-		$palette = $this->getPalette();
+	/**
+	 * Returns the CMS defined colour palette.
+	 *
+	 * @return Array
+	 */
+	public function getFullPalette() {
+		return array(
+			"ContrastColour1" => $this->ContrastColour1,
+			"ContrastColour2" => $this->ContrastColour2,
+			"ContrastColour3" => $this->ContrastColour3,
+			"ContrastColour4" => $this->ContrastColour4,
+			'PaletteColour1' => $this->PaletteColour1,
+			'PaletteColour2' => $this->PaletteColour2,
+			'PaletteColour3' => $this->PaletteColour3,
+			'PaletteColour4' => $this->PaletteColour4,
+			'PaletteColour5' => $this->PaletteColour5,
+			'PaletteColour6' => $this->PaletteColour6
+		);
+	}
+
+	/**
+	 * Takes a Brand DB field name and returns the accociated Hex colour
+	 *
+	 * @param String | DB field name (eg 'PaletteColour1')
+	 * @return String | Hex colour
+	 */
+	public function getHex($index) {
+		$palette = $this->getFullPalette();
 		if(isset($palette[$index])) {
 			return $palette[$index];
 		} else {
@@ -104,6 +215,72 @@ public function getColorFromPalette($index) {
 		}
 	}
 
+	/**
+	 * Converts a hex value into an array of rgb values (red, green, blue)
+	 * Can be used to construct an rgba version of the colour
+	 * And/Or do colour maths.
+	 *
+	 * @param $color Hex String
+	 * @return Array
+	 */
+	public function getRGBArray($color) {
+
+		$hex = ltrim($color, '#');
+		$result = array();
+
+		if(strlen($hex) == 3) {
+			$result['r'] = hexdec(substr($hex, 0, 1));
+			$result['g'] = hexdec(substr($hex, 1, 1));
+			$result['b'] = hexdec(substr($hex, 2, 1));
+		}
+		else if(strlen($hex) == 6) {
+			$result['r'] = hexdec(substr($hex, 0, 2));
+			$result['g'] = hexdec(substr($hex, 2, 2));
+			$result['b'] = hexdec(substr($hex, 4, 2));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Converts a hex value into an rgb value. Can be used in the template
+	 * to crwate rgba colours.
+	 * @param $color Hex String
+	 * @return String RGB value (eg "26,35,255")
+	 */
+	public function getColorAsRGB($color) {
+		$result = $this->getRGBArray($color);
+		return implode($result, ',');
+	}
+
+	/**
+	 * Returns a brightness calculation (lower numbers are darker, higher is lighter)
+	 * @param $color Hex String
+	 * @return Int
+	 */
+	public function getBrightnessCalc($color) {
+		$rgb = $this->getRGBArray($color);
+		return (($rgb['r'] * 299) + ($rgb['g'] * 587) + ($rgb['b'] * 114)) / 1000;
+	}
+
+	/**
+	 * Returns a string of the current contrast of a colour (light or dark)
+	 * Useful for calculating whether a text colour must be dark or light, when
+	 * supplied with a background colour. If this outputs light, then we know the
+	 * text must be a dark shade in order to get satisfactory contrast
+	 *
+	 * @param $color Hex String
+	 * @return String
+	 */
+	public function getContrast($color) {
+		$brightness = $this->getBrightnessCalc($color);
+
+		if ($brightness > 130) {
+			return 'light';
+		}
+		return 'dark';
+	}
+
 
 	public function canView($member = null) {
 		return Permission::check('BRAND_VIEW');
@@ -118,7 +295,7 @@ public function canDelete($member = null) {
 	}
 
 	public function canCreate($member = null) {
-		if(BrandObject::get()) {
+		if(Brand::get()) {
 			return false;
 		}
 		return Permission::check('BRAND_CREATE');
diff --git a/code/BrandExtension.php b/code/BrandExtension.php
index c14d5f8..95b9ecb 100644
--- a/code/BrandExtension.php
+++ b/code/BrandExtension.php
@@ -23,17 +23,14 @@ public function updateCMSFields(FieldList $fields) {
 		if($brand) {
 			$fields->insertBefore(
 				ColorPaletteField::create(
-					"Colour", "Colour", $brand->getPalette()
+					"Colour", "Colour", $brand->getPaletteColours()
 				), "Content"
 			);
 		}
 
 		$fields->insertBefore(
 			$contrast = ColorPaletteField::create(
-				"ContrastColour", "Contrast Colour", array(
-					'#333' => '#333',
-					'#fff' => '#fff'
-				)
+				"ContrastColour", "Contrast Colour", $brand->getContrastColours()
 			), "Content"
 		);
 
diff --git a/templates/Brand.ss b/templates/Brand.ss
index 24e653e..93f336c 100644
--- a/templates/Brand.ss
+++ b/templates/Brand.ss
@@ -1,24 +1,70 @@
-<% if $Brand.Favicon %>
-	<link rel="shortcut icon" href="$Brand.Favicon.AbsoluteURL" />
-<% end_if %>
-
-<style>
-	<% if $Brand.FontImportURLS %>
-		$Brand.FontImportURLS
+<% with $Brand %>
+	<% if $Favicon %>
+		<link rel="shortcut icon" href="$Favicon.AbsoluteURL" />
 	<% end_if %>
-	body, p, ul {
-		<% if $Brand.BodyFont %>
-			font-family: "$Brand.BodyFont";
+
+	<style>
+
+		<% if $FontImportURLS %>
+			$FontImportURLS
 		<% end_if %>
-		<% if $Brand.BodyFontColour %>
-			color: $Brand.BodyFontColour;
+
+		<% if $BodyBackgroundColour %>
+			html {
+				background-color: $getHex($BodyBackgroundColour);
+			}
 		<% end_if %>
-	}
 
-	<% if $Brand.HeadingFont %>
-		h1,h2,h3,h4,h5,h6 {
-			font-family: "$Brand.HeadingFont";
+		body, p, ul {
+			<% if $BodyFont %>
+				font-family: "$BodyFont";
+			<% end_if %>
+			<% if $BodyFontColour %>
+				color: $getHex($BodyFontColour);
+			<% end_if %>
 		}
-	<% end_if %>
 
-</style>
+		body,
+		html {
+			<% if $BaseFontSize %>
+				font-size: {$BaseFontSize}px;
+			<% end_if %>
+		}
+
+		<% if $MainHeadingFontSize %>
+			h1 {
+				font-size: {$MainHeadingFontSize}px;
+			}
+		<% end_if %>
+
+		<% if $HeadingFont %>
+			h1,h2,h3,h4,h5,h6 {
+				font-family: "$HeadingFont";
+			}
+		<% end_if %>
+
+		<% if $BodyLinkColour %>
+			a:visited,
+			a {
+				color: $getHex($BodyLinkColour);
+			}
+
+		<% end_if %>
+
+		<% if $BodyLinkHoverColour %>
+			a:hover,
+			a:focus {
+				color: $getHex($BodyLinkHoverColour);
+			}
+		<% else %>
+			a:hover,
+			a:focus {
+				opacity: 0.8;
+			}
+		<% end_if %>
+
+
+
+	</style>
+
+<% end_with %>