diff --git a/assets/styles/app/_mixins/all.sass b/assets/styles/app/_mixins/all.sass
index 30efdbea..fe9eb854 100644
--- a/assets/styles/app/_mixins/all.sass
+++ b/assets/styles/app/_mixins/all.sass
@@ -1,6 +1,6 @@
-@import "compass"
-@import "_mixins/colors"
-@import "_mixins/fonts"
+@import "app/compass"
+@import "app/_mixins/colors"
+@import "app/_mixins/fonts"
 
 @mixin popup
   display: none
diff --git a/assets/styles/app/ansi.sass b/assets/styles/app/ansi.sass
index 01a92bad..165cca96 100644
--- a/assets/styles/app/ansi.sass
+++ b/assets/styles/app/ansi.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 // ansi styles, see javascripts/lib/deansi.js
 .ansi
diff --git a/assets/styles/app/app.sass b/assets/styles/app/app.sass
index a44c2c77..96b237af 100644
--- a/assets/styles/app/app.sass
+++ b/assets/styles/app/app.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 html, body
   font-family: 'Source Sans Pro', Helvetica, sans-serif
diff --git a/assets/styles/app/auth.sass b/assets/styles/app/auth.sass
index 6d611a9d..a93ec6cb 100644
--- a/assets/styles/app/auth.sass
+++ b/assets/styles/app/auth.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #auth
   #main
diff --git a/assets/styles/app/button.sass b/assets/styles/app/button.sass
index 8350a14e..17e61e2d 100644
--- a/assets/styles/app/button.sass
+++ b/assets/styles/app/button.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .button
   position: relative
diff --git a/assets/styles/app/flash.sass b/assets/styles/app/flash.sass
index 677502e0..698991b0 100644
--- a/assets/styles/app/flash.sass
+++ b/assets/styles/app/flash.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .flash
   color: #fff
