diff --git a/core/themes/bartik/css/components/admin.css b/core/themes/bartik/css/components/admin.css
index 1661946..255a959 100644
--- a/core/themes/bartik/css/components/admin.css
+++ b/core/themes/bartik/css/components/admin.css
@@ -1,4 +1,11 @@
-/* ---------- Admin-specific Theming ---------- */
+/**
+ * @file
+ * Bartik specific admin styling.
+ */
+
+ /**
+ * Admin-specific Theming.
+ */
 .path-admin #content img {
   margin-right: 15px; /* LTR */
 }
diff --git a/core/themes/bartik/css/components/book.css b/core/themes/bartik/css/components/book.css
index 82e22ee..ed13857 100644
--- a/core/themes/bartik/css/components/book.css
+++ b/core/themes/bartik/css/components/book.css
@@ -2,7 +2,9 @@
  * @file
  * Bartik specific styling for the Book module.
  */
-
+/**
+ * Book module styles.
+ */
 .book-navigation .menu {
   border-top: 1px solid #d6d6d6;
 }
diff --git a/core/themes/bartik/css/components/buttons.css b/core/themes/bartik/css/components/buttons.css
index e2370e2..4951e6b 100644
--- a/core/themes/bartik/css/components/buttons.css
+++ b/core/themes/bartik/css/components/buttons.css
@@ -1,5 +1,11 @@
-/* ---------------- Buttons    ---------------- */
+/**
+ * @file
+ * Bartik specific button styling.
+ */
 
