diff --git a/src/component-list-template.html b/src/component-list-template.html
index ff8fb7eef3..988b356b5f 100644
--- a/src/component-list-template.html
+++ b/src/component-list-template.html
@@ -14,12 +14,14 @@
   }
   </style>
 </head>
-<body>
+<body class="govuk-c-site-width-container">
   <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
   <h1>Components</h1>
-  <!-- inject:componentlinks -->
-  <!-- links to components will be injected here -->
-  <!-- endinject -->
+  <ul class="govuk-c-list">
+    <!-- inject:componentlinks -->
+    <!-- links to components will be injected here -->
+    <!-- endinject -->
+  </ul>
   <script src="/js/govuk-frontend.js"></script>
 </body>
 </html>
diff --git a/src/component-view-template.html b/src/component-view-template.html
index 630e61e6c9..8d04613c54 100644
--- a/src/component-view-template.html
+++ b/src/component-view-template.html
@@ -6,10 +6,12 @@
   <!--[if IE 8]>
   <link rel="stylesheet" href="/css/govuk-frontend-oldie.css">
   <![endif]-->
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.6.0/themes/prism.min.css">
 </head>
-<body>
+<body class="language-markup govuk-c-site-width-container">
   <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
   <%= contents %>
   <script src="/js/govuk-frontend.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.6.0/prism.min.js"></script>
 </body>
 </html>