diff --git a/README.md b/README.md
index 25e7655..71ee58e 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Spacegray Dark UI theme
+# Solarized Dark UI theme
 
-Port of the [Spacegray](http://kkga.github.io/spacegray) Sublime Text theme to Atom.
+Based on [Spacegray Dark UI](https://github.com/cannikin/spacegray-dark-ui) Atom theme.
 
-![screenshot](http://ridingtheclutch.com.s3.amazonaws.com/images/spacegray.png)
+![screenshot](https://raw.github.com/Rnhmjoj/solarized-dark-ui/master/screenshot.png)
diff --git a/package.json b/package.json
index 0cadaa5..16e5570 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "spacegray-dark-ui",
+  "name": "solarized-dark-ui",
   "theme": "ui",
-  "version": "0.5.0",
-  "description": "Port of the Spacegray Sublime Text theme http://kkga.github.io/spacegray to Atom",
+  "version": "0.0.1",
+  "description": "Solarized Dark UI theme for Atom",
   "license": "MIT",
-  "repository": "https://github.com/cannikin/spacegray-dark-ui",
+  "repository": "https://github.com/rnhmjoj/solarized-dark-ui",
   "engines": {
     "atom": ">0.50.0"
   }
diff --git a/stylesheets/messages.less b/stylesheets/messages.less
index 914737d..477e629 100644
--- a/stylesheets/messages.less
+++ b/stylesheets/messages.less
@@ -2,5 +2,5 @@
 
 ul.background-message {
   font-weight: bold;
-  color: rgba(0, 0, 0, .2);
+  color: @text-color;
 }
diff --git a/stylesheets/tabs.less b/stylesheets/tabs.less
index 42de0a3..399aea7 100644
--- a/stylesheets/tabs.less
+++ b/stylesheets/tabs.less
@@ -28,15 +28,20 @@
     height: @tab-height;
     line-height: @tab-height;
     color: @text-color;
+    border: 1px solid @tab-border-color;
+    border-left: 0;
     padding-left: 0;
     margin-left: 15px;
+    margin-right: 2px;
     transition: color .1s ease-in;
 
     &:before {
       content: '';
       position: absolute;
-      top: 0;
+      top: -1px;
       left: -18px;
+      border: 1px solid @tab-border-color;
+      border-right: 0;
       height: @tab-height;
       width: 40px;
     }
@@ -73,6 +78,7 @@
   .tab.active {
     z-index: 10;
     line-height: @tab-height - 3px;
+    border: 1px solid @tab-border-color-active;
     color: @text-color-highlight;
 
     .title{
@@ -87,8 +93,12 @@
 
     &, &:before {
       background-color: @tab-background-color-active;
+      border: 1px solid @tab-border-color-active;
       height: @tab-height;
     }
+    &:before {
+      border-right: 0;        
+    }
 
   }
 
diff --git a/stylesheets/tree-view.less b/stylesheets/tree-view.less
index 9a0cc33..4c9b319 100644
--- a/stylesheets/tree-view.less
+++ b/stylesheets/tree-view.less
@@ -13,7 +13,7 @@
     .selected > .name:before,
     .selected > .list-item > .name,
     .selected > .list-item > .name:before {
-      color: #fff !important;
+      color: @text-color-highlight !important;
     }
   }
 }
diff --git a/stylesheets/ui-variables.less b/stylesheets/ui-variables.less
index daffef6..43d375a 100644
--- a/stylesheets/ui-variables.less
+++ b/stylesheets/ui-variables.less
@@ -1,14 +1,14 @@
 // Colors
 
-@text-color: rgb(101, 115, 127);
-@text-color-subtle: #484F5A;
-@text-color-highlight: rgb(192,197,206);
-@text-color-selected: rgb(223, 225, 232);
+@text-color: #657b83;
+@text-color-subtle: #93a1a1;
+@text-color-highlight: #93a1a1;
+@text-color-selected: #586e75;
 
-@text-color-info: #5786B8;
-@text-color-success: #68A281;
-@text-color-warning: #AA8A69;
-@text-color-error: #9B4444;
+@text-color-info: #657b83;
+@text-color-success: #859900;
+@text-color-warning: #b58900;
+@text-color-error: #cb4b16;
 
 @text-color-ignored: @text-color-subtle;
 @text-color-added: @text-color-success;
@@ -21,11 +21,11 @@
 @background-color-warning: #ffaa2c;
 @background-color-error: #c00;
 @background-color-highlight: rgba(255, 255, 255, 0.07);
-@background-color-selected: #343D46;
+@background-color-selected: #082933;
 
-@tree-background-color: #232830;
+@tree-background-color: #00212b;
 
-@app-background-color: #2B303B;
+@app-background-color: #002b36;
 
 @base-background-color: lighten(@tool-panel-background-color, 5%);
 @base-border-color: rgba(0, 0, 0, 0.5);
@@ -33,13 +33,13 @@
 @pane-item-background-color: @base-background-color;
 @pane-item-border-color: rgba(0, 0, 0, 0.5);
 
-@input-background-color: #1C1F26;
+@input-background-color: #073642;
 @input-border-color: @base-border-color;
 
-@tool-panel-background-color: #1C1F26;
+@tool-panel-background-color: #00212b;
 @tool-panel-border-color: transparent;
 
-@inset-panel-background-color: #161719;
+@inset-panel-background-color: #1a1e24;
 @inset-panel-border-color: @base-border-color;
 
 @panel-heading-background-color: #43484d;
@@ -48,16 +48,17 @@
 @overlay-background-color: @tool-panel-background-color;
 @overlay-border-color: @background-color-highlight;
 
-@button-background-color: #1C1F26;
-@button-background-color-hover: #1C1F26;
-@button-background-color-selected: #1C1F26;
+@button-background-color: #073642;
+@button-background-color-hover: #073642;
+@button-background-color-selected: #073642;
 @button-border-color: transparent;
 
-@tab-bar-background-color: rgb(28, 31, 38);
+@tab-bar-background-color: #002b36;
 @tab-bar-border-color: transparent;
-@tab-background-color: #1C1F26;
-@tab-background-color-active: rgb(43, 48, 59);
-@tab-border-color: transparent;
+@tab-background-color: transparent;
+@tab-background-color-active: #294a55;
+@tab-border-color: @tool-panel-background-color;
+@tab-border-color-active: #3f616b;
 
 @tree-view-background-color: @tool-panel-background-color;
 @tree-view-border-color: @tool-panel-border-color;
@@ -81,7 +82,7 @@
 @component-line-height: 25px;
 @component-border-radius: 2px;
 
-@tab-height: 30px;
+@tab-height: 36px;
 
 
 // Other