diff --git a/index.less b/index.less
index 7e91d73..038ec47 100644
--- a/index.less
+++ b/index.less
@@ -1,15 +1,17 @@
 @import "stylesheets/atom";
-@import "stylesheets/utilities";
-@import "stylesheets/text";
-@import "stylesheets/git";
-@import "stylesheets/sites";
-@import "stylesheets/progress";
 @import "stylesheets/buttons";
-@import "stylesheets/panels";
-@import "stylesheets/panes";
+@import "stylesheets/editor";
+@import "stylesheets/git";
 @import "stylesheets/lists";
 @import "stylesheets/overlays";
-@import "stylesheets/editor";
+@import "stylesheets/panels";
+@import "stylesheets/panes";
+@import "stylesheets/progress";
+@import "stylesheets/sites";
 @import "stylesheets/tabs";
+@import "stylesheets/text";
 @import "stylesheets/tooltips";
+@import "stylesheets/utilities";
+
+
 @import "stylesheets/tree-view";
diff --git a/stylesheets/lists.less b/stylesheets/lists.less
index 86a2a37..63aad2f 100644
--- a/stylesheets/lists.less
+++ b/stylesheets/lists.less
@@ -21,17 +21,18 @@
   .generate-list-item-text-color(error);
   .generate-list-item-text-color(selected);
 
-  .generate-list-item-status-color(@textClass, @status) {
+  .generate-list-item-status-color(@color, @status) {
     li:not(.list-nested-item).status-@{status},
     li.list-nested-item.status-@{status} > .list-item {
-      .text(@textClass);
+      color: @color;
     }
   }
-  .generate-list-item-status-color(subtle, ignored);
-  .generate-list-item-status-color(info, added);
-  .generate-list-item-status-color(success, renamed);
-  .generate-list-item-status-color(warning, modified);
-  .generate-list-item-status-color(error, removed);
+
+  .generate-list-item-status-color(@text-color-subtle, ignored);
+  .generate-list-item-status-color(@text-color-added, added);
+  .generate-list-item-status-color(@text-color-renamed, renamed);
+  .generate-list-item-status-color(@text-color-modified, modified);
+  .generate-list-item-status-color(@text-color-removed, removed);
 
   li:not(.list-nested-item).selected,
   li.list-nested-item.selected > .list-item {
diff --git a/stylesheets/tree-view.less b/stylesheets/tree-view.less
index 9821977..fa03ea0 100644
--- a/stylesheets/tree-view.less
+++ b/stylesheets/tree-view.less
@@ -1,60 +1,32 @@
 @import "ui-variables";
 
-.tree-view, {
-	font-size: @font-size;
-	background: @tree-view-background-color;
+.tree-view {
+  font-size: @font-size;
+  background: @tree-view-background-color;
 
-	.selected:before {
-		background: #333;
-		box-shadow: inset -3px 0px 0 rgba(0,0,0, .05);
-	}
+  .selected:before {
+  	background: #444;
+    box-shadow: inset -3px 0 0 rgba(0,0,0, .05);
+  }
 }
 
 .focusable-panel {
-	opacity: 1;
-	background: #222;
-	box-shadow: inset -3px 0px 0 rgba(0,0,0, .05);
+  opacity: 1;
+  background: #303030;
+  box-shadow: inset -3px 0 0 rgba(0,0,0, .05);
 
-	.icon:before {
-		color: #ccc;
-	}
+  &:focus {
+    background: #282828;
 
-	.name {
-		color: #999;
-	}
+    .selected:before {
+      background: @background-color-selected;
+    }
 
-	&:focus {
-
-		.icon:before {
-			color: #ccc;
-		}
-
-		.name {
-			color: #fff;
-		}
-
-		.selected:before {
-			box-shadow: inset 0 1px 0 darken(@background-color-selected, 20%), inset 0 -1px 0 darken(@background-color-selected, 20%);
-			background: @background-color-selected;
-		}
-
-		.selected > .list-item > .name,
-		.selected  > .list-item > .name:before,
-		.selected > .name,
-		.selected > .name:before {
-			color: #fff !important;
-		}
-	}
+    .selected > .name,
+    .selected > .name:before,
+    .selected > .list-item > .name,
+    .selected > .list-item > .name:before {
+      color: #fff !important;
+    }
+  }
 }
-
-.status-modified .name, .status-modified .name:before {
-	color: @text-color-modified !important;
-}
-
-.status-added .name, .status-added .name:before {
-	color: @text-color-added !important;
-}
-
-.status-renamed .name, .status-renamed .name:before {
-	color: @text-color-renamed !important;
-}
\ No newline at end of file
diff --git a/stylesheets/ui-variables.less b/stylesheets/ui-variables.less
index 117ea2f..c76e73f 100644
--- a/stylesheets/ui-variables.less
+++ b/stylesheets/ui-variables.less
@@ -6,14 +6,15 @@
 @text-color-selected: @text-color-highlight;
 
 @text-color-info: #5293d8;
-@text-color-success: #1fe977;
-@text-color-warning: #f78a46;
+@text-color-success: #529b2f;
+@text-color-warning: #ff982d;
 @text-color-error: #c00;
 
-@text-color-modified: #ff982d;
-@text-color-added: #529b2f;
-@text-color-ignored: #999;
-@text-color-renamed: #5293d8;
+@text-color-ignored: @text-color-subtle;
+@text-color-added: @text-color-success;
+@text-color-renamed: @text-color-info;
+@text-color-modified: @text-color-warning;
+@text-color-removed: @text-color-error;
 
 @background-color-info: #0098ff;
 @background-color-success: #17ca65;