+/**
+ * Button theming 
+ */
 .button {
   background-color: #fff;
   background-image: -webkit-linear-gradient(top, #f3f3f3, #e8e8e8);
diff --git a/core/themes/bartik/css/components/comments.css b/core/themes/bartik/css/components/comments.css
index 6b543a1..6c6f887 100644
--- a/core/themes/bartik/css/components/comments.css
+++ b/core/themes/bartik/css/components/comments.css
@@ -1,5 +1,11 @@
-/* ----------------- Comments ----------------- */
+/**
+ * @file
+ * Bartik specific comment styling.
+ */
 
+/**
+ * Comment theming 
+ */
 .comment h2.title {
   margin-bottom: 1em;
 }
diff --git a/core/themes/bartik/css/components/content.css b/core/themes/bartik/css/components/content.css
index 1665382..6e6be8c 100644
--- a/core/themes/bartik/css/components/content.css
+++ b/core/themes/bartik/css/components/content.css
@@ -1,5 +1,11 @@
-/* ----------------- Content ------------------ */
+/**
+ * @file
+ * Bartik specific content styling.
+ */
 
+/**
+ * Content theming 
+ */
 .content,
 .node__content {
   margin-top: 10px;
diff --git a/core/themes/bartik/css/components/contextual.css b/core/themes/bartik/css/components/contextual.css
index 0b08395..4c53a93 100644
--- a/core/themes/bartik/css/components/contextual.css
+++ b/core/themes/bartik/css/components/contextual.css
@@ -1,3 +1,11 @@
+/**
+ * @file
+ * Bartik specific contextual link styling.
+ */
+
+/**
+ * Contextual link theming 
+ */
 #header .contextual .trigger,
 #footer-wrapper .contextual .trigger {
   border: none;
diff --git a/core/themes/bartik/css/components/dropbutton.component.css b/core/themes/bartik/css/components/dropbutton.component.css
index ac14aef..c2fbdec 100644
--- a/core/themes/bartik/css/components/dropbutton.component.css
+++ b/core/themes/bartik/css/components/dropbutton.component.css
@@ -1,4 +1,11 @@
-/* ---------- Dropbutton ----------- */
+/**
+ * @file
+ * Bartik specific dropbutton styling.
+ */
+
+/**
+ * Dropbutton theming 
+ */
 .js .dropbutton-multiple.open .dropbutton-widget {
   border-radius: 1em;
 }
diff --git a/core/themes/bartik/css/components/featured.css b/core/themes/bartik/css/components/featured.css
index 3c56852..34314c9 100644
--- a/core/themes/bartik/css/components/featured.css
+++ b/core/themes/bartik/css/components/featured.css
@@ -1,5 +1,12 @@
 /* ----------------- Featured ----------------- */
+/**
+ * @file
+ * Bartik specific featured styling.
+ */
 
+/**
+ * Featured theming 
+ */
 #featured {
   text-align: center;
   font-size: 1.2em;
diff --git a/core/themes/bartik/css/components/footer.css b/core/themes/bartik/css/components/footer.css
index 094181a..85a9256 100644
--- a/core/themes/bartik/css/components/footer.css
+++ b/core/themes/bartik/css/components/footer.css
@@ -1,5 +1,11 @@
-/* ------------------ Footer ------------------ */
+/**
+ * @file
+ * Bartik specific footer styling.
+ */
 
+/**
+ * Footer theming 
+ */
 #footer-wrapper .block .content {
   color: #c0c0c0;
   color: rgba(255, 255, 255, 0.65);
diff --git a/core/themes/bartik/css/components/form.css b/core/themes/bartik/css/components/form.css
index 82377ad..54cb3a7 100644
--- a/core/themes/bartik/css/components/form.css
+++ b/core/themes/bartik/css/components/form.css
@@ -1,11 +1,17 @@
-/* -------------- Password Field  ------------- */
+/**
+ * @file
+ * Bartik specific form styling.
+ */
 
+/**
+ * Password field theming 
+ */
 .password-field {
   margin: 0;
 }
-
-/* -------------- Form Elements   ------------- */
-
+/**
+ * Form element theming 
+ */
 form {
   margin: 0;
   padding: 0;
diff --git a/core/themes/bartik/css/components/forum.css b/core/themes/bartik/css/components/forum.css
index 689f1d9..7bfdfd4 100644
--- a/core/themes/bartik/css/components/forum.css
+++ b/core/themes/bartik/css/components/forum.css
@@ -1,3 +1,11 @@
+/**
+ * @file
+ * Bartik specific form styling.
+ */
+
+/**
+ * Forum theming 
+ */
 #forum .name {
   font-size: 1.083em;
 }
diff --git a/core/themes/bartik/css/components/header.css b/core/themes/bartik/css/components/header.css
index 9db0b1d..11a7cc3 100644
--- a/core/themes/bartik/css/components/header.css
+++ b/core/themes/bartik/css/components/header.css
@@ -1,4 +1,11 @@
-/* ------------------ Header ------------------ */
+/**
+ * @file
+ * Bartik specific header styling.
+ */
+
+/**
+ * Header theming 
+ */
 #logo,
 .site-logo {
   float: left; /* LTR */
diff --git a/core/themes/bartik/css/components/help.css b/core/themes/bartik/css/components/help.css
index f11e915..3247bba 100644
--- a/core/themes/bartik/css/components/help.css
+++ b/core/themes/bartik/css/components/help.css
@@ -1,5 +1,11 @@
-/* ------------------- Help ------------------- */
+/**
+ * @file
+ * Bartik specific helo region styling.
+ */
 
+/**
+ * Help region theming 
+ */
 .region-help {
   border: 1px solid #d3d7d9;
   padding: 0 1.5em;
diff --git a/core/themes/bartik/css/components/media.css b/core/themes/bartik/css/components/media.css
index 6c43bc3..8af30e2 100644
--- a/core/themes/bartik/css/components/media.css
+++ b/core/themes/bartik/css/components/media.css
@@ -1,8 +1,15 @@
-/* ----------- media queries ------------------------------- */
+/**
+ * @file
+ * Bartik media queries styling.
+ */
 
+/**
+ * Media queries 
+ */
 @media all and (min-width: 461px) and (max-width: 900px) {
-  /* ------------ Header and Menus -------------------------- */
-
+  /**
+   * Header and Menus 
+   */
  .region-header {
     margin: .5em 5px .75em;
   }
@@ -125,16 +132,18 @@
 }
 
 @media all and (min-width: 520px) {
-
-  /* ----------------- Featured ----------------- */
+  /**
+   * Featured 
+   */
   #featured {
     font-size: 1.643em;
   }
   #featured h2 {
     font-size: 1.174em;
   }
-
-  /* ------------------ Triptych ----------------- */
+  /**
+   * Triptych 
+   */
   #triptych h2 {
     font-size: 1.714em;
     margin-bottom: 0.9em;
@@ -162,8 +171,9 @@
     display: none;
   }
 }
-
-/* ---------- Input fields ---------- */
+/**
+ * Input fields 
+ */
 @media screen and (max-width: 60em) { /* 920px */
   input,
   textarea {
diff --git a/core/themes/bartik/css/components/messages.css b/core/themes/bartik/css/components/messages.css
index 880efa1..f2dd474 100644
--- a/core/themes/bartik/css/components/messages.css
+++ b/core/themes/bartik/css/components/messages.css
@@ -1,5 +1,11 @@
-/* ---------------- Messages  ----------------- */
+/**
+ * @file
+ * Bartik specific messages styling.
+ */
 
+/**
+ * Messages theming 
+ */
 #messages {
   padding: 20px 0 5px;
   margin: 0 auto;
diff --git a/core/themes/bartik/css/components/node-preview.css b/core/themes/bartik/css/components/node-preview.css
index 65fd871..64fae35 100644
--- a/core/themes/bartik/css/components/node-preview.css
+++ b/core/themes/bartik/css/components/node-preview.css
@@ -1,3 +1,11 @@
+/**
+ * @file
+ * Bartik specific node preview styling.
+ */
+
+/**
+ * Node preview theming 
+ */
 .node-preview-container {
   background: #d1e8f5;
   background-image: -webkit-linear-gradient(top, #d1e8f5, #d3e8f4);
diff --git a/core/themes/bartik/css/components/pager.css b/core/themes/bartik/css/components/pager.css
index 6fb5a83..387c8a2 100644
--- a/core/themes/bartik/css/components/pager.css
+++ b/core/themes/bartik/css/components/pager.css
@@ -1,5 +1,12 @@
 /* --------------- Pager ------------ */
+/**
+ * @file
+ * Bartik specific pager styling.
+ */
 
+/**
+ * Pager theming 
+ */
 .pager .pager__items {
   padding: 0;
 }
diff --git a/core/themes/bartik/css/components/primary-menu.css b/core/themes/bartik/css/components/primary-menu.css
index bcd0cf2..aa4871e 100644
--- a/core/themes/bartik/css/components/primary-menu.css
+++ b/core/themes/bartik/css/components/primary-menu.css
@@ -1,5 +1,12 @@
 /* --------------- Primary Menu ------------ */
+/**
+ * @file
+ * Bartik specific Primary menu styling.
+ */
 
+/**
+ * Primary menu theming 
+ */
 .region-primary-menu {
   clear: both;
 }
diff --git a/core/themes/bartik/css/components/search-results.css b/core/themes/bartik/css/components/search-results.css
index d463bf3..83d7e22 100644
--- a/core/themes/bartik/css/components/search-results.css
+++ b/core/themes/bartik/css/components/search-results.css
@@ -1,5 +1,11 @@
-/* --------------- Search Results ---------------- */
+/**
+ * @file
+ * Bartik specific search results styling.
+ */
 
+/**
+ * Search results theming 
+ */
 ol.search-results {
   padding-left: 0;
   list-style-position: inside;
diff --git a/core/themes/bartik/css/components/search.css b/core/themes/bartik/css/components/search.css
index 6de5d02..6ec8e4d 100644
--- a/core/themes/bartik/css/components/search.css
+++ b/core/themes/bartik/css/components/search.css
@@ -1,5 +1,11 @@
-/* --------------- Search Form ---------------- */
+/**
+ * @file
+ * Bartik specific search form styling.
+ */
 
+/**
+ * Search form theming 
+ */
 #block-search-form {
   padding-bottom: 7px;
 }
@@ -50,8 +56,10 @@
 #search-form .form-item-keys label {
   display: block;
 }
-
-/* --------------- Search Results ---------------- */
+/**
+ * Search results - Note: the following are in search-results.css
+ * are they still needed here? 
+ */
 ol.search-results {
   padding-left: 0;
   list-style-position: inside;
diff --git a/core/themes/bartik/css/components/secondary-menu.css b/core/themes/bartik/css/components/secondary-menu.css
index 6c4476b..04b3612 100644
--- a/core/themes/bartik/css/components/secondary-menu.css
+++ b/core/themes/bartik/css/components/secondary-menu.css
@@ -1,5 +1,12 @@
 /* --------------- Secondary Menu ------------ */
+/**
+ * @file
+ * Bartik specific secondary menu styling.
+ */
 
+/**
+ * Secondary menu theming 
+ */
 .region-secondary-menu .menu {
   text-align: right; /* LTR */
   font-size: 0.929em;
diff --git a/core/themes/bartik/css/components/shortcut.css b/core/themes/bartik/css/components/shortcut.css
index 2262be8..956a428 100644
--- a/core/themes/bartik/css/components/shortcut.css
+++ b/core/themes/bartik/css/components/shortcut.css
@@ -1,5 +1,12 @@
 /* -------------- Shortcut Links -------------- */
+/**
+ * @file
+ * Bartik specific shortcut links styling.
+ */
 
+/**
+ * Shortcut link theming 
+ */
 .shortcut-wrapper {
   margin: 2.2em 0 1.1em 0; /* Same as usual h1#page-title margin. */
 }
diff --git a/core/themes/bartik/css/components/sidebar.css b/core/themes/bartik/css/components/sidebar.css
index 7f1d5d8..bdd4df2 100644
--- a/core/themes/bartik/css/components/sidebar.css
+++ b/core/themes/bartik/css/components/sidebar.css
@@ -1,5 +1,11 @@
-/* ------------------ Sidebar ----------------- */
+/**
+ * @file
+ * Bartik specific sidebar styling.
+ */
 
+/**
+ * Sidebar theming 
+ */
 .sidebar .section {
   padding-top: 10px;
 }
diff --git a/core/themes/bartik/css/components/table.css b/core/themes/bartik/css/components/table.css
index 0173e34..6f14131 100644
--- a/core/themes/bartik/css/components/table.css
+++ b/core/themes/bartik/css/components/table.css
@@ -1,5 +1,11 @@
-/* ------------------ Table Styles ------------------ */
+/**
+ * @file
+ * Bartik specific table styling.
+ */
 
+/**
+ * table theming 
+ */
 table {
   border: 0;
   border-spacing: 0;
diff --git a/core/themes/bartik/css/components/tabs.css b/core/themes/bartik/css/components/tabs.css
index 00f8e70..a0c6c65 100644
--- a/core/themes/bartik/css/components/tabs.css
+++ b/core/themes/bartik/css/components/tabs.css
@@ -1,5 +1,12 @@
 /* --------------- System Tabs  --------------- */
+/**
+ * @file
+ * Bartik specific system tab styling.
+ */
 
+/**
+ * System tab theming 
+ */
 div.tabs {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   margin-bottom: 20px;
diff --git a/core/themes/bartik/css/components/tips.css b/core/themes/bartik/css/components/tips.css
index 6d350fa..0ff224b 100644
--- a/core/themes/bartik/css/components/tips.css
+++ b/core/themes/bartik/css/components/tips.css
@@ -1,4 +1,11 @@
-/* ----------------- Tips ----------------- */
+/**
+ * @file
+ * Bartik specific tips styling.
+ */
+
+/**
+ * Tips theming 
+ */
 ul.tips {
   padding: 0 0 0 1.25em; /* LTR */
 }
diff --git a/core/themes/bartik/css/components/triptych.css b/core/themes/bartik/css/components/triptych.css
index 148f3b86..28ebe5c 100644
--- a/core/themes/bartik/css/components/triptych.css
+++ b/core/themes/bartik/css/components/triptych.css
@@ -1,5 +1,12 @@
 /* ----------------- Triptych ----------------- */
+/**
+ * @file
+ * Bartik specific triptych styling.
+ */
 
+/**
+ * Triptych theming 
+ */
 #triptych-wrapper {
   background-color: #f0f0f0;
   background: rgba(30, 50, 10, 0.08);
diff --git a/core/themes/bartik/css/components/user.css b/core/themes/bartik/css/components/user.css
index 3963534..fe39d2b 100644
--- a/core/themes/bartik/css/components/user.css
+++ b/core/themes/bartik/css/components/user.css
@@ -1,5 +1,11 @@
-/* -------------- User Profile   -------------- */
+/**
+ * @file
+ * Bartik specific user profile styling.
+ */
 
+/**
+ * User profile theming 
+ */
 .profile .field-name-field-user-picture {
   float: none;
 }
diff --git a/core/themes/bartik/css/components/vertical-tabs.component.css b/core/themes/bartik/css/components/vertical-tabs.component.css
index 21231cf..5a61b11 100644
--- a/core/themes/bartik/css/components/vertical-tabs.component.css
+++ b/core/themes/bartik/css/components/vertical-tabs.component.css
@@ -1,4 +1,11 @@
-/* Vertical Tabs Reset */
+/**
+ * @file
+ * Bartik specific vertical tabs reset styling.
+ */
+
+/**
+ * Vertical tabs theming 
+ */
 ul.vertical-tabs-list {
   margin: -1px 0 -1px -15em;
   padding: 0;
diff --git a/core/themes/bartik/css/components/views.css b/core/themes/bartik/css/components/views.css
index e201311..a00e83d 100644
--- a/core/themes/bartik/css/components/views.css
+++ b/core/themes/bartik/css/components/views.css
@@ -1,67 +1,56 @@
-/* ---------- Views styling ---------- */
+/**
+ * @file
+ * Bartik specific views styling.
+ */
 
 /* @group Lists */
-
 .views-display-top .secondary .action-list {
   padding-left: 0; /* LTR */
 }
-
 [dir="rtl"] .views-display-top .secondary .action-list {
   padding-left: inherit;
   padding-right: 0;
 }
-
 /* @end */
 
 /* @group Attachment details tabs
  *
  * The tabs that switch between sections
  */
-
 .views-displays .region-content .secondary,
 .views-displays .region-content .secondary {
   padding-bottom: 0;
   padding-left: 0;
 }
-
 .views-displays .secondary a {
   font-size: smaller;
 }
-
 .views-displays .secondary > li a {
   border-radius: 5px;
 }
-
 .views-displays .secondary > li.open a {
   border-radius: 5px 5px 0 0;
 }
-
 .views-displays .secondary .open > a:hover,
 .views-displays .secondary .open > a:focus {
   color: #0071B3;
 }
-
 .views-displays .secondary input.form-submit {
   font-size: smaller;
 }
-
 /* @end */
 
 /* @group Modal dialog box
  *
  * The contents of the popup dialog on the views edit form.
  */
-
 .views-filterable-options .filterable-option:nth-of-type(even) .form-type-checkbox {
   background-color: #F9F9F9;
 }
-
 /* @end */
-
 .views-display-column .details-wrapper {
   margin-top: 0;
 }
-
 .views-display-column details summary {
   background: none;
   border: none;
@@ -73,38 +62,30 @@
   text-shadow: none;
   top: 3px;
 }
-
 .views-display-columns details {
   position: inherit;
 }
-
 .views-display-columns details summary {
   padding: 0 0 4px 2px; /* LTR */
 }
 [dir="rtl"] .views-display-columns details summary {
   padding: 0 2px 4px 0;
 }
-
 .views-display-columns a.fieldset-title {
   color: #0071B3;
 }
-
 .views-display-columns a.fieldset-title:hover,
 .views-display-columns a.fieldset-title:focus {
   color: #018FE2;
 }
-
 /* @group Dropbutton */
-
 .views-ui-display-tab-actions .dropbutton input {
   color: #0071B3;
 }
-
 .views-ui-display-tab-actions .dropbutton input:hover,
 .views-ui-display-tab-actions .dropbutton input:focus {
   color: #018FE2;
 }
-
 .views-ui-display-tab-actions .dropbutton input.form-submit {
   margin-right: 0;
   margin-top: 0;