diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
index bc0c93b616..9337eb3c81 100644
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -7,7 +7,7 @@ module.exports = function (grunt) {
 
   //run by the watch task
   grunt.registerTask('watch-js', ['jshint:dev','concat','copy:app','copy:mocks','copy:packages','copy:tuning','copy:vs','karma:unit']);
-  grunt.registerTask('watch-less', ['recess:build', 'recess:installer', 'recess:tuning', 'copy:assets', 'copy:vs']);
+  grunt.registerTask('watch-less', ['recess:build', 'recess:installer', 'recess:tuning','copy:tuning', 'copy:assets', 'copy:vs']);
   grunt.registerTask('watch-html', ['copy:views', 'copy:vs']);
   grunt.registerTask('watch-packages', ['copy:packages']);
   grunt.registerTask('watch-installer', ['concat:install', 'concat:installJs', 'copy:installer', 'copy:vs']);
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.config.js b/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.config.js
index e5c97d190a..0dee0f32a7 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.config.js
+++ b/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.config.js
@@ -239,7 +239,7 @@ var tuningConfig = {
         sections: [{
             name: "General",
             subSections: [{
-                name: "Main",
+                name: "Main Column Style",
                 schema: ".content",
                 fields: [{
                     name: "Layout",
@@ -304,7 +304,7 @@ var tuningConfig = {
                 }]
             },
             {
-                name: "Header",
+                name: "Header Style",
                 schema: "header",
                 fields: [{
                     name: "Top Border Size",
@@ -359,6 +359,67 @@ var tuningConfig = {
                     value: "0"
                 }]
             },
+            {
+                name: "Pre Header",
+                schema: ".preHeader-row",
+                fields: [{
+                    name: "Display",
+                    alias: "styPreHeaderDisplay",
+                    description: "PreHeader links list display",
+                    type: "displayPicker",
+                    value: ""
+                },
+                {
+                    name: "Background Color",
+                    alias: "styPreHeaderBackgroundColor",
+                    description: "PreHeader links list background color",
+                    type: "colorPicker",
+                    value: ""
+                },
+                {
+                    name: "Top Margin",
+                    alias: "styPreHeaderTopMargin",
+                    description: "PreHeader links list top margin",
+                    type: "slider",
+                    min: "0",
+                    max: "500",
+                    value: "0"
+                },
+                {
+                    name: "Border Top Size",
+                    alias: "styPreHeaderBorderTopSize",
+                    description: "PreHeader links list border top size",
+                    type: "slider",
+                    min: "0",
+                    max: "50",
+                    value: "0"
+                },
+                {
+                    name: "Border Bottom Size",
+                    alias: "styPreHeaderBorderBottomSize",
+                    description: "PreHeader links list border bottom size",
+                    type: "slider",
+                    min: "0",
+                    max: "50",
+                    value: "0"
+                },
+                {
+                    name: "Border Top Color",
+                    alias: "styPreHeaderBorderTopColor",
+                    description: "PreHeader links list border top color",
+                    type: "colorPicker",
+                    value: "",
+                    colorPaletteProperty: "colorBase"
+                },
+                {
+                    name: "Border Bottom Color",
+                    alias: "styPreHeaderBorderBottomColor",
+                    description: "PreHeader links list border bottom color",
+                    type: "colorPicker",
+                    value: "",
+                    colorPaletteProperty: "colorBase"
+                }]
+            },
             {
                 name: "Navigation",
                 schema: ".navbar-collapse",
@@ -453,67 +514,6 @@ var tuningConfig = {
                     colorPaletteProperty: "colorBase"
                 }]
             },
-            {
-                name: "Social Links",
-                schema: ".social-row",
-                fields: [{
-                    name: "Display",
-                    alias: "stySocialDisplay",
-                    description: "Social links list display",
-                    type: "displayPicker",
-                    value: ""
-                },
-                {
-                    name: "Background Color",
-                    alias: "stySocialBackgroundColor",
-                    description: "Social links list background color",
-                    type: "colorPicker",
-                    value: ""
-                },
-                {
-                    name: "Top Margin",
-                    alias: "stySocialTopMargin",
-                    description: "Social links list top margin",
-                    type: "slider",
-                    min: "0",
-                    max: "500",
-                    value: "0"
-                },
-                {
-                    name: "Border Top Size",
-                    alias: "stySocialBorderTopSize",
-                    description: "Social links list border top size",
-                    type: "slider",
-                    min: "0",
-                    max: "50",
-                    value: "0"
-                },
-                {
-                    name: "Border Bottom Size",
-                    alias: "stySocialBorderBottomSize",
-                    description: "Social links list border bottom size",
-                    type: "slider",
-                    min: "0",
-                    max: "50",
-                    value: "0"
-                },
-                {
-                    name: "Border Top Color",
-                    alias: "stySocialBorderTopColor",
-                    description: "Social links list border top color",
-                    type: "colorPicker",
-                    value: "",
-                    colorPaletteProperty: "colorBase"
-                },
-                {
-                    name: "Border Bottom Color",
-                    alias: "stySocialBorderBottomColor",
-                    description: "Social links list border bottom color",
-                    type: "colorPicker",
-                    value: "",
-                    colorPaletteProperty: "colorBase"
-                }]
-            },
             {
                 name: "Boxes",
                 fields: [{
@@ -610,7 +610,7 @@ var tuningConfig = {
         sections: [{
             name: "Main",
             subSections: [{
-                name: "Body",
+                name: "Default font",
                 schema: "p",
                 fields: [{
                     name: "Color",
@@ -650,7 +650,57 @@ var tuningConfig = {
                 }]
             },
             {
-                name: "Navigation",
+                name: "Pre Header Font",
+                schema: ".preHeader-row",
+                fields: [{
+                    name: "Font Color",
+                    alias: "FontPreHeaderFontColor",
+                    description: "PreHeader links list font color",
+                    type: "colorPicker",
+                    value: "",
+                    colorPaletteProperty: "colorFontRev"
+                },
+                {
+                    name: "Font Color Hover",
+                    alias: "FontPreHeaderFontColorHover",
+                    description: "PreHeader links list font color hover",
+                    type: "colorPicker",
+                    value: "",
+                    colorPaletteProperty: "colorFontRevActive"
+                },
+                {
+                    name: "Font Size",
+                    alias: "FontPreHeaderFontSize",
+                    description: "PreHeader links list font size",
+                    type: "slider",
+                    min: "8",
+                    max: "36",
+                    value: "0"
+                },
+                {
+                    name: "Line Height",
+                    alias: "FontPreHeaderLineHeight",
+                    description: "PreHeader links list line height",
+                    type: "slider",
+                    min: "20",
+                    max: "200",
+                    value: "0"
+                },
+                {
+                    name: "Family",
+                    alias: "FontPreHeaderFamily",
+                    description: "",
+                    type: "fontFamilyPicker",
+                    fontType: "",
+                    fontWeight: "",
+                    fontStyle: "",
+                    value: ""
+                }
+                ]
+            },
+
+            {
+                name: "Navigation Font",
                 schema: ".nav",
                 fields: [{
                     name: "Font Color",
@@ -697,55 +747,6 @@ var tuningConfig = {
                     value: ""
                 }]
             },
-            {
-                name: "Social Link",
-                schema: "social-row",
-                fields: [{
-                    name: "Font Color",
-                    alias: "FontSocialFontColor",
-                    description: "Social links list font color",
-                    type: "colorPicker",
-                    value: "",
-                    colorPaletteProperty: "colorFontRev"
-                },
-                {
-                    name: "Font Color Hover",
-                    alias: "FontSocialFontColorHover",
-                    description: "Social links list font color hover",
-                    type: "colorPicker",
-                    value: "",
-                    colorPaletteProperty: "colorFontRevActive"
-                },
-                {
-                    name: "Font Size",
-                    alias: "FontSocialFontSize",
-                    description: "Social links list font size",
-                    type: "slider",
-                    min: "8",
-                    max: "36",
-                    value: "0"
-                },
-                {
-                    name: "Line Height",
-                    alias: "FontSocialLineHeight",
-                    description: "Social links list line height",
-                    type: "slider",
-                    min: "20",
-                    max: "200",
-                    value: "0"
-                },
-                {
-                    name: "Family",
-                    alias: "FontSocialFamily",
-                    description: "",
-                    type: "fontFamilyPicker",
-                    fontType: "",
-                    fontWeight: "",
-                    fontStyle: "",
-                    value: ""
-                }
-                ]
-            },
             {
                 name: "H1",
                 schema: "h1",
@@ -1089,18 +1090,18 @@ var tuningConfig = {
                     value: ""
                 }]
             }, {
-                name: "Medium",
-                schema: ".medium",
+                name: "Small",
+                schema: ".small",
                 fields: [{
                     name: "Color",
-                    alias: "FontMediumColor",
+                    alias: "FontSmallColor",
                     description: "",
                     type: "colorPicker",
                     value: "",
                     colorPaletteProperty: "colorFontDefault"
                 }, {
                     name: "Size",
-                    alias: "FontMediumSize",
+                    alias: "FontSmallSize",
                     description: "",
                     type: "slider",
                     min: "8",
@@ -1109,7 +1110,7 @@ var tuningConfig = {
                 },
                 {
                     name: "Line Height",
-                    alias: "FontMediumLineHeight",
+                    alias: "FontSmallLineHeight",
                     description: "",
                     type: "slider",
                     min: "8",
@@ -1118,7 +1119,7 @@ var tuningConfig = {
                 },
                 {
                     name: "Top margin",
-                    alias: "FontMediumTopMargin",
+                    alias: "FontSmallTopMargin",
                     description: "",
                     type: "slider",
                     min: "0",
@@ -1127,7 +1128,7 @@ var tuningConfig = {
                 },
                 {
                     name: "Bottom margin",
-                    alias: "FontMediumBottomMargin",
+                    alias: "FontSmallBottomMargin",
                     description: "",
                     type: "slider",
                     min: "0",
@@ -1136,7 +1137,64 @@ var tuningConfig = {
                 },
                 {
                     name: "Family",
-                    alias: "FontMediumFamily",
+                    alias: "FontSmallFamily",
+                    description: "",
+                    type: "fontFamilyPicker",
+                    fontType: "",
+                    fontWeight: "",
+                    fontStyle: "",
+                    value: ""
+                }]
+            },
+            {
+                name: "Blockquote",
+                schema: "blockquote",
+                fields: [{
+                    name: "Color",
+                    alias: "FontBlockquoteColor",
+                    description: "",
+                    type: "colorPicker",
+                    value: "",
+                    colorPaletteProperty: "colorFontDefault"
+                }, {
+                    name: "Size",
+                    alias: "FontBlockquoteSize",
+                    description: "",
+                    type: "slider",
+                    min: "8",
+                    max: "64",
+                    value: "0"
+                },
+                {
+                    name: "Line Height",
+                    alias: "FontBlockquoteLineHeight",
+                    description: "",
+                    type: "slider",
+                    min: "8",
+                    max: "64",
+                    value: "0"
+                },
+                {
+                    name: "Top margin",
+                    alias: "FontBlockquoteTopMargin",
+                    description: "",
+                    type: "slider",
+                    min: "0",
+                    max: "200",
+                    value: "0"
+                },
+                {
+                    name: "Bottom margin",
+                    alias: "FontBlockquoteBottomMargin",
+                    description: "",
+                    type: "slider",
+                    min: "0",
+                    max: "200",
+                    value: "0"
+                },
+                {
+                    name: "Family",
+                    alias: "FontBlockquoteFamily",
                     description: "",
                     type: "fontFamilyPicker",
                     fontType: "",
@@ -1174,11 +1232,11 @@ var tuningConfig = {
                     value: ""
                 }]
             }, {
-                name: "Big",
-                schema: ".big",
+                name: "Lead",
+                schema: ".lead",
                 fields: [{
                     name: "Color",
-                    alias: "FontBigColor",
+                    alias: "FontLeadColor",
                     description: "",
                     type: "colorPicker",
                     value: "",
@@ -1186,7 +1244,7 @@ var tuningConfig = {
                 },
                 {
                     name: "Size",
-                    alias: "FontBigSize",
+                    alias: "FontLeadSize",
                     description: "",
                     type: "slider",
                     min: "8",
@@ -1195,7 +1253,7 @@ var tuningConfig = {
                 },
                 {
                     name: "Line Height",
-                    alias: "FontBigLineHeight",
+                    alias: "FontLeadLineHeight",
                     description: "",
                     type: "slider",
                     min: "8",
@@ -1204,7 +1262,7 @@ var tuningConfig = {
                 },
                 {
                     name: "Top margin",
-                    alias: "FontBigTopMargin",
+                    alias: "FontLeadTopMargin",
                     description: "",
                     type: "slider",
                     min: "0",
@@ -1213,7 +1271,7 @@ var tuningConfig = {
                 },
                 {
                     name: "Bottom margin",
-                    alias: "FontBigBottomMargin",
+                    alias: "FontLeadBottomMargin",
                     description: "",
                     type: "slider",
                     min: "0",
@@ -1222,7 +1280,7 @@ var tuningConfig = {
                 },
                 {
                     name: "Family",
-                    alias: "FontBigFamily",
+                    alias: "FontLeadFamily",
                     description: "",
                     type: "fontFamilyPicker",
                     fontType: "",
@@ -1301,41 +1359,6 @@ var tuningConfig = {
                     value: ""
                 }]
             },
-            {
-                name: "Color2",
-                schema: ".color2",
-                fields: [{
-                    name: "Color",
-                    alias: "FontColor2Color",
-                    description: "",
-                    type: "colorPicker",
-                    value: "",
-                    colorPaletteProperty: "colorBase"
-                }]
-            },
-            {
-                name: "Color3",
-                schema: ".color3",
-                fields: [{
-                    name: "Color",
-                    alias: "FontColor3Color",
-                    description: "",
-                    type: "colorPicker",
-                    value: "",
-                    colorPaletteProperty: "colorFontRev"
-                }]
-            },
-            {
-                name: "Color4",
-                schema: ".color4",
-                fields: [{
-                    name: "Color",
-                    alias: "FontColor4Color",
-                    description: "",
-                    type: "colorPicker",
-                    value: ""
-                }]
-            },
             {
                 name: "Link",
                 schema: "p a",
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.palettes.js b/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.palettes.js
index 5d1148ea51..6314c526b6 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.palettes.js
+++ b/src/Umbraco.Web.UI.Client/src/tuning/config/tuning.palettes.js
@@ -27,6 +27,12 @@ var tuningPalette = [
         mainColor: "",
         gf: ["Ubuntu:300"],
         colors: { "backgroundBodyColor": "rgb(227, 227, 227)", "backgroundBodyGradientColor": "rgba(227, 227, 227, 0.26)", "backgroundBodyImageOrPattern": "", "backgroundBodyPosition": "top center", "backgroundBodyCover": "true", "backgroundBodyRepeat": "repeat", "backgroundBodyAttachment": "fixed", "backgroundMainColumnColor": "rgb(255, 255, 255)", "backgroundMainColumnGradientColor": "", "backgroundMainColumnImageOrPattern": "", "backgroundMainColumnPosition": "", "backgroundMainColumnCover": "true", "backgroundMainColumnRepeat": "", "backgroundMainColumnAttachment": "fixed", "backgroundHeaderColor": "", "backgroundHeaderGradientColor": "", "backgroundHeaderImageOrPattern": "", "backgroundHeaderPosition": "", "backgroundHeaderCover": "false", "backgroundHeaderRepeat": "", "backgroundHeaderAttachment": "scroll", "backgroundFooterColor": "rgb(76, 76, 76)", "backgroundFooterGradientColor": "rgba(76, 76, 76, 0.93)", "backgroundFooterImageOrPattern": "", "backgroundFooterPosition": "center", "backgroundFooterCover": "false", "backgroundFooterRepeat": "", "backgroundFooterAttachment": "scroll", "stylingMainColumnBoxed": "boxed", "stylingHeaderTopMargin": "20", "stylingMainColumnTopMargin": "0", "stylingFooterTopMargin": "0", "stylingFooterBottompMargin": "20", "stylingMainColumnRadius": "0", "stylingMainColumnShadow": "0", "stylingHeaderTopBorderSize": "0", "stylingHeaderBottomBorderSize": "0", "stylingHeaderTopBorderColor": "", "stylingHeaderBottomBorderColor": "", "stylingHeaderMinHeight": "0", "stylingHeaderLogoTopMargin": "-43", "stylingNavDisplay": "block-left", "stylingNavBackgroundColor": "rgb(76, 76, 76)", "stylingNavBackgroundDdl": "rgb(255, 255, 255)", "stylingNavBackgroundActiveColor": "rgb(22, 159, 230)", "stylingNavMarginTop": "10", "stylingNavRadius": "0", "stylingNavRadiusOnlyTop": "false", "stylingNavItemTopBorderActiveSize": "0", "stylingNavItemBottomBorderActiveSize": "0", "stylingNavItemTopBorderActiveColor": "", "stylingNavItemBottomBorderActiveColor": "", "stySocialDisplay": "float-right", "stySocialBackgroundColor": "", "stySocialTopMargin": "5", "stySocialBorderTopSize": "0", "stySocialBorderBottomSize": "0", "stySocialBorderTopColor": "", "stySocialBorderBottomColor": "", "stylingBoxesBackgroundColor": "", "stylingBoxesMinHeight": "0", "stylingBoxesRadius": "0", "stylingBoxesBorderSize": "0", "stylingBoxesBorderColor": "rgb(170, 170, 170)", "stylingThumbnailsBackgroundColor": "", "stylingThumbnailsMinHeight": "316", "stylingThumbnailsRadius": "0", "stylingThumbnailsBorderSize": "1", "stylingThumbnailsBorderColor": "rgb(170, 170, 170)", "FontBodyColor": "rgb(18, 18, 20)", "FontBodySize": "12", "FontBodyLineHeight": "14", "FontBodyFamily": "Ubuntu", "FontBodyFamily_weight": "300", "FontBodyFamily_style": "", "FontBodyFamily_type": "google", "FontNavFontColor": "rgb(253, 253, 253)", "FontNavFontActiveColor": "rgb(255, 255, 255)", "FontNavSize": "14", "FontNavLineHeight": "40", "FontNavFamily": "Ubuntu", "FontNavFamily_weight": "300", "FontNavFamily_style": "", "FontNavFamily_type": "google", "FontSocialFontColor": "rgba(76, 76, 76, 0.72)", "FontSocialFontColorHover": "rgb(22, 159, 230)", "FontSocialFontSize": "11", "FontSocialLineHeight": "25", "FontSocialFamily": "Ubuntu", "FontSocialFamily_weight": "300", "FontSocialFamily_style": "", "FontSocialFamily_type": "google", "FontH1Color": "rgb(22, 159, 230)", "FontH1Size": "34", "FontH1LineHeight": "26", "FontH1TopMargin": "20", "FontH1BottomMargin": "20", "FontH1Family": "Ubuntu", "FontH1Family_weight": "300", "FontH1Family_style": "", "FontH1Family_type": "google", "FontH2Color": "rgb(22, 159, 230)", "FontH2Size": "26", "FontH2LineHeight": "35", "FontH2TopMargin": "5", "FontH2BottomMargin": "10", "FontH2Family": "Ubuntu", "FontH2Family_weight": "300", "FontH2Family_style": "", "FontH2Family_type": "google", "FontH3Color": "rgb(22, 159, 230)", "FontH3Size": "18", "FontH3LineHeight": "16", "FontH3TopMargin": "10", "FontH3BottomMargin": "10", "FontH3Family": "Ubuntu", "FontH3Family_weight": "300", "FontH3Family_style": "", "FontH3Family_type": "google", "FontH4Color": "rgb(22, 159, 230)", "FontH4Size": "14", "FontH4LineHeight": "14", "FontH4TopMargin": "5", "FontH4BottomMargin": "10", "FontH4Family": "Ubuntu", "FontH4Family_weight": "300", "FontH4Family_style": "", "FontH4Family_type": "google", "FontH5Color": "rgb(170, 170, 170)", "FontH5Size": "14", "FontH5LineHeight": "14", "FontH5TopMargin": "5", "FontH5BottomMargin": "10", "FontH5Family": "Ubuntu", "FontH5Family_weight": "300", "FontH5Family_style": "", "FontH5Family_type": "google", "FontH6Color": "", "FontH6Size": "14", "FontH6LineHeight": "12", "FontH6TopMargin": "5", "FontH6BottomMargin": "10", "FontH6Family": "Ubuntu", "FontH6Family_weight": "300", "FontH6Family_style": "", "FontH6Family_type": "google", "FontMediumColor": "", "FontMediumSize": "18", "FontMediumLineHeight": "24", "FontMediumTopMargin": "5", "FontMediumBottomMargin": "10", "FontMediumFamily": "Ubuntu", "FontMediumFamily_weight": "300", "FontMediumFamily_style": "", "FontMediumFamily_type": "google", "FontHighlightedColor": "rgb(255, 255, 255)", "FontHighlightedBackgroundColor": "rgb(22, 159, 230)", "FontHighlightedFamily": "Ubuntu", "FontHighlightedFamily_weight": "300", "FontHighlightedFamily_style": "", "FontHighlightedFamily_type": "google", "FontBigColor": "rgb(22, 159, 230)", "FontBigSize": "26", "FontBigLineHeight": "28", "FontBigTopMargin": "5", "FontBigBottomMargin": "15", "FontBigFamily": "Ubuntu", "FontBigFamily_weight": "300", "FontBigFamily_style": "", "FontBigFamily_type": "google", "FontButtonColor": "rgba(255, 255, 255, 0.92)", "FontButtonBackgroundColor": "rgb(22, 159, 230)", "FontButtonColorHover": "rgba(255, 255, 255, 0.55)", "FontButtonBackgroundColorHover": "rgba(22, 159, 230, 0.74)", "FontButtonSize": "24", "FontButtonLineHeight": "24", "FontButtonPadding": "10", "FontButtonFamily": "Ubuntu", "FontButtonFamily_weight": "300", "FontButtonFamily_style": "", "FontButtonFamily_type": "google", "FontColor2Color": "rgb(22, 159, 230)", "FontColor3Color": "rgba(253, 251, 251, 0.91)", "FontColor4Color": "rgb(170, 170, 170)", "FontLinkColor": "rgb(22, 159, 230)", "FontLinkColorHover": "rgba(22, 159, 230, 0.77)" }
+    },
+    {
+        name: "Codegarden 2014",
+        mainColor: "#f0ad4e",
+        gf: ["Raleway:200", "Raleway:100", "Lato:100", "Raleway:500", "Lato:regular", "Raleway:300"],
+        colors: { "backgroundBodyColor": "rgb(51, 51, 51)", "backgroundBodyGradientColor": "", "backgroundBodyImageOrPattern": "", "backgroundBodyPosition": "top center", "backgroundBodyCover": "true", "backgroundBodyRepeat": "repeat", "backgroundBodyAttachment": "fixed", "backgroundMainColumnColor": "rgb(51, 51, 51)", "backgroundMainColumnGradientColor": "", "backgroundMainColumnImageOrPattern": "", "backgroundMainColumnPosition": "", "backgroundMainColumnCover": "true", "backgroundMainColumnRepeat": "", "backgroundMainColumnAttachment": "fixed", "backgroundHeaderColor": "rgb(51, 51, 51)", "backgroundHeaderGradientColor": "", "backgroundHeaderImageOrPattern": "", "backgroundHeaderPosition": "", "backgroundHeaderCover": "true", "backgroundHeaderRepeat": "", "backgroundHeaderAttachment": "fixed", "backgroundFooterColor": "rgb(51, 51, 51)", "backgroundFooterGradientColor": "", "backgroundFooterImageOrPattern": "", "backgroundFooterPosition": "center", "backgroundFooterCover": "true", "backgroundFooterRepeat": "", "backgroundFooterAttachment": "fixed", "stylingMainColumnBoxed": "wide", "stylingHeaderTopMargin": "0", "stylingMainColumnTopMargin": "0", "stylingFooterTopMargin": "0", "stylingFooterBottompMargin": "0", "stylingMainColumnRadius": "0", "stylingMainColumnShadow": "0", "stylingHeaderTopBorderSize": "0", "stylingHeaderBottomBorderSize": "1", "stylingHeaderTopBorderColor": "", "stylingHeaderBottomBorderColor": "rgba(204, 204, 204, 0.09)", "stylingHeaderMinHeight": "0", "stylingHeaderLogoTopMargin": "14", "stylingNavDisplay": "float-right", "stylingNavBackgroundColor": "", "stylingNavBackgroundDdl": "", "stylingNavBackgroundActiveColor": "", "stylingNavMarginTop": "-50", "stylingNavRadius": "5", "stylingNavRadiusOnlyTop": "true", "stylingNavItemTopBorderActiveSize": "0", "stylingNavItemBottomBorderActiveSize": "0", "stylingNavItemTopBorderActiveColor": "rgb(230, 126, 34)", "stylingNavItemBottomBorderActiveColor": "rgb(230, 126, 34)", "stySocialDisplay": "none", "stySocialBackgroundColor": "rgba(255, 255, 255, 0.08)", "stySocialTopMargin": "0", "stySocialBorderTopSize": "0", "stySocialBorderBottomSize": "0", "stySocialBorderTopColor": "rgb(230, 126, 34)", "stySocialBorderBottomColor": "rgb(230, 126, 34)", "stylingBoxesBackgroundColor": "", "stylingBoxesMinHeight": "0", "stylingBoxesRadius": "0", "stylingBoxesBorderSize": "0", "stylingBoxesBorderColor": "", "stylingThumbnailsBackgroundColor": "", "stylingThumbnailsMinHeight": "0", "stylingThumbnailsRadius": "0", "stylingThumbnailsBorderSize": "0", "stylingThumbnailsBorderColor": "", "FontBodyColor": "rgb(255, 255, 255)", "FontBodySize": "20", "FontBodyLineHeight": "30", "FontBodyFamily": "Raleway", "FontBodyFamily_weight": "200", "FontBodyFamily_style": "", "FontBodyFamily_type": "google", "FontNavFontColor": "rgb(207, 207, 207)", "FontNavFontActiveColor": "rgb(255, 255, 255)", "FontNavSize": "20", "FontNavLineHeight": "39", "FontNavFamily": "Raleway", "FontNavFamily_weight": "100", "FontNavFamily_style": "", "FontNavFamily_type": "google", "FontSocialFontColor": "rgba(255, 255, 255, 0.6)", "FontSocialFontColorHover": "rgb(255, 255, 255)", "FontSocialFontSize": "12", "FontSocialLineHeight": "34", "FontSocialFamily": "Lato", "FontSocialFamily_weight": "100", "FontSocialFamily_style": "", "FontSocialFamily_type": "google", "FontH1Color": "rgb(255, 255, 255)", "FontH1Size": "30", "FontH1LineHeight": "37", "FontH1TopMargin": "20", "FontH1BottomMargin": "20", "FontH1Family": "Raleway", "FontH1Family_weight": "500", "FontH1Family_style": "", "FontH1Family_type": "google", "FontH2Color": "rgb(255, 255, 255)", "FontH2Size": "30", "FontH2LineHeight": "37", "FontH2TopMargin": "20", "FontH2BottomMargin": "20", "FontH2Family": "Raleway", "FontH2Family_weight": "500", "FontH2Family_style": "", "FontH2Family_type": "google", "FontH3Color": "rgb(255, 255, 255)", "FontH3Size": "18", "FontH3LineHeight": "16", "FontH3TopMargin": "20", "FontH3BottomMargin": "20", "FontH3Family": "Lato", "FontH3Family_weight": "regular", "FontH3Family_style": "", "FontH3Family_type": "google", "FontH4Color": "rgb(66, 139, 202)", "FontH4Size": "30", "FontH4LineHeight": "35", "FontH4TopMargin": "5", "FontH4BottomMargin": "10", "FontH4Family": "Raleway", "FontH4Family_weight": "300", "FontH4Family_style": "", "FontH4Family_type": "google", "FontH5Color": "", "FontH5Size": "12", "FontH5LineHeight": "12", "FontH5TopMargin": "5", "FontH5BottomMargin": "10", "FontH5Family": "Lato", "FontH5Family_weight": "regular", "FontH5Family_style": "", "FontH5Family_type": "google", "FontH6Color": "", "FontH6Size": "12", "FontH6LineHeight": "12", "FontH6TopMargin": "5", "FontH6BottomMargin": "10", "FontH6Family": "Lato", "FontH6Family_weight": "regular", "FontH6Family_style": "", "FontH6Family_type": "google", "FontMediumColor": "", "FontMediumSize": "18", "FontMediumLineHeight": "24", "FontMediumTopMargin": "5", "FontMediumBottomMargin": "10", "FontMediumFamily": "Lato", "FontMediumFamily_weight": "regular", "FontMediumFamily_style": "", "FontMediumFamily_type": "google", "FontHighlightedColor": "rgb(255, 255, 255)", "FontHighlightedBackgroundColor": "rgb(230, 126, 34)", "FontHighlightedFamily": "Lato", "FontHighlightedFamily_weight": "regular", "FontHighlightedFamily_style": "", "FontHighlightedFamily_type": "google", "FontBigColor": "rgb(230, 126, 34)", "FontBigSize": "26", "FontBigLineHeight": "28", "FontBigTopMargin": "5", "FontBigBottomMargin": "15", "FontBigFamily": "Lato", "FontBigFamily_weight": "regular", "FontBigFamily_style": "", "FontBigFamily_type": "google", "FontButtonColor": "rgba(255, 255, 255, 0.92)", "FontButtonBackgroundColor": "rgb(230, 126, 34)", "FontButtonColorHover": "rgba(255, 255, 255, 0.55)", "FontButtonBackgroundColorHover": "rgba(230, 126, 34, 0.74)", "FontButtonSize": "16", "FontButtonLineHeight": "24", "FontButtonPadding": "9", "FontButtonFamily": "Lato", "FontButtonFamily_weight": "regular", "FontButtonFamily_style": "", "FontButtonFamily_type": "google", "FontColor2Color": "rgb(230, 126, 34)", "FontColor3Color": "rgba(253, 251, 251, 0.91)", "FontColor4Color": "rgb(170, 170, 170)", "FontLinkColor": "rgb(66, 139, 202)", "FontLinkColorHover": "rgb(66, 139, 202)" }
     }
 ];
 
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/index.html b/src/Umbraco.Web.UI.Client/src/tuning/index.html
index 889fc0dfea..86716a2efb 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/index.html
+++ b/src/Umbraco.Web.UI.Client/src/tuning/index.html
@@ -70,7 +70,7 @@
 
                                     <accordion-group ng-repeat="subSection in section.subSections"
                                                      ng-class="{true:'selected', false:''}[isOpen]"
-                                                     is-open="(schemaFocus != '' && schemaFocus == subSection.schema.toLowerCase())">
+                                                     is-open="(schemaFocus != '' && schemaFocus == subSection.name.toLowerCase())">
 
                                         <accordion-heading>
                                             <span ng-click="accordionOpened(subSection.name)" ng-mouseover="accordionWillBeOpened(subSection.schema)">
@@ -78,63 +78,65 @@
                                             </span>
                                         </accordion-heading>
 
-                                        <div class="div-field" ng-repeat="field in subSection.fields">
+                                        <div ng-mouseover="accordionWillBeOpened(subSection.schema)">
+                                            <div class="div-field" ng-repeat="field in subSection.fields">
 
-                                            <span class="field-title">{{field.name}}:</span>
+                                                <span class="field-title">{{field.name}}:</span>
 
-                                            <div ng-if="field.type == 'colorPicker'">
-                                                <spectrum colorselected="field.value"></spectrum>
-                                                <i ng-if="field.value != ''" ng-click="removeField(field)" class="icon icon-delete colorPickerDelete"></i>
-                                            </div>
-
-                                            <div ng-if="field.type == 'bgImagePicker'" class="imagePickerPreviewContainer">
-                                                <div class="imagePickerPreview" ng-click="open(field)" style="background-image:{{ field.value }}">
-                                                    <i class="icon icon-add"></i>
+                                                <div ng-if="field.type == 'colorPicker'">
+                                                    <spectrum colorselected="field.value"></spectrum>
+                                                    <i ng-if="field.value != ''" ng-click="removeField(field)" class="icon icon-delete colorPickerDelete"></i>
                                                 </div>
-                                                <i ng-if="field.value != ''" ng-click="removeField(field)" class="icon icon-delete colorPickerDelete"></i>
-                                            </div>
 
-                                            <div ng-if="field.type == 'bgPositionPicker'">
-                                                <select ng-options="BackgroundPosition for BackgroundPosition in BackgroundPositions" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'bgRepeatPicker'">
-                                                <select ng-options="BackgroundRepeat for BackgroundRepeat in BackgroundRepeats" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'bgAttachmentPicker'">
-                                                <select ng-options="BackgroundAttachment for BackgroundAttachment in BackgroundAttachments" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'layoutPicker'">
-                                                <select ng-options="Layout for Layout in Layouts" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div class="box-slider" ng-if="field.type == 'slider'">
-                                                <div ui-slider min="{{field.min}}" max="{{field.max}}" step="1" ng-model="field.value"></div>
-                                                <span class="slider-span">px</span><input class="slider-input" ng-model="field.value">
-                                            </div>
-
-                                            <div ng-if="field.type == 'checkbox'">
-                                                <input type="checkbox" ng-checked="field.value == 'true'" ng-model="field.value">
-                                            </div>
-
-                                            <div ng-if="field.type == 'displayPicker'">
-                                                <select ng-options="display for display in displays" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'optionHomePicker'">
-                                                <select ng-options="optionHome for optionHome in optionHomes" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'fontFamilyPicker'">
-                                                <div class="fontFamilyPickerPreview" ng-click="openFontFamilyPickerModal(field)" style="font-family:{{ field.value }}">
-                                                    <span>Aa</span>
-                                                    {{ field.value }}
+                                                <div ng-if="field.type == 'bgImagePicker'" class="imagePickerPreviewContainer">
+                                                    <div class="imagePickerPreview" ng-click="open(field)" style="background-image:{{ field.value }}">
+                                                        <i class="icon icon-add"></i>
+                                                    </div>
+                                                    <i ng-if="field.value != ''" ng-click="removeField(field)" class="icon icon-delete colorPickerDelete"></i>
                                                 </div>
-                                                <i ng-if="field.value != ''" ng-click="removeField(field)" class="fa fa-times colorPickerDelete"></i>
-                                            </div>
 
+                                                <div ng-if="field.type == 'bgPositionPicker'">
+                                                    <select ng-options="BackgroundPosition for BackgroundPosition in BackgroundPositions" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'bgRepeatPicker'">
+                                                    <select ng-options="BackgroundRepeat for BackgroundRepeat in BackgroundRepeats" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'bgAttachmentPicker'">
+                                                    <select ng-options="BackgroundAttachment for BackgroundAttachment in BackgroundAttachments" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'layoutPicker'">
+                                                    <select ng-options="Layout for Layout in Layouts" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div class="box-slider" ng-if="field.type == 'slider'">
+                                                    <div ui-slider min="{{field.min}}" max="{{field.max}}" step="1" ng-model="field.value"></div>
+                                                    <span class="slider-span">px</span><input class="slider-input" ng-model="field.value">
+                                                </div>
+
+                                                <div ng-if="field.type == 'checkbox'">
+                                                    <input type="checkbox" ng-checked="field.value == 'true'" ng-model="field.value">
+                                                </div>
+
+                                                <div ng-if="field.type == 'displayPicker'">
+                                                    <select ng-options="display for display in displays" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'optionHomePicker'">
+                                                    <select ng-options="optionHome for optionHome in optionHomes" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'fontFamilyPicker'">
+                                                    <div class="fontFamilyPickerPreview" ng-click="openFontFamilyPickerModal(field)" style="font-family:{{ field.value }}">
+                                                        <span>Aa</span>
+                                                        {{ field.value }}
+                                                    </div>
+                                                    <i ng-if="field.value != ''" ng-click="removeField(field)" class="fa fa-times colorPickerDelete"></i>
+                                                </div>
+
+                                            </div>
                                         </div>
 
                                     </accordion-group>
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js b/src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
index 6f2f43eb1e..3a9d28b6dc 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/tuning/tuning.controller.js
@@ -47,17 +47,34 @@ angular.module("umbraco.tuning", ['ui.bootstrap', 'spectrumcolorpicker', 'ui.sli
                                 try {
 
                                     // value
-                                    field.value = eval("data." + field.alias.replace("@", ""));
-                                    if (field.value == "''") { field.value = ""; }
+                                    var newValue = eval("data." + field.alias.replace("@", ""));
+                                    if (newValue) {
+                                        field.value = newValue;
+                                        if (field.value == "''") { field.value = ""; }
+                                    }
 
                                     // special init for font family picker
                                     if (field.type == "fontFamilyPicker") {
-                                        field.fontWeight = eval("data." + field.alias.replace("@", "") + "_weight");
-                                        field.fontStyle = eval("data." + field.alias.replace("@", "") + "_style");
-                                        field.fontType = eval("data." + field.alias.replace("@", "") + "_type");
-                                        if (field.fontWeight == "''") { field.fontWeight = ""; }
-                                        if (field.fontStyle == "''") { field.fontStyle = ""; }
-                                        if (field.fontType == "''") { field.fontType = ""; }
+
+                                        var fontWeight = eval("data." + field.alias.replace("@", "") + "_weight");
+                                        var fontStyle = eval("data." + field.alias.replace("@", "") + "_style");
+                                        var fontType = eval("data." + field.alias.replace("@", "") + "_type");
+
+                                        if (fontWeight) {
+                                            field.fontWeight = eval("data." + field.alias.replace("@", "") + "_weight");
+                                            if (field.fontWeight == "''") { field.fontWeight = ""; }
+                                        }
+
+                                        if (fontWeight) {
+                                            field.fontStyle = eval("data." + field.alias.replace("@", "") + "_style");
+                                            if (field.fontStyle == "''") { field.fontStyle = ""; }
+                                        }
+
+                                        if (fontWeight) {
+                                            field.fontType = eval("data." + field.alias.replace("@", "") + "_type");
+                                            if (field.fontType == "''") { field.fontType = ""; }
+                                        }
+
                                     }
 
                                 }
@@ -165,19 +182,42 @@ angular.module("umbraco.tuning", ['ui.bootstrap', 'spectrumcolorpicker', 'ui.sli
                 $.each(section.subSections, function (indexSubSection, subSection) {
                     $.each(subSection.fields, function (indexField, field) {
 
+                        try {
 
-                        // value
-                        field.value = eval("data." + field.alias.replace("@", ""));
-                        if (field.value == "''") { field.value = ""; }
+                            // value
+                            var newValue = eval("data." + field.alias.replace("@", ""));
+                            if (newValue) {
+                                field.value = newValue;
+                                if (field.value == "''") { field.value = ""; }
+                            }
 
-                        // special init for font family picker
-                        if (field.type == "fontFamilyPicker") {
-                            field.fontWeight = eval("data." + field.alias.replace("@", "") + "_weight");
-                            field.fontStyle = eval("data." + field.alias.replace("@", "") + "_style");
-                            field.fontType = eval("data." + field.alias.replace("@", "") + "_type");
-                            if (field.fontWeight == "''") { field.fontWeight = ""; }
-                            if (field.fontStyle == "''") { field.fontStyle = ""; }
-                            if (field.fontType == "''") { field.fontType = ""; }
+                            // special init for font family picker
+                            if (field.type == "fontFamilyPicker") {
+
+                                var fontWeight = eval("data." + field.alias.replace("@", "") + "_weight");
+                                var fontStyle = eval("data." + field.alias.replace("@", "") + "_style");
+                                var fontType = eval("data." + field.alias.replace("@", "") + "_type");
+
+                                if (fontWeight) {
+                                    field.fontWeight = eval("data." + field.alias.replace("@", "") + "_weight");
+                                    if (field.fontWeight == "''") { field.fontWeight = ""; }
+                                }
+
+                                if (fontWeight) {
+                                    field.fontStyle = eval("data." + field.alias.replace("@", "") + "_style");
+                                    if (field.fontStyle == "''") { field.fontStyle = ""; }
+                                }
+
+                                if (fontWeight) {
+                                    field.fontType = eval("data." + field.alias.replace("@", "") + "_type");
+                                    if (field.fontType == "''") { field.fontType = ""; }
+                                }
+
+                            }
+
+                        }
+                        catch (err) {
+                            console.info("Style parameter not found " + field.alias);
                         }
 
                     })
@@ -424,7 +464,7 @@ angular.module("umbraco.tuning", ['ui.bootstrap', 'spectrumcolorpicker', 'ui.sli
     $timeout(function () {
         // toggle panel
         $scope.frameLoaded = true;
-        $timeout(function () { 1000, $scope.togglePanel(); });
+        //$timeout(function () { 1000, $scope.togglePanel(); });
     }, 1000);
 
 })
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/tuning.defaultStyle.less b/src/Umbraco.Web.UI.Client/src/tuning/tuning.defaultStyle.less
index 253ee9950d..a24c8810ff 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/tuning.defaultStyle.less
+++ b/src/Umbraco.Web.UI.Client/src/tuning/tuning.defaultStyle.less
@@ -62,13 +62,13 @@
 @stylingNavItemBottomBorderActiveSize:0;
 @stylingNavItemTopBorderActiveColor:rgb(230, 126, 34);
 @stylingNavItemBottomBorderActiveColor:rgb(230, 126, 34);
-@stySocialDisplay:block-right;
-@stySocialBackgroundColor:rgba(255, 255, 255, 0.08);
-@stySocialTopMargin:0;
-@stySocialBorderTopSize:0;
-@stySocialBorderBottomSize:0;
-@stySocialBorderTopColor:rgb(230, 126, 34);
-@stySocialBorderBottomColor:rgb(230, 126, 34);
+@styPreHeaderDisplay:block-right;
+@styPreHeaderBackgroundColor:rgba(255, 255, 255, 0.08);
+@styPreHeaderTopMargin:0;
+@styPreHeaderBorderTopSize:0;
+@styPreHeaderBorderBottomSize:0;
+@styPreHeaderBorderTopColor:rgb(230, 126, 34);
+@styPreHeaderBorderBottomColor:rgb(230, 126, 34);
 @stylingBoxesBackgroundColor:'';
 @stylingBoxesMinHeight:0;
 @stylingBoxesRadius:0;
@@ -94,14 +94,14 @@
 @FontNavFamily_weight:300;
 @FontNavFamily_style:'';
 @FontNavFamily_type:google;
-@FontSocialFontColor:rgba(255, 255, 255, 0.6);
-@FontSocialFontColorHover:rgb(255, 255, 255);
-@FontSocialFontSize:12;
-@FontSocialLineHeight:34;
-@FontSocialFamily:Arial, Helvetica;
-@FontSocialFamily_weight:normal;
-@FontSocialFamily_style:normal;
-@FontSocialFamily_type:safe;
+@FontPreHeaderFontColor:rgba(255, 255, 255, 0.6);
+@FontPreHeaderFontColorHover:rgb(255, 255, 255);
+@FontPreHeaderFontSize:12;
+@FontPreHeaderLineHeight:34;
+@FontPreHeaderFamily:Arial, Helvetica;
+@FontPreHeaderFamily_weight:normal;
+@FontPreHeaderFamily_style:normal;
+@FontPreHeaderFamily_type:safe;
 @FontH1Color:rgb(230, 126, 34);
 @FontH1Size:24;
 @FontH1LineHeight:26;
@@ -156,30 +156,39 @@
 @FontH6Family_weight:300;
 @FontH6Family_style:'';
 @FontH6Family_type:google;
-@FontMediumColor:'';
-@FontMediumSize:18;
-@FontMediumLineHeight:24;
-@FontMediumTopMargin:5;
-@FontMediumBottomMargin:10;
-@FontMediumFamily:Open Sans;
-@FontMediumFamily_weight:300;
-@FontMediumFamily_style:'';
-@FontMediumFamily_type:google;
+@FontSmallColor:'';
+@FontSmallSize:18;
+@FontSmallLineHeight:24;
+@FontSmallTopMargin:5;
+@FontSmallBottomMargin:10;
+@FontSmallFamily:Open Sans;
+@FontSmallFamily_weight:300;
+@FontSmallFamily_style:'';
+@FontSmallFamily_type:google;
+@FontBlockquoteColor:'';
+@FontBlockquoteSize:18;
+@FontBlockquoteLineHeight:24;
+@FontBlockquoteTopMargin:5;
+@FontBlockquoteBottomMargin:10;
+@FontBlockquoteFamily:Open Sans;
+@FontBlockquoteFamily_weight:300;
+@FontBlockquoteFamily_style:'';
+@FontBlockquoteFamily_type:google;
 @FontHighlightedColor:'';
 @FontHighlightedBackgroundColor:rgb(230, 126, 34);
 @FontHighlightedFamily:Open Sans;
 @FontHighlightedFamily_weight:300;
 @FontHighlightedFamily_style:'';
 @FontHighlightedFamily_type:google;
-@FontBigColor:rgb(230, 126, 34);
-@FontBigSize:26;
-@FontBigLineHeight:28;
-@FontBigTopMargin:5;
-@FontBigBottomMargin:15;
-@FontBigFamily:Open Sans;
-@FontBigFamily_weight:300;
-@FontBigFamily_style:'';
-@FontBigFamily_type:google;
+@FontLeadColor:rgb(230, 126, 34);
+@FontLeadSize:26;
+@FontLeadLineHeight:28;
+@FontLeadTopMargin:5;
+@FontLeadBottomMargin:15;
+@FontLeadFamily:Open Sans;
+@FontLeadFamily_weight:300;
+@FontLeadFamily_style:'';
+@FontLeadFamily_type:google;
 @FontButtonColor:rgba(255, 255, 255, 0.92);
 @FontButtonBackgroundColor:rgb(230, 126, 34);
 @FontButtonColorHover:rgba(255, 255, 255, 0.55);
@@ -191,51 +200,46 @@
 @FontButtonFamily_weight:300;
 @FontButtonFamily_style:'';
 @FontButtonFamily_type:google;
-@FontColor2Color:rgb(230, 126, 34);
-@FontColor3Color:rgba(253, 251, 251, 0.91);
-@FontColor4Color:rgb(170, 170, 170);
 @FontLinkColor:rgb(230, 126, 34);
 @FontLinkColorHover:rgba(230, 126, 34, 0.84);
 /***end-lessParam***/
 /************************************************************************/
 
 /************************************************************************/
-/* Base Style */
+/* Less Base Style */
 /************************************************************************/
 /***start-baseStyle***/
 
+/**********************************************************/
 /* General */
+/**********************************************************/
 
 h1, h2, h3, h4, h5, h6 {
     text-rendering: optimizelegibility;
 }
 
-h1 {
-    font-weight:300;
+.highlighted {
+    padding: 0 4px 2px;
 }
 
-.clear-container .container {
-    padding-right: 0px;
-    padding-left: 0px;
-}
-
-.big, .medium {
-    display:block;
-}
-
-@media (max-width: 767px) {
-    .hidden-phone {
-        display: none !important;
-    }
-}
-
-@media (max-width: 979px) and (min-width: 768px) {
-    .hidden-tablet {
-        display: none !important;
-    }
+.button {
+    border: 0;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    padding: 12px 15px 14px;
+    margin-top: 10px;
+    display: inline-block;
+    margin-bottom: 0;
+    font-size: 14px;
+    text-align: center;
+    vertical-align: middle;
+    cursor: pointer;
 }
 
+/**********************************************************/
 /* Wrapper for wide or boxed view */
+/**********************************************************/
 
 .wrapper {
 
@@ -263,8 +267,13 @@ h1 {
     overflow:hidden;
 }
 
+.wrapper.content {
+    min-height: 40px;
+}
 
+/**********************************************************/
 /* logo */
+/**********************************************************/
 
 .logo {
     max-width:350px;
@@ -281,7 +290,9 @@ h1 {
     max-width:100%
 }
 
+/**********************************************************/
 /* navigation */
+/**********************************************************/
 
 .navbar-default .navbar-nav > li > a.fa,
 .navbar-default .navbar-nav > li > a.fa:focus {
@@ -408,7 +419,9 @@ h1 {
     }
 }
 
+/**********************************************************/
 /* social list */
+/**********************************************************/
 
 .social-bar {
     list-style:none;
@@ -437,7 +450,9 @@ h1 {
     display:none;
 }
 
+/**********************************************************/
 /* nav search */
+/**********************************************************/
 
 #nav-search-form {
     padding: 15px;
@@ -474,50 +489,20 @@ h1 {
     }
 }
 
+/**********************************************************/
 /* usky-grid */
+/**********************************************************/
 
-.usky-grid-cell{
-    margin-top: 30px;
-    margin-bottom: 30px;
-    overflow: hidden;
-}
-
-.usky-grid-row{
-    margin-left: 0px;
-    margin-right: 0px;
-} 
-
-.usky-grid-full-size .usky-grid-row:first-child{
-    margin-top: 0;
-} 
-
-.usky-grid-full-size .usky-grid-row:last-child{
-    margin-bottom: 0;
-} 
-
-.usky-grid-full-size .usky-grid-cell{
-    margin-top: 0px;
-    margin-bottom: 0px;
-}
-
-/*.usky-grid-full-size .usky-grid-row{
-    margin-left: -15px;
-    margin-right: -15px;
-}*/
-
-.usky-grid-skip-top-margin {
-    margin-top: 0px;
-}
-
-.usky-grid-skip-bottom-margin {
-    margin-bottom: 0px;
-}
-
-.usky-grid-column {
-    padding-right: 0px; padding-left: 0px;
+.uSky-grid .container {
+    padding-top: 30px;
+    padding-bottom: 30px;
+    padding-right: 30px;
+    padding-left: 30px;
 }
 
+/**********************************************************/
 /* jumbotron */
+/**********************************************************/
 
 .jumbotron {
     font-size: inherit; 
@@ -532,7 +517,9 @@ h1 {
     padding: 15px;
 }
 
+/**********************************************************/
 /* thumbnail */
+/**********************************************************/
 
 .thumbnail {
     margin-bottom:0px;
@@ -566,7 +553,9 @@ h1 {
     }
 }
 
+/**********************************************************/
 /* Search results list */
+/**********************************************************/
 
 .search-results-list {
     margin:0;
@@ -582,129 +571,6 @@ h1 {
     margin-right: 10px;
 }
 
-/* Blog list */
-
-.post-list img.post-image, .post-detail img.post-image
-    {
-    display: block;
-    height: auto;
-    max-width: 100%;
-    margin-right: auto;
-    margin-left: auto;
-}
-
-.post-list .meta {
-    margin-bottom:10px
-}
-
-.post-list .meta .sep {
-    margin:0 3px 0 3px;
-}
-
-.post-list .meta .fn {
-    margin:0 0 0 3px;
-}
-
-.blog-list-widget {
-    margin:0;
-    padding:0;
-    list-style:none;
-}
-
-.blog-list-widget i {
-    margin-right: 10px;
-}
-
-.post-detail {
-    padding: 0 15px 0 15px;
-}   
-
-.post-detail .meta {
-    margin: 0 0 20px 0;
-}
-
-.blog-nav .fa-angle-double-left {
-    float:left;
-}
-
-.blog-nav .fa-angle-double-right {
-    float:right;
-}
-
-.blog-nav {
-    margin:-15px 0 30px 0 ;
-}
-
-.blog-nav a {
-    font-size:28px;
-}
-
-.blog-nav a:hover {
-    text-decoration:none;
-}
-
-/* TinyStyle */
-
-.highlighted {
-    padding: 0 4px 2px;
-}
-
-.button {
-    border: 0;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    padding: 12px 15px 14px;
-    margin-top: 10px;
-    display: inline-block;
-    margin-bottom: 0;
-    font-size: 14px;
-    text-align: center;
-    vertical-align: middle;
-    cursor: pointer;
-}
-
-/* Copyright */
-
-.copyright {
-    text-align: center;
-}
-
-/* maps */
-
-.google-maps {
-    height: 400px;
-    margin: 0 0 30px;
-}
-
-/* form */
-
-#contact-form .error {
-    border:1px solid red;
-}
-
-#contact-form .success {
-    display:none;
-}
-
-/* go up */
-
-.go-top {
-	position:fixed;
-	bottom:0.5em; right: 0.5em;
-	text-decoration: none;
-	color:white;
-	background-color: rgba(0, 0, 0, 0.3);
-	font-size:30px;
-	padding:0.1em 0.3em 0.1em;
-	display:none;
-	border-radius:3px; z-index:500;
-    transition: all .20s ease-in-out;
-    -moz-transition: all .20s ease-in-out;
-    -webkit-transition: all .20s ease-in-out;
-}
-    
-.go-top:hover { background-color:rgba(0, 0, 0, 0.6);}
 
 /***end-baseStyle***/
 /************************************************************************/
@@ -789,15 +655,29 @@ h6 {
     line-height:@FontH6LineHeight + 0px;
 }
 
-.medium {
-    font-family:@FontMediumFamily,Verdana,Arial,Helvetica,sans-serif;
-    font-weight:@FontMediumFamily_weight;
-    font-style:@FontMediumFamily_style;
-    font-size:@FontMediumSize + 0px;
-    color:@FontMediumColor;
-    margin-top:@FontMediumTopMargin + 0px;
-    margin-bottom:@FontMediumBottomMargin + 0px;
-    line-height:@FontMediumLineHeight + 0px;
+blockquote {
+    padding: 10px @FontBlockquoteLineHeight + 0px;
+    margin: 0 0 @FontBlockquoteLineHeight + 0px;
+    border-left: 5px solid @FontBlockquoteColor;
+    margin-top:@FontBlockquoteTopMargin + 0px;
+    margin-bottom:@FontBlockquoteBottomMargin + 0px;
+    font-family:@FontBlockquoteFamily,Verdana,Arial,Helvetica,sans-serif;
+    font-weight:@FontBlockquoteFamily_weight;
+    font-style:@FontBlockquoteFamily_style;
+    font-size:@FontBlockquoteSize + 0px;
+    color:@FontBlockquoteColor;
+    line-height:@FontBlockquoteLineHeight + 0px;
+}
+
+.Small {
+    font-family:@FontSmallFamily,Verdana,Arial,Helvetica,sans-serif;
+    font-weight:@FontSmallFamily_weight;
+    font-style:@FontSmallFamily_style;
+    font-size:@FontSmallSize + 0px;
+    color:@FontSmallColor;
+    margin-top:@FontSmallTopMargin + 0px;
+    margin-bottom:@FontSmallBottomMargin + 0px;
+    line-height:@FontSmallLineHeight + 0px;
 }
 
 .highlighted {
@@ -808,15 +688,15 @@ h6 {
     background-color:@FontHighlightedBackgroundColor;
 }
 
-.big {
-    font-family:@FontBigFamily,Verdana,Arial,Helvetica,sans-serif;
-    font-weight:@FontBigFamily_weight;
-    font-style:@FontBigFamily_style;
-    font-size:@FontBigSize + 0px;
-    color:@FontBigColor;
-    margin-top:@FontBigTopMargin + 0px;
-    margin-bottom:@FontBigBottomMargin + 0px;
-    line-height:@FontBigLineHeight + 0px;
+.lead {
+    font-family:@FontLeadFamily,Verdana,Arial,Helvetica,sans-serif;
+    font-weight:@FontLeadFamily_weight;
+    font-style:@FontLeadFamily_style;
+    font-size:@FontLeadSize + 0px;
+    color:@FontLeadColor;
+    margin-top:@FontLeadTopMargin + 0px;
+    margin-bottom:@FontLeadBottomMargin + 0px;
+    line-height:@FontLeadLineHeight + 0px;
 }
 
 .button {
@@ -835,18 +715,6 @@ h6 {
     background-color:@FontButtonBackgroundColorHover;
 }
 
-.color2 {
-    color:@FontColor2Color;
-}
-
-.color3 {
-    color:@FontColor3Color;
-}
-
-.color4 {
-    color:@FontColor4Color;
-}
-
 .navbar-default .navbar-nav > li > a,
 .navbar-default .navbar-nav > li > a:focus,
 .navbar-default .navbar-nav .open .dropdown-menu > li > a,
@@ -1091,71 +959,71 @@ body {
     .wrapper { .wide-wrapper-1200 }
 }
 
-/* SOCIAL */
+/*  */
 
-.social-row-none () when (@stySocialDisplay = none) {
+.preHeader-row-none () when (@styPreHeaderDisplay = none) {
     display:none;
 }
 
-.social-bar-block-left () when (@stySocialDisplay = block-left) {
+.social-bar-block-left () when (@styPreHeaderDisplay = block-left) {
     float: left;
 }
 
-.social-bar-block-right () when (@stySocialDisplay = block-right) {
+.social-bar-block-right () when (@styPreHeaderDisplay = block-right) {
     float: right;
 }
 
-.social-bar-block-left-text () when (@stySocialDisplay = block-left) {
+.social-bar-block-left-text () when (@styPreHeaderDisplay = block-left) {
     text-align: left;
 }
 
-.social-bar-block-right-text () when (@stySocialDisplay = block-right) {
+.social-bar-block-right-text () when (@styPreHeaderDisplay = block-right) {
     text-align: right;
 }
 
-.social-bar-block-left-rev () when (@stySocialDisplay = block-left) {
+.social-bar-block-left-rev () when (@styPreHeaderDisplay = block-left) {
     float: right;
 }
 
-.social-bar-block-right-rev () when (@stySocialDisplay = block-right) {
+.social-bar-block-right-rev () when (@styPreHeaderDisplay = block-right) {
     float: left;
 }
 
-.social-bar-float-left () when (@stySocialDisplay = float-left) {
-    border-top: @stySocialBorderTopSize + 0px solid @stySocialBorderTopColor;
-    border-bottom: @stySocialBorderBottomSize + 0px solid @stySocialBorderBottomColor;
+.social-bar-float-left () when (@styPreHeaderDisplay = float-left) {
+    border-top: @styPreHeaderBorderTopSize + 0px solid @styPreHeaderBorderTopColor;
+    border-bottom: @styPreHeaderBorderBottomSize + 0px solid @styPreHeaderBorderBottomColor;
     float: left;
 }
 
-.social-bar-float-right () when (@stySocialDisplay = float-right) {
-    border-top: @stySocialBorderTopSize + 0px solid @stySocialBorderTopColor;
-    border-bottom: @stySocialBorderBottomSize + 0px solid @stySocialBorderBottomColor;
+.social-bar-float-right () when (@styPreHeaderDisplay = float-right) {
+    border-top: @styPreHeaderBorderTopSize + 0px solid @styPreHeaderBorderTopColor;
+    border-bottom: @styPreHeaderBorderBottomSize + 0px solid @styPreHeaderBorderBottomColor;
     text-align: right;
 }
 
-.social-bar-float-left-text () when (@stySocialDisplay = float-left) {
+.social-bar-float-left-text () when (@styPreHeaderDisplay = float-left) {
     text-align: left;
 }
 
-.social-bar-float-right-text () when (@stySocialDisplay = float-right) {
+.social-bar-float-right-text () when (@styPreHeaderDisplay = float-right) {
     float: right;
 }
 
-.social-row-float-left () when (@stySocialDisplay = float-left) {
+.preHeader-row-float-left () when (@styPreHeaderDisplay = float-left) {
     background: none;
     border: none;
 }
 
-.social-row-float-right () when (@stySocialDisplay = float-right) {
+.preHeader-row-float-right () when (@styPreHeaderDisplay = float-right) {
     background: none;
     border: none;
 }
 
-.social-row {
-    .social-row-none;
-    background-color: @stySocialBackgroundColor;
-    border-top: @stySocialBorderTopSize + 0px solid @stySocialBorderTopColor;
-    border-bottom: @stySocialBorderBottomSize + 0px solid @stySocialBorderBottomColor;
+.preHeader-row {
+    .preHeader-row-none;
+    background-color: @styPreHeaderBackgroundColor;
+    border-top: @styPreHeaderBorderTopSize + 0px solid @styPreHeaderBorderTopColor;
+    border-bottom: @styPreHeaderBorderBottomSize + 0px solid @styPreHeaderBorderBottomColor;
 }
 
 .social-bar {
@@ -1164,40 +1032,40 @@ body {
 }
 
 .contact-text{
-    color: @FontSocialFontColor;
-    font-size: @FontSocialFontSize + 0px;
-    line-height: @FontSocialLineHeight + 0px;
+    color: @FontPreHeaderFontColor;
+    font-size: @FontPreHeaderFontSize + 0px;
+    line-height: @FontPreHeaderLineHeight + 0px;
     .social-bar-block-left-rev;
     .social-bar-block-right-rev;
-    font-family:@FontSocialFamily;
-    font-weight:@FontSocialFamily_weight;
-    font-style:@FontSocialFamily_style;
+    font-family:@FontPreHeaderFamily;
+    font-weight:@FontPreHeaderFamily_weight;
+    font-style:@FontPreHeaderFamily_style;
 }
 
 .social-bar li a {
-    color: @FontSocialFontColor;
-    font-size: @FontSocialFontSize + 0px;
-    line-height: @FontSocialLineHeight + 0px;
+    color: @FontPreHeaderFontColor;
+    font-size: @FontPreHeaderFontSize + 0px;
+    line-height: @FontPreHeaderLineHeight + 0px;
 }
 
 .social-bar li a:hover {
-    color: @FontSocialFontColorHover;
+    color: @FontPreHeaderFontColorHover;
 }
 
 @media (min-width: 768px) {
 
-    .social-row {
-        .social-row-float-left;
-        .social-row-float-right;
+    .preHeader-row {
+        .preHeader-row-float-left;
+        .preHeader-row-float-right;
     }
 
-    .social-container {
+    .preHeader-container {
         .social-bar-float-left;
         .social-bar-float-right;
         .social-bar-float-left-text;
         .social-bar-float-right-text;
-        background-color: @stySocialBackgroundColor;
-        margin-top:@stySocialTopMargin + 0px;
+        background-color: @styPreHeaderBackgroundColor;
+        margin-top:@styPreHeaderTopMargin + 0px;
     }
 
 }
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/tuning.front.js b/src/Umbraco.Web.UI.Client/src/tuning/tuning.front.js
index 039b464a71..bc42a44b39 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/tuning.front.js
+++ b/src/Umbraco.Web.UI.Client/src/tuning/tuning.front.js
@@ -84,7 +84,7 @@ var initIntelTuning = function (tuningModel) {
             $.each(category.sections, function (key, section) {
                 $.each(section.subSections, function (key, subSection) {
                     if (subSection.schema) {
-                        $(subSection.schema).attr("tuning-over", subSection.schema);
+                        $(subSection.schema).attr("tuning-over", subSection.name);
                     }
                 });
             });
@@ -124,18 +124,18 @@ var initIntelTuning = function (tuningModel) {
 
 var outlinePosition = function (target) {
 
-    if (target.length > 0) {
+    if (target.length > 0 && target.attr('tuning-over') != undefined && target.attr('tuning-over') != '') {
 
         var localname = target[0].localName;
-        var height = $(target).height();
-        var width = $(target).width();
+        var height = $(target).outerHeight();
+        var width = $(target).outerWidth();
         var position = $(target).offset();
         var posY = position.top - $(window).scrollTop();
         var posX = position.left - $(window).scrollLeft();
 
         console.info("element select " + localname);
 
-        $("#outline-data").html(localname);
+        $("#outline-data").html(target.attr('tuning-over'));
         $("#outline-data").css('position', 'fixed');
         $("#outline-data").css('top', posY);
         $("#outline-data").css('left', posX);
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/tuning.global.js b/src/Umbraco.Web.UI.Client/src/tuning/tuning.global.js
index e9d9e36b8a..a2fb8ce542 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/tuning.global.js
+++ b/src/Umbraco.Web.UI.Client/src/tuning/tuning.global.js
@@ -4,18 +4,18 @@
 /*********************************************************************************************************/
 
 /* Called for every tuning-over rollover */
-var refrechIntelTuning = function (schema) {
+var refrechIntelTuning = function (name) {
 
     var scope = angular.element($("#tuningPanel")).scope();
 
-    if (scope.schemaFocus != schema.toLowerCase()) {
+    if (scope.schemaFocus != name.toLowerCase()) {
 
         var notFound = true;
         angular.forEach(scope.tuningModel.categories, function (category, key) {
             var isContainer = false;
             angular.forEach(category.sections, function (section, key) {
                 angular.forEach(section.subSections, function (subSection, key) {
-                    if (subSection.schema && schema.toLowerCase() == subSection.schema.toLowerCase()) {
+                    if (subSection.name && name.toLowerCase() == subSection.name.toLowerCase()) {
                         isContainer = true;
                         notFound = false
                     }
@@ -35,7 +35,7 @@ var refrechIntelTuning = function (schema) {
             scope.schemaFocus = "body";
         }
         else {
-            scope.schemaFocus = schema.toLowerCase();
+            scope.schemaFocus = name.toLowerCase();
         }
 
         scope.$apply();
diff --git a/src/Umbraco.Web.UI.Client/src/tuning/tuning.gridRowStyle.less b/src/Umbraco.Web.UI.Client/src/tuning/tuning.gridRowStyle.less
index 98ae71c752..0cef3904b2 100644
--- a/src/Umbraco.Web.UI.Client/src/tuning/tuning.gridRowStyle.less
+++ b/src/Umbraco.Web.UI.Client/src/tuning/tuning.gridRowStyle.less
@@ -23,14 +23,11 @@ background-size: cover;
 } 
 
 .Row-full-size__-ID- () when (@rowFullSize__-ID- = true) {
-    width:100% !important;
-    padding-right: 0px !important;
-    padding-left: 0px !important;
-}
-
-.Row-full-size-cell__-ID- () when (@rowFullSize__-ID- = true) {
-    margin-top: 0px;
-    margin-bottom: 0px
+    width:100%;
+    padding-right: 0px;
+    padding-left: 0px;
+    padding-top: 0px;
+    padding-bottom: 0px
 }
 
 .-ID- { 
@@ -50,10 +47,6 @@ background-attachment: @backgroundRowAttachment__-ID-;
 .-ID- .container {
     .Row-full-size__-ID-;
 }
- 
-.-ID- .container .usky-grid-cell {
-    .Row-full-size-cell__-ID-;
-}
 
 /***end-gridStyle--ID-***/ 
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js
index c284220b0d..7c18b2d8e6 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.default.config.js
@@ -63,6 +63,24 @@ var uSkyGridConfig = [
      allowed: ["headline"]
  }
  ]
+},
+{
+    name: "Three columns",
+    models: [{
+        grid: 4,
+        percentage: 33.3,
+        allowed: ["rte"]
+    },
+    {
+         grid: 4,
+         percentage: 33.3,
+         allowed: ["rte"]
+    },
+    {
+        grid: 4,
+        percentage: 33.3,
+        allowed: ["rte"]
+    }]
 }
 ]
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.editors.config.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.editors.config.js
index 82e318ee87..deb0c1ec96 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.editors.config.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/config/grid.editors.config.js
@@ -6,7 +6,7 @@
 		"icon": "icon-coin",
 		"config": {
 			"style": "font-size: 36px; font-weight: bold",
-			"markup" : "<h1 style='#style#'>#value#</h1>"
+			"markup" : "<h1>#value#</h1>"
 		}
 	},
 	{
@@ -15,7 +15,8 @@
 		"view": "textstring",
 		"icon": "icon-quote",
 		"config": {
-			"style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px"
+		    "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px",
+		    "markup": "<blockquote>#value#</blockquote>"
 		}
 	},
 	{
diff --git a/src/Umbraco.Web.UI/Umbraco/preview/index.html b/src/Umbraco.Web.UI/Umbraco/preview/index.html
index 889fc0dfea..86716a2efb 100644
--- a/src/Umbraco.Web.UI/Umbraco/preview/index.html
+++ b/src/Umbraco.Web.UI/Umbraco/preview/index.html
@@ -70,7 +70,7 @@
 
                                     <accordion-group ng-repeat="subSection in section.subSections"
                                                      ng-class="{true:'selected', false:''}[isOpen]"
-                                                     is-open="(schemaFocus != '' && schemaFocus == subSection.schema.toLowerCase())">
+                                                     is-open="(schemaFocus != '' && schemaFocus == subSection.name.toLowerCase())">
 
                                         <accordion-heading>
                                             <span ng-click="accordionOpened(subSection.name)" ng-mouseover="accordionWillBeOpened(subSection.schema)">
@@ -78,63 +78,65 @@
                                             </span>
                                         </accordion-heading>
 
-                                        <div class="div-field" ng-repeat="field in subSection.fields">
+                                        <div ng-mouseover="accordionWillBeOpened(subSection.schema)">
+                                            <div class="div-field" ng-repeat="field in subSection.fields">
 
-                                            <span class="field-title">{{field.name}}:</span>
+                                                <span class="field-title">{{field.name}}:</span>
 
-                                            <div ng-if="field.type == 'colorPicker'">
-                                                <spectrum colorselected="field.value"></spectrum>
-                                                <i ng-if="field.value != ''" ng-click="removeField(field)" class="icon icon-delete colorPickerDelete"></i>
-                                            </div>
-
-                                            <div ng-if="field.type == 'bgImagePicker'" class="imagePickerPreviewContainer">
-                                                <div class="imagePickerPreview" ng-click="open(field)" style="background-image:{{ field.value }}">
-                                                    <i class="icon icon-add"></i>
+                                                <div ng-if="field.type == 'colorPicker'">
+                                                    <spectrum colorselected="field.value"></spectrum>
+                                                    <i ng-if="field.value != ''" ng-click="removeField(field)" class="icon icon-delete colorPickerDelete"></i>
                                                 </div>
-                                                <i ng-if="field.value != ''" ng-click="removeField(field)" class="icon icon-delete colorPickerDelete"></i>
-                                            </div>
 
-                                            <div ng-if="field.type == 'bgPositionPicker'">
-                                                <select ng-options="BackgroundPosition for BackgroundPosition in BackgroundPositions" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'bgRepeatPicker'">
-                                                <select ng-options="BackgroundRepeat for BackgroundRepeat in BackgroundRepeats" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'bgAttachmentPicker'">
-                                                <select ng-options="BackgroundAttachment for BackgroundAttachment in BackgroundAttachments" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'layoutPicker'">
-                                                <select ng-options="Layout for Layout in Layouts" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div class="box-slider" ng-if="field.type == 'slider'">
-                                                <div ui-slider min="{{field.min}}" max="{{field.max}}" step="1" ng-model="field.value"></div>
-                                                <span class="slider-span">px</span><input class="slider-input" ng-model="field.value">
-                                            </div>
-
-                                            <div ng-if="field.type == 'checkbox'">
-                                                <input type="checkbox" ng-checked="field.value == 'true'" ng-model="field.value">
-                                            </div>
-
-                                            <div ng-if="field.type == 'displayPicker'">
-                                                <select ng-options="display for display in displays" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'optionHomePicker'">
-                                                <select ng-options="optionHome for optionHome in optionHomes" ng-model="field.value"></select>
-                                            </div>
-
-                                            <div ng-if="field.type == 'fontFamilyPicker'">
-                                                <div class="fontFamilyPickerPreview" ng-click="openFontFamilyPickerModal(field)" style="font-family:{{ field.value }}">
-                                                    <span>Aa</span>
-                                                    {{ field.value }}
+                                                <div ng-if="field.type == 'bgImagePicker'" class="imagePickerPreviewContainer">
+                                                    <div class="imagePickerPreview" ng-click="open(field)" style="background-image:{{ field.value }}">
+                                                        <i class="icon icon-add"></i>
+                                                    </div>
+                                                    <i ng-if="field.value != ''" ng-click="removeField(field)" class="icon icon-delete colorPickerDelete"></i>
                                                 </div>
-                                                <i ng-if="field.value != ''" ng-click="removeField(field)" class="fa fa-times colorPickerDelete"></i>
-                                            </div>
 
+                                                <div ng-if="field.type == 'bgPositionPicker'">
+                                                    <select ng-options="BackgroundPosition for BackgroundPosition in BackgroundPositions" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'bgRepeatPicker'">
+                                                    <select ng-options="BackgroundRepeat for BackgroundRepeat in BackgroundRepeats" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'bgAttachmentPicker'">
+                                                    <select ng-options="BackgroundAttachment for BackgroundAttachment in BackgroundAttachments" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'layoutPicker'">
+                                                    <select ng-options="Layout for Layout in Layouts" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div class="box-slider" ng-if="field.type == 'slider'">
+                                                    <div ui-slider min="{{field.min}}" max="{{field.max}}" step="1" ng-model="field.value"></div>
+                                                    <span class="slider-span">px</span><input class="slider-input" ng-model="field.value">
+                                                </div>
+
+                                                <div ng-if="field.type == 'checkbox'">
+                                                    <input type="checkbox" ng-checked="field.value == 'true'" ng-model="field.value">
+                                                </div>
+
+                                                <div ng-if="field.type == 'displayPicker'">
+                                                    <select ng-options="display for display in displays" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'optionHomePicker'">
+                                                    <select ng-options="optionHome for optionHome in optionHomes" ng-model="field.value"></select>
+                                                </div>
+
+                                                <div ng-if="field.type == 'fontFamilyPicker'">
+                                                    <div class="fontFamilyPickerPreview" ng-click="openFontFamilyPickerModal(field)" style="font-family:{{ field.value }}">
+                                                        <span>Aa</span>
+                                                        {{ field.value }}
+                                                    </div>
+                                                    <i ng-if="field.value != ''" ng-click="removeField(field)" class="fa fa-times colorPickerDelete"></i>
+                                                </div>
+
+                                            </div>
                                         </div>
 
                                     </accordion-group>
diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
index 2e17f2bcee..a44f1a973f 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/bootstrap3.cshtml
@@ -6,94 +6,93 @@
 {
     var onlyOneColumn = Model.columns != null ? ((System.Collections.ICollection)Model.columns).Count : 0;
     
-    <div class="@(onlyOneColumn > 1 ? "container" : "")">
+    <div class="uSky-grid @(onlyOneColumn > 1 ? "container" : "")">
         <div class="row clearfix">
             @foreach (var column in Model.columns)
             {
-                <div class="col-md-@column.grid column usky-grid-column">
+                <div class="col-md-@column.grid column">
                     @foreach (var row in column.rows)
                     {
                         <div class="gridrow_@row.uniqueId" >
                             <div class="container">
-                                <div class="row clearfix usky-grid-row">
+                                <div class="row clearfix">
 
                                     @foreach (var cell in row.cells)
                                     {
                                         <div class="col-md-@cell.model.grid column">
-                                            <div class="usky-grid-cell">
 
-                                                @foreach (var control in cell.controls)
+                                            @foreach (var control in cell.controls)
+                                            {
+                                                if (control != null && control.editor != null && control.editor.view != null)
                                                 {
-                                                    if (control != null && control.editor != null && control.editor.view != null)
+
+                                                    string editor = control.editor.view.ToString();
+
+                                                    switch (editor)
                                                     {
+                                                        case "rte":
+                                                            <text>
+                                                                @Html.Raw(TemplateUtilities.ParseInternalLinks(control.value.ToString()))
+                                                            </text>
+                                                            break;
+                                                        case "macro":
 
-                                                        string editor = control.editor.view.ToString();
+                                                            string macroAlias = control.value.macroAlias.ToString();
+                                                            ViewDataDictionary parameters = new ViewDataDictionary();
+                                                            foreach (dynamic mpd in control.value.marcoParamsDictionary)
+                                                            {
+                                                                parameters.Add(mpd.Name, mpd.Value);
+                                                            }
 
-                                                        switch (editor)
-                                                        {
-                                                            case "rte":
-                                                                <text>
-                                                                    @Html.Raw(TemplateUtilities.ParseInternalLinks(control.value.ToString()))
-                                                                </text>
-                                                                break;
-                                                            case "macro":
+                                                            <text>
+                                                                @Umbraco.RenderMacro(macroAlias, parameters)
+                                                            </text>
+                                                            break;
+                                                        case "textstring":
 
-                                                                string macroAlias = control.value.macroAlias.ToString();
-                                                                ViewDataDictionary parameters = new ViewDataDictionary();
-                                                                foreach (dynamic mpd in control.value.marcoParamsDictionary)
-                                                                {
-                                                                    parameters.Add(mpd.Name, mpd.Value);
-                                                                }
+                                                            if (control.editor.config.markup != null)
+                                                            {
+                                                                string markup = control.editor.config.markup.ToString();
+
+                                                                markup = markup.Replace("#value#", control.value.ToString());
+                                                                markup = markup.Replace("#style#", control.editor.config.style.ToString());
 
                                                                 <text>
-                                                                    @Umbraco.RenderMacro(macroAlias, parameters)
+                                                                    @Html.Raw(markup)
                                                                 </text>
-                                                                break;
-                                                            case "textstring":
-
-                                                                if (control.editor.config.markup != null)
-                                                                {
-                                                                    string markup = control.editor.config.markup.ToString();
-
-                                                                    markup = markup.Replace("#value#", control.value.ToString());
-                                                                    markup = markup.Replace("#style#", control.editor.config.style.ToString());
-
-                                                                    <text>
-                                                                        @Html.Raw(markup)
-                                                                    </text>
-                                                                }
-                                                                else
-                                                                {
-                                                                    <text>
-                                                                        <div style="@control.editor.config.style">@control.value</div>
-                                                                    </text>
-                                                                }
-
-                                                                break;
-                                                            case "media":
-                                                            <text>
-                                                                <div class="thumbnail">
-                                                                    <img src="@control.value.image">
-                                                                </div>
-                                                                @if (control.value.caption != null)
-                                                                {
-                                                                    <p class="caption">@control.value.caption</p>
-                                                                }
-                                                            </text>
-                                                                break;
-                                                            case "embed":
-                                                            <text>
-                                                                @Html.Raw(control.value)
-                                                            </text>
-                                                                break;
-                                                            default:
-                                                                break;
-                                                        }
+                                                            }
+                                                            else
+                                                            {
+                                                                <text>
+                                                                    <div style="@control.editor.config.style">@control.value</div>
+                                                                </text>
+                                                            }
 
+                                                            break;
+                                                        case "media":
+                                                        <text>
+                                                            <div class="thumbnail">
+                                                                <img src="@control.value.image">
+                                                            </div>
+                                                            @if (control.value.caption != null)
+                                                            {
+                                                                <p class="caption">@control.value.caption</p>
+                                                            }
+                                                        </text>
+                                                            break;
+                                                        case "embed":
+                                                        <text>
+                                                            @Html.Raw(control.value)
+                                                        </text>
+                                                            break;
+                                                        default:
+                                                            break;
                                                     }
 
                                                 }
-                                            </div>
+
+                                            }
+                                            
                                         </div>
                                     }
                                 </div>