diff --git a/assets/styles/_variables.less b/assets/styles/_variables.less
deleted file mode 100644
index b46f50e..0000000
--- a/assets/styles/_variables.less
+++ /dev/null
@@ -1,17 +0,0 @@
-// Grid settings
-// -------------------------
-
-@main-sm-columns:       @grid-columns;
-@sidebar-sm-columns:    4;
-
-
-// Brand colors
-// -------------------------
-
-@brand-primary:         #27ae60;
-
-
-// Glyphicons path
-// -------------------------
-
-@icon-font-path:        "../fonts/";
diff --git a/assets/styles/_global.less b/assets/styles/common/_global.less
similarity index 100%
rename from assets/styles/_global.less
rename to assets/styles/common/_global.less
diff --git a/assets/styles/common/_variables.less b/assets/styles/common/_variables.less
new file mode 100644
index 0000000..eb26cc9
--- /dev/null
+++ b/assets/styles/common/_variables.less
@@ -0,0 +1,6 @@
+// Grid settings
+@main-sm-columns:       @grid-columns;
+@sidebar-sm-columns:    4;
+
+// Colors
+@brand-primary:         #27ae60;
diff --git a/assets/styles/layouts/_general.less b/assets/styles/components/_grid.less
similarity index 66%
rename from assets/styles/layouts/_general.less
rename to assets/styles/components/_grid.less
index c0d5dc4..dd01d79 100644
--- a/assets/styles/layouts/_general.less
+++ b/assets/styles/components/_grid.less
@@ -1,10 +1,10 @@
-// Content wrapper
-.wrap { }
-
-// Main content area
+// Grid system
 .main {
   .make-sm-column(@main-sm-columns);
   .sidebar-primary & {
     .make-sm-column(@main-sm-columns - @sidebar-sm-columns);
   }
 }
+.sidebar {
+  .make-sm-column(@sidebar-sm-columns);
+}
diff --git a/assets/styles/components/_media.less b/assets/styles/components/_media.less
deleted file mode 100644
index 4918f7b..0000000
--- a/assets/styles/components/_media.less
+++ /dev/null
@@ -1,13 +0,0 @@
-// Captions
-.wp-caption {
-  &:extend(.thumbnail all);
-}
-
-.wp-caption-text {
-  &:extend(.thumbnail .caption all);
-}
-
-// Gallery shortcode
-.gallery-row {
-  padding: (@line-height-computed / 2) 0;
-}
diff --git a/assets/styles/components/_wp-classes.less b/assets/styles/components/_wp-classes.less
index d800dfc..83e69cd 100644
--- a/assets/styles/components/_wp-classes.less
+++ b/assets/styles/components/_wp-classes.less
@@ -1,6 +1,12 @@
 // WordPress Generated Classes
 // http://codex.wordpress.org/CSS#WordPress_Generated_Classes
 
+// Media alignment
+.alignnone {
+  margin-left: 0;
+  margin-right: 0;
+  max-width: 100%;
+}
 .aligncenter {
   display: block;
   margin: (@line-height-computed / 2) auto;
@@ -10,7 +16,7 @@
   margin-bottom: (@line-height-computed / 2);
 }
 @media (min-width: @screen-sm-min) {
-  // Only float images if not on an extra small device like smartphones
+  // Only float if not on an extra small device
   .alignleft {
     float: left;
     margin-right: (@line-height-computed / 2);
@@ -21,12 +27,15 @@
   }
 }
 
