diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index aa87ea7eca5..2f732b2adda 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -28,33 +28,17 @@ $font-size-base: 13px !default;
  */
 @import "generic.scss";
 
-
-
 @import "common.scss";
-@import "selects.scss";
 
-@import "sections/header.scss";
-@import "sections/nav.scss";
-@import "sections/commits.scss";
-@import "sections/issues.scss";
-@import "sections/projects.scss";
-@import "sections/snippets.scss";
-@import "sections/votes.scss";
-@import "sections/merge_requests.scss";
-@import "sections/graph.scss";
-@import "sections/events.scss";
-@import "sections/themes.scss";
-@import "sections/tree.scss";
-@import "sections/notes.scss";
-@import "sections/profile.scss";
-@import "sections/login.scss";
-@import "sections/editor.scss";
-@import "sections/admin.scss";
-@import "sections/wiki.scss";
-@import "sections/wall.scss";
-@import "sections/dashboard.scss";
-@import "sections/stat_graph.scss";
 
+/**
+ * Page specific styles (issues, projects etc):
+ */
+@import "sections.scss";
+
+/**
+ * Code ighlight
+ */
 @import "highlight/white.scss";
 @import "highlight/dark.scss";
 @import "highlight/solarized_dark.scss";
@@ -73,4 +57,3 @@ $font-size-base: 13px !default;
  * Styles for JS behaviors.
  */
 @import "behaviors.scss";
-
diff --git a/app/assets/stylesheets/generic.scss b/app/assets/stylesheets/generic.scss
index 0ebbbf267cd..4f7716113e0 100644
--- a/app/assets/stylesheets/generic.scss
+++ b/app/assets/stylesheets/generic.scss
@@ -12,3 +12,4 @@
 @import "generic/files.scss";
 @import "generic/lists.scss";
 @import "generic/forms.scss";
+@import "generic/selects.scss";
diff --git a/app/assets/stylesheets/selects.scss b/app/assets/stylesheets/generic/selects.scss
similarity index 100%
rename from app/assets/stylesheets/selects.scss
rename to app/assets/stylesheets/generic/selects.scss
diff --git a/app/assets/stylesheets/sections.scss b/app/assets/stylesheets/sections.scss
new file mode 100644
index 00000000000..52bb449eb93
--- /dev/null
+++ b/app/assets/stylesheets/sections.scss
@@ -0,0 +1,21 @@
+@import "sections/header.scss";
+@import "sections/nav.scss";
+@import "sections/commits.scss";
+@import "sections/issues.scss";
+@import "sections/projects.scss";
+@import "sections/snippets.scss";
+@import "sections/votes.scss";
+@import "sections/merge_requests.scss";
+@import "sections/graph.scss";
+@import "sections/events.scss";
+@import "sections/themes.scss";
+@import "sections/tree.scss";
+@import "sections/notes.scss";
+@import "sections/profile.scss";
+@import "sections/login.scss";
+@import "sections/editor.scss";
+@import "sections/admin.scss";
+@import "sections/wiki.scss";
+@import "sections/wall.scss";
+@import "sections/dashboard.scss";
+@import "sections/stat_graph.scss";