diff --git a/assets/styles/app/forms.scss b/assets/styles/app/forms.scss
index 5b25d75f..af3d6c30 100644
--- a/assets/styles/app/forms.scss
+++ b/assets/styles/app/forms.scss
@@ -1,4 +1,4 @@
-@import "compass";
+@import "app/compass";
 
 .pro {
   form.subscription-form {
diff --git a/assets/styles/app/github.sass b/assets/styles/app/github.sass
index fdf9f1b1..876b34b0 100644
--- a/assets/styles/app/github.sass
+++ b/assets/styles/app/github.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #github-wrapper
   position: absolute
diff --git a/assets/styles/app/layout.sass b/assets/styles/app/layout.sass
index a1c892a8..9cff7f3d 100644
--- a/assets/styles/app/layout.sass
+++ b/assets/styles/app/layout.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 $left-width: 250px
 
diff --git a/assets/styles/app/left.sass b/assets/styles/app/left.sass
index 8f95f077..e126f246 100644
--- a/assets/styles/app/left.sass
+++ b/assets/styles/app/left.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all.sass"
+@import "app/_mixins/all.sass"
 
 #left
   #search_box
diff --git a/assets/styles/app/left/list.sass b/assets/styles/app/left/list.sass
index 767097ba..abd62627 100644
--- a/assets/styles/app/left/list.sass
+++ b/assets/styles/app/left/list.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #accounts,
 #repos
diff --git a/assets/styles/app/loading.sass b/assets/styles/app/loading.sass
index c3371a4e..09298adb 100644
--- a/assets/styles/app/loading.sass
+++ b/assets/styles/app/loading.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .loading
   padding: 15px 25px 0 0
diff --git a/assets/styles/app/main.sass b/assets/styles/app/main.sass
index 76064b22..06a74124 100644
--- a/assets/styles/app/main.sass
+++ b/assets/styles/app/main.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #main
   h3
diff --git a/assets/styles/app/main/annotations.sass b/assets/styles/app/main/annotations.sass
index 7fd355e7..bb5cd5d7 100644
--- a/assets/styles/app/main/annotations.sass
+++ b/assets/styles/app/main/annotations.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #annotations
   margin: 8px 0 25px 12px
diff --git a/assets/styles/app/main/list.sass b/assets/styles/app/main/list.sass
index eecc6f52..497c5797 100644
--- a/assets/styles/app/main/list.sass
+++ b/assets/styles/app/main/list.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 table.list
   width: 100%
diff --git a/assets/styles/app/main/log.sass b/assets/styles/app/main/log.sass
index d55c80ac..f59d964e 100644
--- a/assets/styles/app/main/log.sass
+++ b/assets/styles/app/main/log.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 pre#log
   position: relative
diff --git a/assets/styles/app/main/repository.sass b/assets/styles/app/main/repository.sass
index 314857f4..fe02d1e4 100644
--- a/assets/styles/app/main/repository.sass
+++ b/assets/styles/app/main/repository.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #repo
   position: relative
diff --git a/assets/styles/app/main/summary.sass b/assets/styles/app/main/summary.sass
index 84ac3397..8d83543c 100644
--- a/assets/styles/app/main/summary.sass
+++ b/assets/styles/app/main/summary.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .green .build-status
   background: #549e54 inline-image('icons/state-passed-white.svg') no-repeat
diff --git a/assets/styles/app/main/tools.sass b/assets/styles/app/main/tools.sass
index 4d1b040b..d44a7eba 100644
--- a/assets/styles/app/main/tools.sass
+++ b/assets/styles/app/main/tools.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #tools
   position: relative
diff --git a/assets/styles/app/maximize.sass b/assets/styles/app/maximize.sass
index 2414ebe4..b8a469c1 100644
--- a/assets/styles/app/maximize.sass
+++ b/assets/styles/app/maximize.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .pro.maximized
   #right
diff --git a/assets/styles/app/misc.sass b/assets/styles/app/misc.sass
index 2b5a7a4a..fbea60a1 100644
--- a/assets/styles/app/misc.sass
+++ b/assets/styles/app/misc.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .display
   display: block !important
diff --git a/assets/styles/app/popup.sass b/assets/styles/app/popup.sass
index 1d8c86ca..ca551bdd 100644
--- a/assets/styles/app/popup.sass
+++ b/assets/styles/app/popup.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .help
   display: inline-block
diff --git a/assets/styles/app/pro.sass b/assets/styles/app/pro.sass
index 2dc3c6b0..09e9e330 100644
--- a/assets/styles/app/pro.sass
+++ b/assets/styles/app/pro.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .pro
   #log-container
@@ -104,7 +104,7 @@
     .group a
       cursor: pointer
 
-  @import "_mixins/all"
+  @import "app/_mixins/all"
 
   #right
     padding-bottom: 80px
diff --git a/assets/styles/app/profile.sass b/assets/styles/app/profile.sass
index ff7c488b..7e234f30 100644
--- a/assets/styles/app/profile.sass
+++ b/assets/styles/app/profile.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #profile
   #main
diff --git a/assets/styles/app/profile/hooks.sass b/assets/styles/app/profile/hooks.sass
index aeaeb318..342040f2 100644
--- a/assets/styles/app/profile/hooks.sass
+++ b/assets/styles/app/profile/hooks.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #profile
   #unadministerable-hooks
diff --git a/assets/styles/app/requests.sass b/assets/styles/app/requests.sass
index cd0227a7..6ed0112b 100644
--- a/assets/styles/app/requests.sass
+++ b/assets/styles/app/requests.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #request
   h3
diff --git a/assets/styles/app/right.sass b/assets/styles/app/right.sass
index 4457762b..b7f96f8d 100644
--- a/assets/styles/app/right.sass
+++ b/assets/styles/app/right.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #profile
   #right
diff --git a/assets/styles/app/right/lists.sass b/assets/styles/app/right/lists.sass
index 0ad786c8..d9240341 100644
--- a/assets/styles/app/right/lists.sass
+++ b/assets/styles/app/right/lists.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #right
   .tabs
diff --git a/assets/styles/app/right/sponsors.sass b/assets/styles/app/right/sponsors.sass
index a4b05d49..afbe2b8c 100644
--- a/assets/styles/app/right/sponsors.sass
+++ b/assets/styles/app/right/sponsors.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #right
   .sponsors
diff --git a/assets/styles/app/stats.sass b/assets/styles/app/stats.sass
index 0a6e72b4..32211b12 100644
--- a/assets/styles/app/stats.sass
+++ b/assets/styles/app/stats.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #repo_count_container,
 #build_count_container
diff --git a/assets/styles/app/status.sass b/assets/styles/app/status.sass
index 8e701646..884a74d1 100644
--- a/assets/styles/app/status.sass
+++ b/assets/styles/app/status.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .status
   display: inline-block
diff --git a/assets/styles/app/tabs.sass b/assets/styles/app/tabs.sass
index 198a1a42..67f616ec 100644
--- a/assets/styles/app/tabs.sass
+++ b/assets/styles/app/tabs.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 .tabs
   height: 29px
diff --git a/assets/styles/app/top.sass b/assets/styles/app/top.sass
index 8f8b9e3a..16f1e7e3 100644
--- a/assets/styles/app/top.sass
+++ b/assets/styles/app/top.sass
@@ -1,4 +1,4 @@
-@import "_mixins/all"
+@import "app/_mixins/all"
 
 #top
   line-height: 60px