diff --git a/themes/neue-dark-ui/block.less b/themes/neue-dark-ui/blocks.less
similarity index 100%
rename from themes/neue-dark-ui/block.less
rename to themes/neue-dark-ui/blocks.less
diff --git a/themes/neue-dark-ui/lists.less b/themes/neue-dark-ui/lists.less
index 0cb16995c..279a266ce 100644
--- a/themes/neue-dark-ui/lists.less
+++ b/themes/neue-dark-ui/lists.less
@@ -145,6 +145,23 @@
   }
 }
 
+.select-list.popover-list {
+  background-color: @overlay-background-color;
+  -webkit-box-shadow: 0 0 3px 3px @base-border-color;
+  padding: @component-padding/2;
+  border-radius: @component-border-radius;
+  border: 1px solid @overlay-border-color;
+
+  .editor {
+    margin-bottom: @component-padding/2;
+  }
+
+  .list-group li {
+    padding-left: @component-padding/2;
+  }
+}
+
+
 
 
 
diff --git a/themes/neue-dark-ui/overlay.less b/themes/neue-dark-ui/overlays.less
similarity index 100%
rename from themes/neue-dark-ui/overlay.less
rename to themes/neue-dark-ui/overlays.less
diff --git a/themes/neue-dark-ui/package.cson b/themes/neue-dark-ui/package.cson
index 254775386..16405b452 100644
--- a/themes/neue-dark-ui/package.cson
+++ b/themes/neue-dark-ui/package.cson
@@ -2,17 +2,16 @@
   'atom'
   'utilities'
   'text'
-  'block'
+  'blocks'
   'git'
-  'site'
+  'sites'
   'icons'
   'loading'
   'buttons'
   'panels'
   'lists'
   'editor'
-  'section'
+  'sections'
   'tabs'
-  'overlay'
-  'popover-list'
+  'overlays'
 ]
diff --git a/themes/neue-dark-ui/panels.less b/themes/neue-dark-ui/panels.less
index eac78ede7..ff6501586 100644
--- a/themes/neue-dark-ui/panels.less
+++ b/themes/neue-dark-ui/panels.less
@@ -2,35 +2,6 @@
 @import "ui-variables";
 @import "buttons";
 
-.panel-heading {
-  margin: 0;
-  border-bottom: none;
-  padding: @component-padding - 2px @component-padding;
-
-  font-size: @font-size;
-  line-height: 1;
-
-  background-color: transparent;
-  background-image: -webkit-linear-gradient(@panel-heading-background-color, darken(@panel-heading-background-color, 10%));
-
-  .btn {
-    padding: 1px 5px;
-    font-size: 10px;
-    position: relative; top: -1px;
-
-    @bg: lighten(@button-background-color, 10%);
-    @hover: lighten(@button-background-color-hover, 10%);
-    @selected: lighten(@button-background-color-selected, 10%);
-    @text: lighten(@text-color, 10%);
-    .btn-background(@bg, @hover, @selected, @text);
-  }
-}
-
-.inset-panel {
-  position: relative;
-  background-color: @inset-panel-background-color;
-}
-
 .tool-panel {
   .text(normal);
   position: relative;
@@ -64,8 +35,37 @@
   }
 }
 
+.inset-panel {
+  position: relative;
+  background-color: @inset-panel-background-color;
+}
+
 .is-blurred {
   .tool-panel, .inset-panel {
     opacity: 0.6;
   }
 }
+
+.panel-heading {
+  margin: 0;
+  border-bottom: none;
+  padding: @component-padding - 2px @component-padding;
+
+  font-size: @font-size;
+  line-height: 1;
+
+  background-color: transparent;
+  background-image: -webkit-linear-gradient(@panel-heading-background-color, darken(@panel-heading-background-color, 10%));
+
+  .btn {
+    padding: 1px 5px;
+    font-size: 10px;
+    position: relative; top: -1px;
+
+    @bg: lighten(@button-background-color, 10%);
+    @hover: lighten(@button-background-color-hover, 10%);
+    @selected: lighten(@button-background-color-selected, 10%);
+    @text: lighten(@text-color, 10%);
+    .btn-background(@bg, @hover, @selected, @text);
+  }
+}
diff --git a/themes/neue-dark-ui/popover-list.less b/themes/neue-dark-ui/popover-list.less
deleted file mode 100644
index 7083ceed8..000000000
--- a/themes/neue-dark-ui/popover-list.less
+++ /dev/null
@@ -1,17 +0,0 @@
-@import "ui-variables";
-
-.select-list.popover-list {
-  background-color: @overlay-background-color;
-  -webkit-box-shadow: 0 0 3px 3px @base-border-color;
-  padding: @component-padding/2;
-  border-radius: @component-border-radius;
-  border: 1px solid @overlay-border-color;
-
-  .editor {
-    margin-bottom: @component-padding/2;
-  }
-
-  .list-group li {
-    padding-left: @component-padding/2;
-  }
-}
diff --git a/themes/neue-dark-ui/section.less b/themes/neue-dark-ui/sections.less
similarity index 100%
rename from themes/neue-dark-ui/section.less
rename to themes/neue-dark-ui/sections.less
diff --git a/themes/neue-dark-ui/site.less b/themes/neue-dark-ui/sites.less
similarity index 100%
rename from themes/neue-dark-ui/site.less
rename to themes/neue-dark-ui/sites.less