diff --git a/index.less b/index.less
index 61e7306..23416fc 100644
--- a/index.less
+++ b/index.less
@@ -1,5 +1,5 @@
 
 @import (reference) "styles/syntax-variables";
 
-@import 'editor';
-@import 'language';
+@import 'styles/editor';
+@import 'styles/language';
diff --git a/styles/editor.less b/styles/editor.less
index cdbde86..9891096 100644
--- a/styles/editor.less
+++ b/styles/editor.less
@@ -2,7 +2,7 @@
 // Editor styles (background, gutter, guides)
 
 atom-text-editor, // <- remove when Shadow DOM can't be disabled
-:host {
+	atom-text-editor {
   background-color: @syntax-background-color;
   color: @syntax-text-color;
 
diff --git a/styles/language.less b/styles/language.less
index 6ccea16..7c3df44 100644
--- a/styles/language.less
+++ b/styles/language.less
@@ -1,72 +1,72 @@
 // Language syntax highlighting
 
-.comment {
+.syntax--comment {
   color: @hue-2;
-  .markup {
+  .syntax--markup {
     color: @hue-2;
   }
 }
 
-.entity {
+.syntax--entity {
   color: @mono-1;
 }
 
-.keyword {
+.syntax--keyword {
   color: @mono-1;
 }
 
-.storage {
+.syntax--storage {
   color: @mono-1;
 }
 
-.constant {
+.syntax--constant {
   color: @mono-1;
 }
 
-.variable {
+.syntax--variable {
   color: @mono-1;
 }
 
-.string {
+.syntax--string {
   color: @mono-1;
 }
 
-.punctuation {
+.syntax--punctuation {
   color: @mono-1;
-  &.definition {
-    &.comment {
+  &.syntax--definition {
+    &.syntax--comment {
       color: @hue-2;
     }
   }
 }
 
-.support {
+.syntax--support {
   color: @mono-1;
 }
 
-.entity {
+.syntax--entity {
   color: @mono-1;
 }
 
-.meta {
+.syntax--meta {
   color: @mono-1;
 }
 
-.none {
+.syntax--none {
   color: @mono-1;
 }
 
-.invalid {
-  &.deprecated {
+.syntax--invalid {
+  &.syntax--deprecated {
     color: @syntax-deprecated-fg !important;
     background-color: @syntax-deprecated-bg !important;
   }
-  &.illegal {
+  &.syntax--illegal {
     color: @syntax-illegal-fg !important;
     background-color: @syntax-illegal-bg !important;
   }
 }
 
-.markup {
+.syntax--markup {
   color: @mono-1;
 }