diff --git a/app/assets/stylesheets/active_admin/_base.css.scss b/app/assets/stylesheets/active_admin/_base.css.scss
index ad5ed57ecc7..3943385edaf 100644
--- a/app/assets/stylesheets/active_admin/_base.css.scss
+++ b/app/assets/stylesheets/active_admin/_base.css.scss
@@ -1,6 +1,7 @@
 /* Active Admin CSS */
 
 // Reset Away!
+@import "active_admin/mixins";
 @include global-reset;
 
 // Partials
@@ -35,4 +36,4 @@ body {
   margin: 0;
   padding: 0;
   color: $text-color;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/_forms.css.scss b/app/assets/stylesheets/active_admin/_forms.css.scss
index e8a526da202..f864379f77a 100644
--- a/app/assets/stylesheets/active_admin/_forms.css.scss
+++ b/app/assets/stylesheets/active_admin/_forms.css.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 // -------------------------------------- Active Admin Forms
 form {
   /* Reset margins & Padding */
diff --git a/app/assets/stylesheets/active_admin/_header.css.scss b/app/assets/stylesheets/active_admin/_header.css.scss
index 9dabe4e0de2..e5e55c9e4df 100644
--- a/app/assets/stylesheets/active_admin/_header.css.scss
+++ b/app/assets/stylesheets/active_admin/_header.css.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 // ----------------------------------- Header 
 #header { 
   @include primary-gradient;
diff --git a/app/assets/stylesheets/active_admin/_typography.css.scss b/app/assets/stylesheets/active_admin/_typography.css.scss
index f12389f4761..841d34cd402 100644
--- a/app/assets/stylesheets/active_admin/_typography.css.scss
+++ b/app/assets/stylesheets/active_admin/_typography.css.scss
@@ -23,6 +23,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
+@import "active_admin/mixins/variables";
+
 // Default font settings.  The font-size percentage is of 16px. (0.75 * 16px = 12px) */
 html { font-size:100.01%; }
 body { font-size: 75%; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; }
diff --git a/app/assets/stylesheets/active_admin/components/_blank_slates.scss b/app/assets/stylesheets/active_admin/components/_blank_slates.scss
index a0c0203f54e..37fae51b0c2 100644
--- a/app/assets/stylesheets/active_admin/components/_blank_slates.scss
+++ b/app/assets/stylesheets/active_admin/components/_blank_slates.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 .blank_slate_container {
   clear: both;
   text-align: center;
@@ -28,4 +30,4 @@
 
 .with_sidebar .blank_slate_container .blank_slate {
   margin-top: 80px;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/components/_breadcrumbs.scss b/app/assets/stylesheets/active_admin/components/_breadcrumbs.scss
index 164053fff82..2a18b6da51e 100644
--- a/app/assets/stylesheets/active_admin/components/_breadcrumbs.scss
+++ b/app/assets/stylesheets/active_admin/components/_breadcrumbs.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 .breadcrumb {
   display: block;
   font-size: 0.9em;
diff --git a/app/assets/stylesheets/active_admin/components/_buttons.scss b/app/assets/stylesheets/active_admin/components/_buttons.scss
index e95e848ae18..2a4f1b7269e 100644
--- a/app/assets/stylesheets/active_admin/components/_buttons.scss
+++ b/app/assets/stylesheets/active_admin/components/_buttons.scss
@@ -1,3 +1,4 @@
+@import "active_admin/mixins";
 
 td, p {
   @include icon(#B3BCC1, 0.8em);
@@ -9,4 +10,4 @@ a.member_link {
   white-space: nowrap;
 }
 
-a.button, a:link.button, a:visited.button, input[type=submit] { @include dark-button; }
\ No newline at end of file
+a.button, a:link.button, a:visited.button, input[type=submit] { @include dark-button; }
diff --git a/app/assets/stylesheets/active_admin/components/_comments.css.scss b/app/assets/stylesheets/active_admin/components/_comments.css.scss
index 43dd47760a3..7c3408ab0fe 100644
--- a/app/assets/stylesheets/active_admin/components/_comments.css.scss
+++ b/app/assets/stylesheets/active_admin/components/_comments.css.scss
@@ -1,3 +1,6 @@
+@import "active_admin/mixins";
+@import "active_admin/mixins/variables";
+
 // -------------------------------------- Admin Notes 
 .comments {
 
diff --git a/app/assets/stylesheets/active_admin/components/_date_picker.css.scss b/app/assets/stylesheets/active_admin/components/_date_picker.css.scss
index fa10566722a..18a6e66948e 100644
--- a/app/assets/stylesheets/active_admin/components/_date_picker.css.scss
+++ b/app/assets/stylesheets/active_admin/components/_date_picker.css.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 // -------------------------------------- Date Picker 
 .ui-datepicker {
   background: #fff;
@@ -120,4 +122,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/components/_flash_messages.css.scss b/app/assets/stylesheets/active_admin/components/_flash_messages.css.scss
index f2e319981eb..0b48b32ee8e 100644
--- a/app/assets/stylesheets/active_admin/components/_flash_messages.css.scss
+++ b/app/assets/stylesheets/active_admin/components/_flash_messages.css.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 body.logged_in {
   .flash {
     @include gradient(#f7f1d3, #f5edc5);
@@ -36,4 +38,4 @@ body.logged_out {
     margin-bottom: 10px;
     padding: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/components/_grid.scss b/app/assets/stylesheets/active_admin/components/_grid.scss
index da9936e57e0..2a638ff7a31 100644
--- a/app/assets/stylesheets/active_admin/components/_grid.scss
+++ b/app/assets/stylesheets/active_admin/components/_grid.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 // -------------------------------------- Index as Grid 
 table.index_grid td { border: none; background: none; padding: 0 20px 20px 0; margin: 0;}
 
@@ -6,4 +8,4 @@ table.index_grid td { border: none; background: none; padding: 0 20px 20px 0; ma
   clear: both;
   padding: 0;
   .column { float: left; }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/components/_links.scss b/app/assets/stylesheets/active_admin/components/_links.scss
index 0e6a62c2d24..55ef118f4f3 100644
--- a/app/assets/stylesheets/active_admin/components/_links.scss
+++ b/app/assets/stylesheets/active_admin/components/_links.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 a, a:link, a:visited {
   color: $link-color;
   text-decoration: underline;
diff --git a/app/assets/stylesheets/active_admin/components/_pagination.scss b/app/assets/stylesheets/active_admin/components/_pagination.scss
index 95a697e5467..45b482bd360 100644
--- a/app/assets/stylesheets/active_admin/components/_pagination.scss
+++ b/app/assets/stylesheets/active_admin/components/_pagination.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 .paginated_collection_contents { 
   clear: both;
 }
diff --git a/app/assets/stylesheets/active_admin/components/_panels.scss b/app/assets/stylesheets/active_admin/components/_panels.scss
index a515f5a8d43..ae3cd35c52e 100644
--- a/app/assets/stylesheets/active_admin/components/_panels.scss
+++ b/app/assets/stylesheets/active_admin/components/_panels.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 // ----------------------------------- Helper class to apply to elements to make them sections
 .section, .panel{ @include section; }
 
diff --git a/app/assets/stylesheets/active_admin/components/_scopes.scss b/app/assets/stylesheets/active_admin/components/_scopes.scss
index 2f3879664f8..52dfa6f46a4 100644
--- a/app/assets/stylesheets/active_admin/components/_scopes.scss
+++ b/app/assets/stylesheets/active_admin/components/_scopes.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 .scopes {
   li {
     .count {
@@ -7,4 +9,4 @@
       line-height: 10px;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/components/_status_tags.scss b/app/assets/stylesheets/active_admin/components/_status_tags.scss
index f802ab487ed..31063154763 100644
--- a/app/assets/stylesheets/active_admin/components/_status_tags.scss
+++ b/app/assets/stylesheets/active_admin/components/_status_tags.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 .status {
   background: darken($secondary-color, 15%);
   color: #fff;
diff --git a/app/assets/stylesheets/active_admin/components/_table_tools.css.scss b/app/assets/stylesheets/active_admin/components/_table_tools.css.scss
index 44cd8d92bdd..61a71c7103d 100644
--- a/app/assets/stylesheets/active_admin/components/_table_tools.css.scss
+++ b/app/assets/stylesheets/active_admin/components/_table_tools.css.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 .table_tools {
   display: block;
   margin-bottom: 14px;
@@ -98,4 +100,4 @@ a.table_tools_button {
     }
   }
   
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/components/_tables.css.scss b/app/assets/stylesheets/active_admin/components/_tables.css.scss
index 1084e0afb3a..e173cbc196a 100644
--- a/app/assets/stylesheets/active_admin/components/_tables.css.scss
+++ b/app/assets/stylesheets/active_admin/components/_tables.css.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 // ----------------------------------- Tables 
 
 table tr {
@@ -16,7 +18,6 @@ table.index_table {
 
   th { 
     @include section-header;
-    border-right: none;
     text-align: left;
     padding-left: $cell-horizontal-padding;
     padding-right: $cell-horizontal-padding;
@@ -25,7 +26,6 @@ table.index_table {
       color: $section-header-text-color;
       text-decoration: none;
       display: block;
-      white-space: nowrap;
     }
 
     &.sortable a {
@@ -37,20 +37,12 @@ table.index_table {
 
     &.sorted-asc, &.sorted-desc {
       @include gradient(darken($secondary-gradient-start, 5%), darken($secondary-gradient-stop, 5%));
+      border-bottom: 1px solid $secondary-gradient-stop;
     }
-    
-    &:last-child {
-      border-right: solid 1px #d4d4d4;
-    }
-    
   }
 
   tr.even td { background: $table-stripe-color; }
 
-  tr.selected td {
-    background: $table-selected-color;
-  }
-
   td {
     padding: 10px $cell-horizontal-padding 8px $cell-horizontal-padding;
     border-bottom: 1px solid #e8e8e8;
@@ -74,34 +66,3 @@ table.index_table {
   tr.odd td { background: darken($table-stripe-color, 3%); }
   tr.even td { background: $table-stripe-color; }
 }
-
-// -------------------------------------- Resource Attributes Table 
-.attributes_table { overflow: hidden; }
-
-.attributes_table table {
-  th, td {
-    padding: 8px $cell-horizontal-padding 6px $cell-horizontal-padding;
-    vertical-align: top;
-    border-bottom: 1px solid #e8e8e8; 
-  }
-  th {
-    @include no-shadow;
-    @include no-gradient;
-    width: 150px;
-    font-size: 0.9em;
-    padding-left: 0;
-    text-transform: uppercase;
-    color: $primary-color;
-    @include text-shadow;
-  }
-  td {
-    .empty {
-      color: #bbb;
-      font-size: 0.8em;
-      text-transform: uppercase;
-      letter-spacing: 0.2em;
-    }
-  }
-}
-
-.sidebar_section .attributes_table th { width: 50px; }
\ No newline at end of file
diff --git a/app/assets/stylesheets/active_admin/mixins/_buttons.css.scss b/app/assets/stylesheets/active_admin/mixins/_buttons.css.scss
index feaebc2713e..62a9a5f9664 100644
--- a/app/assets/stylesheets/active_admin/mixins/_buttons.css.scss
+++ b/app/assets/stylesheets/active_admin/mixins/_buttons.css.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins/utilities";
+
 @mixin default-button {
   @include gradient(lighten($primary-color, 15%), darken($primary-color, 12%));
   @include rounded(200px);
diff --git a/app/assets/stylesheets/active_admin/mixins/_utilities.scss b/app/assets/stylesheets/active_admin/mixins/_utilities.scss
index 8ccc582d00d..53e9aacb85e 100644
--- a/app/assets/stylesheets/active_admin/mixins/_utilities.scss
+++ b/app/assets/stylesheets/active_admin/mixins/_utilities.scss
@@ -16,11 +16,10 @@
   box-sizing: $value;
 }
 
-
 @mixin border-colors($top, $sides, $bottom) {
   border-color: $sides;
   border-top-color: $top;
   border-right-color: $sides;
   border-bottom-color: $bottom;
   border-left-color: $sides;
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/pages/_dashboard.scss b/app/assets/stylesheets/active_admin/pages/_dashboard.scss
index 102b2085005..71ee00de186 100644
--- a/app/assets/stylesheets/active_admin/pages/_dashboard.scss
+++ b/app/assets/stylesheets/active_admin/pages/_dashboard.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 table.dashboard {
   width: 100%; 
   td { border-bottom: none; }
diff --git a/app/assets/stylesheets/active_admin/pages/_logged_out.scss b/app/assets/stylesheets/active_admin/pages/_logged_out.scss
index a45c9861084..42aca877383 100644
--- a/app/assets/stylesheets/active_admin/pages/_logged_out.scss
+++ b/app/assets/stylesheets/active_admin/pages/_logged_out.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 body.logged_out {
   background: #e8e9ea;
 
@@ -41,4 +43,4 @@ body.logged_out {
     a { float: right; margin-top: -32px; }
   }
 
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/structure/_main_structure.scss b/app/assets/stylesheets/active_admin/structure/_main_structure.scss
index 4e80cdb3477..cda3afc7a04 100644
--- a/app/assets/stylesheets/active_admin/structure/_main_structure.scss
+++ b/app/assets/stylesheets/active_admin/structure/_main_structure.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins/variables";
+
 #wrapper {
   display: table;
   width: 100%;
@@ -23,4 +25,4 @@
     width: $sidebar-width; 
     margin-left: -$sidebar-width;
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/active_admin/structure/_title_bar.scss b/app/assets/stylesheets/active_admin/structure/_title_bar.scss
index 8d446db911f..af0d1342190 100644
--- a/app/assets/stylesheets/active_admin/structure/_title_bar.scss
+++ b/app/assets/stylesheets/active_admin/structure/_title_bar.scss
@@ -1,3 +1,5 @@
+@import "active_admin/mixins";
+
 #title_bar {
   @include section-header;
   @include clearfix;
@@ -41,4 +43,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}