-figure.alignnone {
-  margin-left: 0;
-  margin-right: 0;
-  max-width: 100%;
+// Captions
+.wp-caption {
+  &:extend(.thumbnail all);
+}
+.wp-caption-text {
+  &:extend(.thumbnail .caption all);
 }
 
+// Text meant only for screen readers
 .screen-reader-text {
   &:extend(.sr-only all);
   &:extend(.sr-only-focusable all);
diff --git a/assets/styles/editor-style.less b/assets/styles/editor-style.less
index 56abf72..b318c99 100644
--- a/assets/styles/editor-style.less
+++ b/assets/styles/editor-style.less
@@ -1,4 +1,4 @@
-@import "main.less";
+@import "main";
 
 body {
   margin: 12px !important;
diff --git a/assets/styles/layouts/_footer.less b/assets/styles/layouts/_footer.less
index 940462d..e69de29 100644
--- a/assets/styles/layouts/_footer.less
+++ b/assets/styles/layouts/_footer.less
@@ -1 +0,0 @@
-.content-info { }
diff --git a/assets/styles/layouts/_header.less b/assets/styles/layouts/_header.less
index a6d3106..e69de29 100644
--- a/assets/styles/layouts/_header.less
+++ b/assets/styles/layouts/_header.less
@@ -1 +0,0 @@
-.banner { }
diff --git a/assets/styles/layouts/_posts.less b/assets/styles/layouts/_posts.less
index 62309b5..e69de29 100644
--- a/assets/styles/layouts/_posts.less
+++ b/assets/styles/layouts/_posts.less
@@ -1,5 +0,0 @@
-.hentry header { }
-.hentry time { }
-.hentry .byline { }
-.hentry .entry-content { }
-.hentry footer { }
diff --git a/assets/styles/layouts/_sidebar.less b/assets/styles/layouts/_sidebar.less
index 0a735c9..e69de29 100644
--- a/assets/styles/layouts/_sidebar.less
+++ b/assets/styles/layouts/_sidebar.less
@@ -1,3 +0,0 @@
-.sidebar {
-  .make-sm-column(@sidebar-sm-columns);
-}
diff --git a/assets/styles/layouts/pages/_home.less b/assets/styles/layouts/pages/_home.less
deleted file mode 100644
index e69de29..0000000
diff --git a/assets/styles/main.less b/assets/styles/main.less
index 08ec483..8e592a6 100644
--- a/assets/styles/main.less
+++ b/assets/styles/main.less
@@ -2,17 +2,15 @@
 @import "../../bower_components/bootstrap/less/bootstrap.less";
 // endbower
 
-@import "_variables";                // Variable overrides and custom variables
-@import "_global";                   // Base styling & custom mixins
-@import "components/_buttons";       // Button tweaks
-@import "components/_comments";      // Comment styling
-@import "components/_forms";         // Form tweaks
-@import "components/_media";         // WordPress media
-@import "components/_wp-classes";    // WordPress generated classes
-@import "layouts/_general";          // General styling
-@import "layouts/_header";           // Header styling
-@import "layouts/_sidebar";          // Sidebar styling
-@import "layouts/_footer";           // Footer styling
-@import "layouts/_pages";            // Page styling
-@import "layouts/pages/_home";       // Home page styling
-@import "layouts/_posts";            // Post styling
+@import "common/_variables";
+@import "common/_global";
+@import "components/_buttons";
+@import "components/_comments";
+@import "components/_forms";
+@import "components/_grid";
+@import "components/_wp-classes";
+@import "layouts/_header";
+@import "layouts/_sidebar";
+@import "layouts/_footer";
+@import "layouts/_pages";
+@import "layouts/_posts";
diff --git a/assets/styles/main.scss.example b/assets/styles/main.scss.example
index 5a3a5d6..301b355 100644
--- a/assets/styles/main.scss.example
+++ b/assets/styles/main.scss.example
@@ -1,11 +1,11 @@
-// How to get started using Bootstrap Sass:
+// How to get started using Sass instead of Less:
 //
 // 1. Run `bower install bootstrap-sass-official --save`
 // 2. Rename this file to `main.scss` and remove `main.less`
-// 3. Update the `assets/manifest.json` styles dependenies to change `main.less` to `main.scss`
+// 3. Rename `editor-style.less` to `editor-style.scss`
+// 4. Update the `assets/manifest.json` styles dependenies from `.less` to `.scss`
 //
-// Feel free to remove this file if you're using LESS
-
+// Feel free to remove this file if you're using Less
 
 // bower:sass
 @import "../../bower_components/bootstrap-sass-official/assets/stylesheets/_bootstrap.scss";