More updates

src/scss/scaffolding.scss

@@ -12,12 +12,11 @@ $tooltip-dark-allow: false;
 
 @use 'sass:math';
 
-@import "core";
 
 // We recommend explicitly using the underscore when referring to pattern scss 
 // as you may have also created a version that compiles to css to display in 
 // your pattern. 
-@import "color-samples";
+@import "core";
 
 @import "../pg/patterns/components/sticky-note-core/_sticky-note";
 @import "../pg/patterns/components/tooltip-core/_tooltip";
@@ -27,8 +26,6 @@ $tooltip-dark-allow: false;
 @import "../pg/patterns/layouts/header-core/_header";
 @import "../pg/patterns/layouts/tabs-core/_tabs"; 
 
-
-
 @import "../pg/patterns/status-core/_status";
 
 * {
@@ -43,10 +40,11 @@ html {
 	}
 }
 
-@include status;
-@include color-samples;
+@include core-colour-samples;
+
 @include tooltip;
 @include sticky-note;
+@include status;
 
 body {
 	margin: 0;
@@ -56,10 +54,8 @@ body {
 		left: -9999px;
 	}
 
-
 	.container {
 
-
 		display: grid;
 		grid-template-columns: auto repeat(2, 22rem) auto;
 		margin: 0 auto;
@@ -67,20 +63,21 @@ body {
 
 		@include header;
 
-
 		nav {
-			background-color: var(--color-blue);
+			background-color: var(--colour-blue);
 			grid-column: 2 / 4;
 			display: none;
+
 			ul {
 				margin: 1rem 0;
+
 				li {
 					display: inline-block;
 					margin-right: 1rem;
 				}
 			}
 			a {
-				color: white;
+				color: var(--colour-white);
 				text-decoration: none;
 			}
 			@include break(md-) {
@@ -90,32 +87,22 @@ body {
 
 
 		p.deprecated-switch {
-			grid-row: 3;
-			// @include break(-md) {
-			// 	grid-row: 2;
-			// 	grid-column: 2 / 4;
-			// }
 			grid-column: 2 / 4;
+			grid-row: 3;
 			text-align: right;
-			// align-items: center;
-			// display: grid;
-			// grid-gap: .5rem;
-			// grid-template-columns: auto max-content max-content;
-			// grid-area: dp;
-			// margin: 1rem .25rem;
 			@include switch;
 
 		}
 		main {
+			display: block;
+			grid-column: 1 / -1;
 			grid-row: 4;
+			padding: 0 1rem;
+
 			@include break(-md) {
 				grid-row: 3;
 				padding: 0;
 			}
-			display: block;
-			padding: 0 1rem;
-			// grid-area: main;
-			grid-column: 1 / -1;
 
 			@supports(grid-area: auto) {
 				display: grid;
@@ -131,8 +118,8 @@ body {
 
 			article {
 				grid-column: 2 / 4;
-				min-width: 0;
 				margin-top: 2rem;
+				min-width: 0;
 
 				&.status-deprecated {
 					display: none;