diff --git a/src/dlangide.d b/src/dlangide.d
index df69098..3a1b494 100644
--- a/src/dlangide.d
+++ b/src/dlangide.d
@@ -1,6 +1,6 @@
 module app;
 
-import dlangui.all;
+import dlangui;
 import std.stdio;
 import std.conv;
 import dlangide.ui.frame;
diff --git a/src/dlangide/tools/d/dsyntaxhighlighter.d b/src/dlangide/tools/d/dsyntaxhighlighter.d
index f2f2856..4a54632 100644
--- a/src/dlangide/tools/d/dsyntaxhighlighter.d
+++ b/src/dlangide/tools/d/dsyntaxhighlighter.d
@@ -8,7 +8,7 @@ import ddc.lexer.textsource;
 import ddc.lexer.exceptions;
 import ddc.lexer.tokenizer;
 
-class SimpleDSyntaxHighlighter : SyntaxHighlighter {
+class SimpleDSyntaxSupport : SyntaxSupport {
 
     EditableContent _content;
     SourceFile _file;
@@ -26,7 +26,7 @@ class SimpleDSyntaxHighlighter : SyntaxHighlighter {
     /// returns editable content
     @property EditableContent content() { return _content; }
     /// set editable content
-    @property SyntaxHighlighter content(EditableContent content) {
+    @property SyntaxSupport content(EditableContent content) {
         _content = content;
         return this;
     }
diff --git a/src/dlangide/ui/dsourceedit.d b/src/dlangide/ui/dsourceedit.d
index 074bad9..9502c27 100644
--- a/src/dlangide/ui/dsourceedit.d
+++ b/src/dlangide/ui/dsourceedit.d
@@ -62,7 +62,7 @@ class DSourceEdit : SourceEdit {
     override bool load(string fn) {
         _projectSourceFile = null;
         bool res = super.load(fn);
-        setHighlighter();
+        setSyntaxSupport();
         return res;
     }
 
@@ -70,11 +70,11 @@ class DSourceEdit : SourceEdit {
         return filename.endsWith(".d") || filename.endsWith(".dd") || filename.endsWith(".dh") || filename.endsWith(".ddoc");
     }
 
-    void setHighlighter() {
+    void setSyntaxSupport() {
         if (isDSourceFile) {
-            content.syntaxHighlighter = new SimpleDSyntaxHighlighter(filename);
+            content.syntaxSupport = new SimpleDSyntaxSupport(filename);
         } else {
-            content.syntaxHighlighter = null;
+            content.syntaxSupport = null;
         }
     }
 
@@ -92,7 +92,7 @@ class DSourceEdit : SourceEdit {
             return false;
         }
         _projectSourceFile = f;
-        setHighlighter();
+        setSyntaxSupport();
         return true;
     }