diff --git a/lib/ace/mode/_test/tokens_dart.json b/lib/ace/mode/_test/tokens_dart.json
index 2faee981..5964791a 100644
--- a/lib/ace/mode/_test/tokens_dart.json
+++ b/lib/ace/mode/_test/tokens_dart.json
@@ -96,13 +96,13 @@
    "start"
 ],[
    "start",
-  ["keyword.other.import.dart","#import"],
+  ["keyword.other.import.dart","import"],
   ["text","("],
   ["string","\"http://dartwatch.com/myOtherLibrary.dart\""],
   ["text",");"]
 ],[
    "start",
-  ["keyword.other.import.dart","#import"],
+  ["keyword.other.import.dart","import"],
   ["text","("],
   ["string","\"myOtherLibrary.dart\""],
   ["text",", "],
diff --git a/lib/ace/mode/dart.js b/lib/ace/mode/dart.js
index 9fc58f3e..114c79ab 100644
--- a/lib/ace/mode/dart.js
+++ b/lib/ace/mode/dart.js
@@ -41,18 +41,19 @@ define(function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
+var CMode = require("./c_cpp").Mode;
 var Tokenizer = require("../tokenizer").Tokenizer;
 var DartHighlightRules = require("./dart_highlight_rules").DartHighlightRules;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
 var Mode = function() {
+    CMode.call(this);
     var highlighter = new DartHighlightRules();
     this.foldingRules = new CStyleFoldMode();
 
     this.$tokenizer = new Tokenizer(highlighter.getRules());
 };
-oop.inherits(Mode, TextMode);
+oop.inherits(Mode, CMode);
 
 (function() {
     // Extra logic goes here. 
diff --git a/lib/ace/mode/dart_highlight_rules.js b/lib/ace/mode/dart_highlight_rules.js
index e79229da..a0851ef7 100644
--- a/lib/ace/mode/dart_highlight_rules.js
+++ b/lib/ace/mode/dart_highlight_rules.js
@@ -13,7 +13,7 @@ var DartHighlightRules = function() {
     var constantLanguage = "true|false|null";
     var variableLanguage = "this|super";
     var keywordControl = "try|catch|finally|throw|break|case|continue|default|do|else|for|if|in|return|switch|while|new";
-    var keywordDeclaration = "abstract|class|extends|external|factory|implements|interface|get|native|operator|set|typedef";
+    var keywordDeclaration = "abstract|class|extends|external|factory|implements|get|native|operator|set|typedef";
     var storageModifier = "static|final|const";
     var storageType = "void|bool|num|int|double|Dynamic|var|String";
 
@@ -52,7 +52,7 @@ var DartHighlightRules = function() {
         },
         {
             token: "keyword.other.import.dart",
-            regex: "#(?:\\b)(?:library|import|source|resource)(?:\\b)"
+            regex: "(?:\\b)(?:library|import|source|part|of)(?:\\b)"
         },
         {
             token : ["keyword.other.import.dart", "text"],