diff --git a/themes/atom-light-ui/archive-view.less b/themes/atom-light-ui/archive-view.less
index 586c20836..2dc9e2b8c 100644
--- a/themes/atom-light-ui/archive-view.less
+++ b/themes/atom-light-ui/archive-view.less
@@ -1,15 +1,17 @@
+@import "ui-colors";
+
 .archive-view {
-  background-color: #e5e5e5;
-  color: #444;
+  background-color: @background-color-1;
+  color: @text-color-2;
 
   .selected {
     background-color: rgba(255, 255, 134, 0.34);
-    color: #333;
+    color: @text-color-1;
   }
 
   .summary {
     padding: 5px;
-    background-image: -webkit-linear-gradient(#e7e7e7, #cfcfcf);
+    background-image: -webkit-linear-gradient(@background-color-1, #cfcfcf);
     border-top: 1px solid rgba(0, 0, 0, 0.2);
     border-bottom: 1px solid rgba(0, 0, 0, 0.2);
     box-shadow:
diff --git a/themes/atom-light-ui/blurred.less b/themes/atom-light-ui/blurred.less
index 3dd2e825d..b22f2f63b 100644
--- a/themes/atom-light-ui/blurred.less
+++ b/themes/atom-light-ui/blurred.less
@@ -1,3 +1,5 @@
+@import "ui-colors";
+
 .is-blurred {
   .tree-view {
     background: #f3f3f3;
@@ -24,14 +26,14 @@
   }
 
   .tab {
-    background-image: -webkit-linear-gradient(#e7e7e7, #cfcfcf);
+    background-image: -webkit-linear-gradient(@background-color-1, #cfcfcf);
     box-shadow:
       inset 0 1px 0 rgba(255, 255, 255, 0.5), /* top hightlight */
       inset 1px 0 0 rgba(255, 255, 255, 0.3), /* left highlight */
       inset 0 -1px 0 rgba(255, 255, 255, 0.2), /* bottom shadow */
       inset -1px 0 0 rgba(0, 0, 0, 0.2), /* right shadow */
       inset -2px 0 0 rgba(255, 255, 255, 0.1); /* right hightlight */
-    color: #777;
+    color: @text-color-subtle-1;
 
     .close-icon {
       color: #8d8d8d;
diff --git a/themes/atom-light-ui/command-logger.less b/themes/atom-light-ui/command-logger.less
index 56822c247..fdb8675ec 100644
--- a/themes/atom-light-ui/command-logger.less
+++ b/themes/atom-light-ui/command-logger.less
@@ -20,7 +20,7 @@
 .command-logger .tree-map {
   margin: auto;
   background-color: #efefef;
-  border: 1px solid #999;
+  border: 1px solid @border-color-2;
 }
 
 body.command-logger-node-text {
diff --git a/themes/atom-light-ui/command-panel.less b/themes/atom-light-ui/command-panel.less
index 5c409b5b8..0cb77748f 100644
--- a/themes/atom-light-ui/command-panel.less
+++ b/themes/atom-light-ui/command-panel.less
@@ -1,14 +1,15 @@
+@import "ui-colors";
 @import "bootstrap/less/mixins.less";
 
 .command-panel {
-  background-color: #e5e5e5;
+  background-color: @background-color-1;
   border-top: 1px solid #979797;
   color: #ededed;
   padding: 10px;
 
   .btn {
     .btn-pseudo-states(#cbcbcb, #b3b3b3);
-    color: #444;
+    color: @text-color-2;
 
     &:hover,
     &:focus {
@@ -32,21 +33,21 @@
 .command-panel .preview-list {
   background-color: #e3e3e3;
   color: #222;
-  border: 1px solid #999;
+  border: 1px solid @border-color-2;
 }
 
 .command-panel .preview-count {
-  color: #333;
+  color: @text-color-1;
   font-weight: bold;
   text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
 }
 
 .command-panel .expand-collapse {
-  color: #333;
+  color: @text-color-1;
 }
 
 .command-panel .expand-collapse li {
-  color: #555;
+  color: @text-color-3;
   background: -webkit-linear-gradient(#cbcbcb, #b3b3b3);
   box-shadow:
     inset -1px -1px 0 rgba(255, 255, 255, 0.5),
@@ -68,20 +69,20 @@
 }
 
 .command-panel .preview-list .path {
-  color: #333;
-  border-top: 1px solid #ccc;
+  color: @text-color-1;
+  border-top: 1px solid @border-color-1;
 }
 
 .command-panel .preview-list .path:hover .path-name {
-  color: #333;
+  color: @text-color-1;
 }
 
 .command-panel .preview-list .path:before {
-  color: #555;
+  color: @text-color-3;
 }
 
 .command-panel .preview-list .path:hover:before {
-  color: #333;
+  color: @text-color-1;
 }
 
 .command-panel .preview-list .path:first-child {
@@ -89,12 +90,12 @@
 }
 
 .command-panel .preview-list .line-number {
-  color: #777;
+  color: @text-color-subtle-1;
   font-family: monospace;
 }
 
 .command-panel .preview-list .path-match-number {
-  color: #777;
+  color: @text-color-subtle-1;
 }
 
 .command-panel .preview-list .preview {
@@ -102,21 +103,21 @@
 }
 
 .command-panel .preview-list .preview .match {
-  background-color: #0086ca;
-  color: #fff;
+  background-color: @accent-color-info-1;
+  color: @text-alt-color-1;
 }
 
 .command-panel .preview-list li.operation {
-  color: #777;
+  color: @text-color-subtle-1;
 }
 
 .command-panel .preview-list li.operation:hover,
 .command-panel li.operation.selected .preview {
-  color: #333;
+  color: @text-color-1;
 }
 
 .error-messages {
-  color: #333;
+  color: @text-color-1;
 }
 
 .error .error-messages {
diff --git a/themes/atom-light-ui/editor.less b/themes/atom-light-ui/editor.less
index f766fb141..f7b8a16ac 100644
--- a/themes/atom-light-ui/editor.less
+++ b/themes/atom-light-ui/editor.less
@@ -1,9 +1,11 @@
+@import "ui-colors";
+
 .editor.mini {
   border: 1px solid rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(180, 180, 180, 0.3);
   border-right: 1px solid rgba(180, 180, 180, 0.3);
   background-color: #aaa;
-  color: #333;
+  color: @text-color-1;
 }
 
 .editor.mini .selection .region {
diff --git a/themes/atom-light-ui/image-view.less b/themes/atom-light-ui/image-view.less
index 5f256ad37..584f67016 100644
--- a/themes/atom-light-ui/image-view.less
+++ b/themes/atom-light-ui/image-view.less
@@ -3,5 +3,5 @@
 }
 
 .image-view img {
-  border-color: #ccc;
+  border-color: @border-color-1;
 }
diff --git a/themes/atom-light-ui/overlay.less b/themes/atom-light-ui/overlay.less
index f789ada7d..3c4e744a9 100644
--- a/themes/atom-light-ui/overlay.less
+++ b/themes/atom-light-ui/overlay.less
@@ -1,6 +1,8 @@
+@import "ui-colors";
+
 .overlay {
-  background-color: #e5e5e5;
+  background-color: @background-color-1;
   border-top: 1px solid #979797;
-  color: #333;
+  color: @text-color-1;
   padding: 10px;
 }
diff --git a/themes/atom-light-ui/select-list.less b/themes/atom-light-ui/select-list.less
index f53f7b8ba..df867e4b7 100644
--- a/themes/atom-light-ui/select-list.less
+++ b/themes/atom-light-ui/select-list.less
@@ -1,5 +1,7 @@
+@import "ui-colors";
+
 .select-list {
-  background-color: #e5e5e5;
+  background-color: @background-color-1;
   border: 1px solid #c6c6c6;
   color: #323232;
   box-shadow: 0 0 10px #555;
@@ -10,7 +12,7 @@
   }
 
   .loading {
-    color: #333;
+    color: @text-color-1;
   }
 
   ol {
@@ -18,7 +20,7 @@
 
     li {
       background-color: #f5f5f5;
-      border-bottom: 1px solid #ccc;
+      border-bottom: 1px solid @border-color-1;
     }
 
     li:hover {
@@ -40,15 +42,15 @@
 
     .right,
     .secondary-line {
-      color: #777;
+      color: @text-color-subtle-1;
     }
 
     .modified {
-      color: #f78a46;
+      color: @accent-color-error-1;
     }
 
     .new {
-      color: #5293d8;
+      color: @accent-color-info-1;
     }
   }
 }
diff --git a/themes/atom-light-ui/status-bar.less b/themes/atom-light-ui/status-bar.less
index 2ef7d2ae9..3b8083202 100644
--- a/themes/atom-light-ui/status-bar.less
+++ b/themes/atom-light-ui/status-bar.less
@@ -1,21 +1,23 @@
+@import "ui-colors";
+
 .status-bar {
-  background-color: #e5e5e5;
+  background-color: @background-color-1;
   border-top: 1px solid #959595;
-  color: #333;
+  color: @text-color-1;
 }
 
 .status-bar .git-status.octicons.modified-status-icon {
-  color: #f78a46;
+  color: @accent-color-error-1;
   display: inline-block;
 }
 
 .status-bar .git-status.octicons.new-status-icon {
-  color: #5293d8;
+  color: @accent-color-info-1;
   display: inline-block;
 }
 
 .status-bar .git-status.octicons.ignored-status-icon {
-  color: #333;
+  color: @text-color-1;
   display: inline-block;
 }
 
diff --git a/themes/atom-light-ui/tabs.less b/themes/atom-light-ui/tabs.less
index 18e416d17..e53e878df 100644
--- a/themes/atom-light-ui/tabs.less
+++ b/themes/atom-light-ui/tabs.less
@@ -1,3 +1,5 @@
+@import "ui-colors";
+
 .tabs {
   background: #e1e1e1;
   border: none;
@@ -7,8 +9,8 @@
 
 .tab {
   margin: 0 0 1px 0;
-  background-image: -webkit-linear-gradient(#e7e7e7, #cfcfcf);
-  color: #444;
+  background-image: -webkit-linear-gradient(@background-color-1, #cfcfcf);
+  color: @text-color-2;
   text-shadow: 1px 1px rgba(255, 255, 255, 0.1);
   box-shadow:
     inset 0 1px 0 rgba(255, 255, 255, 0.5), /* top hightlight */
diff --git a/themes/atom-light-ui/tree-view.less b/themes/atom-light-ui/tree-view.less
index 452cabb28..c616b3a92 100644
--- a/themes/atom-light-ui/tree-view.less
+++ b/themes/atom-light-ui/tree-view.less
@@ -1,3 +1,5 @@
+@import "ui-colors";
+
 .tree-view {
   background: #dde3e8;
 }
@@ -15,7 +17,8 @@
   color: #262626;
 }
 
-.tree-view .selected > .highlight {
+.tree-view .selected > .highlight,
+.tree-view .entry:hover > .highlight, {
   box-sizing: border-box;
   border-top: 1px solid #97a4a7;
   border-bottom: 1px solid #97a4a7;
@@ -67,22 +70,22 @@
 }
 
 .tree-view .ignored {
-  color: #555;
+  color: @text-color-3;
 }
 
 .tree-view .modified {
-  color: #f78a46;
+  color: @accent-color-error-1;
 }
 
 .tree-view .new {
-  color: #5293d8;
+  color: @accent-color-info-1;
 }
 
 .tree-view-dialog {
-  background-color: #e7e7e7;
+  background-color: @background-color-1;
   border-top: 1px solid #989898;
 }
 
 .tree-view-dialog .prompt {
-  color: #333;
+  color: @text-color-1;
 }
diff --git a/themes/atom-light-ui/ui-colors.less b/themes/atom-light-ui/ui-colors.less
index 98454f9a9..c85d21271 100644
--- a/themes/atom-light-ui/ui-colors.less
+++ b/themes/atom-light-ui/ui-colors.less
@@ -1 +1,47 @@
-@background-color-1: #f4f4f4;
\ No newline at end of file
+// Most common to least common
+@text-color-1: #333;
+@text-color-2: #444;
+@text-color-3: #555;
+
+// For dark bg things
+@text-alt-color-1: #fff;
+@text-alt-color-2: #fff;
+@text-alt-color-3: #fff;
+
+// Number increase is more subtle
+@text-color-subtle-1: #777;
+@text-color-subtle-2: #999;
+@text-color-subtle-3: #ccc;
+
+// Main bg you should use, a darker alt, and a lighter alt
+@background-color-1: #e5e5e5;
+@background-color-2: #dde3e8;
+@background-color-3: #f9f9f9;
+
+// Highlight color for background corresponding in index to background-color
+@background-highlight-color-1: #f9f9f9;
+@background-highlight-color-2: #cad5d8;
+@background-highlight-color-3: #e2e2e2;
+
+// Border color for background corresponding in index to background-color.
+@border-color-1: #ccc;
+@border-color-2: #999;
+@border-color-3: #ccc;
+
+// Bright color, darker then lighter.
+// Info colors are generally blue
+@accent-color-info-1: #0098ff;
+@accent-color-info-2: #5293d8;
+@accent-color-info-3: #66a6ff;
+
+// Bright color, darker then lighter.
+// Error colors are generally red/orange
+@accent-color-error-1: #ff4800;
+@accent-color-error-2: #f78a46;
+@accent-color-error-3: #ffa275;
+
+// Bright color, darker then lighter.
+// Success colors are generally red/orange
+@accent-color-success-1: #1fe977;
+@accent-color-success-2: #17ca65;
+@accent-color-success-3: #58f79d;