diff --git a/style/variables.scss b/style/variables.scss
index 2bbbdd3..6b481d5 100644
--- a/style/variables.scss
+++ b/style/variables.scss
@@ -372,7 +372,7 @@ $solarized-base025: color.mix($solarized-base03, $solarized-base02, 50%);
   --jp-mirror-editor-keyword-color: #{$solarized-green};
   --jp-mirror-editor-atom-color: #{$solarized-blue};
   --jp-mirror-editor-number-color: #{$solarized-magenta};
-  --jp-mirror-editor-def-color: #{$solarized-red};
+  --jp-mirror-editor-def-color: #{$solarized-blue};
   --jp-mirror-editor-variable-color: #{$solarized-base0};
   --jp-mirror-editor-variable-2-color: #{$solarized-base00};
   --jp-mirror-editor-variable-3-color: #{$solarized-base01};
@@ -381,17 +381,17 @@ $solarized-base025: color.mix($solarized-base03, $solarized-base02, 50%);
   --jp-mirror-editor-operator-color: #{$solarized-base0};
   --jp-mirror-editor-comment-color: #{$solarized-base01};
   --jp-mirror-editor-string-color: #{$solarized-cyan};
-  --jp-mirror-editor-string-2-color: #f50;
-  --jp-mirror-editor-meta-color: #a2f;
+  --jp-mirror-editor-string-2-color: #{$solarized-orange};
+  --jp-mirror-editor-meta-color: #{$solarized-magenta};
   --jp-mirror-editor-qualifier-color: #555;
-  --jp-mirror-editor-builtin-color: var(--md-green-600);
+  --jp-mirror-editor-builtin-color: #{$solarized-green};
   --jp-mirror-editor-bracket-color: #997;
-  --jp-mirror-editor-tag-color: var(--md-green-700);
-  --jp-mirror-editor-attribute-color: var(--md-blue-700);
-  --jp-mirror-editor-header-color: var(--md-blue-500);
-  --jp-mirror-editor-quote-color: var(--md-green-300);
-  --jp-mirror-editor-link-color: var(--md-blue-700);
-  --jp-mirror-editor-error-color: #f00;
+  --jp-mirror-editor-tag-color: #{$solarized-green};
+  --jp-mirror-editor-attribute-color: #{$solarized-blue};
+  --jp-mirror-editor-header-color: #{color.mix($solarized-blue, $solarized-base2, 90%)};
+  --jp-mirror-editor-quote-color: #{$solarized-cyan};
+  --jp-mirror-editor-link-color: #{$solarized-blue};
+  --jp-mirror-editor-error-color: #{$solarized-red};
   --jp-mirror-editor-hr-color: #999;
 
   /* User colors */