diff --git a/app/assets/sass/components/_list-border.scss b/app/assets/sass/components/_list-border.scss
deleted file mode 100644
index 40ffccae..00000000
--- a/app/assets/sass/components/_list-border.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-// ==========================================================================
-// COMPONENTS / #LIST-BORDER
-// ==========================================================================
-
-.nhsuk-list--border li {
-  border-bottom: 1px solid $color_nhsuk-grey-4;
-  padding: 8px 0 16px;
-}
diff --git a/app/assets/sass/components/_related-nav.scss b/app/assets/sass/components/_related-nav.scss
deleted file mode 100755
index 75800923..00000000
--- a/app/assets/sass/components/_related-nav.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-// ==========================================================================
-// COMPONENTS / #RELATED-NAV
-// ==========================================================================
-
-.nhsuk-related-nav {
-  border-top: 1px solid $nhsuk-border-color;
-
-  @include mq($until: desktop) {
-    margin-top: nhsuk-spacing(7);
-  }
-}
-
-.nhsuk-related-nav__heading {
-  @include nhsuk-typography-responsive(19, $override-line-height: 1.2);
-
-  margin-bottom: 12px;
-  padding-top: nhsuk-spacing(3);
-}
-
-.nhsuk-related-nav__list {
-  @include nhsuk-typography-responsive(16);
-
-  list-style: none;
-  padding-left: 0;
-}
diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss
index c35ff505..2b55c96f 100644
--- a/app/assets/sass/main.scss
+++ b/app/assets/sass/main.scss
@@ -2,8 +2,6 @@
 @import 'node_modules/nhsuk-frontend/packages/nhsuk';
 
 // Components that are not in the NHS.UK frontend library
-@import 'components/list-border';
-@import 'components/related-nav';
 @import 'components/figure';
 
 ///////////////////////////////////////////
diff --git a/app/assets/sass/nhsuk.scss b/app/assets/sass/nhsuk.scss
index 33b41c11..54fb3386 100644
--- a/app/assets/sass/nhsuk.scss
+++ b/app/assets/sass/nhsuk.scss
@@ -1,4 +1,11 @@
-@import 'node_modules/nhsuk-frontend/packages/core/settings/colours';
+@import 'node_modules/nhsuk-frontend/packages/core/settings/all';
+@import 'node_modules/nhsuk-frontend/packages/core/tools/all';
+
+// NHS.UK website template styles
+//
+// This CSS is all used to re-create some of the NHS.UK website
+// styles within the example templates. It will likely need updating
+// as the NHS.UK website updates.
 
 // ==========================================================================
 // Log in link
@@ -92,7 +99,7 @@
   }
  }
 
- 
+
 // ==========================================================================
 // Feedback form
 // ==========================================================================
@@ -600,3 +607,38 @@ main .app-list-signage a[href=""]:focus {
 main .app-list-signage a[href=""] {
   color: $color_nhsuk-white;
 }
+
+// ==========================================================================
+// COMPONENTS / #RELATED-NAV
+// ==========================================================================
+
+.nhsuk-related-nav {
+  border-top: 1px solid $nhsuk-border-color;
+
+  @include mq($until: desktop) {
+    margin-top: nhsuk-spacing(7);
+  }
+}
+
+.nhsuk-related-nav__heading {
+  @include nhsuk-typography-responsive(19, $override-line-height: 1.2);
+
+  margin-bottom: 12px;
+  padding-top: nhsuk-spacing(3);
+}
+
+.nhsuk-related-nav__list {
+  @include nhsuk-typography-responsive(16);
+
+  list-style: none;
+  padding-left: 0;
+}
+
+// ==========================================================================
+// COMPONENTS / #LIST-BORDER
+// ==========================================================================
+
+.nhsuk-list--border li {
+  border-bottom: 1px solid $color_nhsuk-grey-4;
+  padding: 8px 0 16px;
+}