diff --git a/src/extensions/default/CSSCodeHints/main.js b/src/extensions/default/CSSCodeHints/main.js
index ca230602564..e70ab9551fa 100644
--- a/src/extensions/default/CSSCodeHints/main.js
+++ b/src/extensions/default/CSSCodeHints/main.js
@@ -27,17 +27,21 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var AppInit         = brackets.getModule("utils/AppInit"),
-        ExtensionUtils  = brackets.getModule("utils/ExtensionUtils"),
-        CodeHintManager = brackets.getModule("editor/CodeHintManager"),
-        CSSUtils        = brackets.getModule("language/CSSUtils"),
-        HTMLUtils       = brackets.getModule("language/HTMLUtils"),
-        LanguageManager = brackets.getModule("language/LanguageManager"),
-        TokenUtils      = brackets.getModule("utils/TokenUtils"),
-        StringMatch     = brackets.getModule("utils/StringMatch"),
-        ColorUtils      = brackets.getModule("utils/ColorUtils"),
-        CSSProperties   = require("text!CSSProperties.json"),
-        properties      = JSON.parse(CSSProperties);
+    var AppInit             = brackets.getModule("utils/AppInit"),
+        ExtensionUtils      = brackets.getModule("utils/ExtensionUtils"),
+        CodeHintManager     = brackets.getModule("editor/CodeHintManager"),
+        CSSUtils            = brackets.getModule("language/CSSUtils"),
+        HTMLUtils           = brackets.getModule("language/HTMLUtils"),
+        LanguageManager     = brackets.getModule("language/LanguageManager"),
+        PreferencesManager  = brackets.getModule("preferences/PreferencesManager"),
+        TokenUtils          = brackets.getModule("utils/TokenUtils"),
+        StringMatch         = brackets.getModule("utils/StringMatch"),
+        ColorUtils          = brackets.getModule("utils/ColorUtils"),
+        CSSProperties       = require("text!CSSProperties.json"),
+        properties          = JSON.parse(CSSProperties);
+
+
+    PreferencesManager.definePreference("codehint.CssPropHints", "boolean", true);
     
     // Context of the last request for hints: either CSSUtils.PROP_NAME,
     // CSSUtils.PROP_VALUE or null.
diff --git a/src/extensions/default/HTMLCodeHints/main.js b/src/extensions/default/HTMLCodeHints/main.js
index 491d90268b4..9d4d6d40abc 100644
--- a/src/extensions/default/HTMLCodeHints/main.js
+++ b/src/extensions/default/HTMLCodeHints/main.js
@@ -32,11 +32,17 @@ define(function (require, exports, module) {
     var AppInit             = brackets.getModule("utils/AppInit"),
         CodeHintManager     = brackets.getModule("editor/CodeHintManager"),
         HTMLUtils           = brackets.getModule("language/HTMLUtils"),
+        PreferencesManager  = brackets.getModule("preferences/PreferencesManager"),
         HTMLTags            = require("text!HtmlTags.json"),
         HTMLAttributes      = require("text!HtmlAttributes.json"),
         tags,
         attributes;
 
+
+    PreferencesManager.definePreference("codehint.TagHints", "boolean", true);
+
+    PreferencesManager.definePreference("codehint.AttrHints", "boolean", true);
+
     /**
      * @constructor
      */
diff --git a/src/extensions/default/HtmlEntityCodeHints/main.js b/src/extensions/default/HtmlEntityCodeHints/main.js
index 8f6a7aec073..99cbb1a326c 100644
--- a/src/extensions/default/HtmlEntityCodeHints/main.js
+++ b/src/extensions/default/HtmlEntityCodeHints/main.js
@@ -33,9 +33,13 @@ define(function (require, exports, module) {
         CodeHintManager     = brackets.getModule("editor/CodeHintManager"),
         ExtensionUtils      = brackets.getModule("utils/ExtensionUtils"),
         HTMLUtils           = brackets.getModule("language/HTMLUtils"),
+        PreferencesManager  = brackets.getModule("preferences/PreferencesManager"),
         HtmlSpecialChars    = require("text!SpecialChars.json"),
         specialChars;
 
+
+    PreferencesManager.definePreference("codehint.SpecialCharHints", "boolean", true);
+
     /**
      * Encodes the special Char value given. 
      * 
@@ -271,4 +275,4 @@ define(function (require, exports, module) {
     
     //Export Hints for Unit Tests
     exports.SpecialCharHints = SpecialCharHints;
-});
\ No newline at end of file
+});
diff --git a/src/extensions/default/StaticServer/StaticServer.js b/src/extensions/default/StaticServer/StaticServer.js
index f25a12efb91..923f143ec4c 100644
--- a/src/extensions/default/StaticServer/StaticServer.js
+++ b/src/extensions/default/StaticServer/StaticServer.js
@@ -41,6 +41,8 @@ define(function (require, exports, module) {
      */
     var _prefs = PreferencesManager.getExtensionPrefs("staticserver");
 
+    _prefs.definePreference("port", "number", 0);
+
     /**
      * @constructor
      * @extends {BaseServer}
diff --git a/src/extensions/default/UrlCodeHints/main.js b/src/extensions/default/UrlCodeHints/main.js
index a8ea21570a3..ad005725671 100644
--- a/src/extensions/default/UrlCodeHints/main.js
+++ b/src/extensions/default/UrlCodeHints/main.js
@@ -28,14 +28,15 @@ define(function (require, exports, module) {
     "use strict";
     
     // Brackets modules
-    var AppInit         = brackets.getModule("utils/AppInit"),
-        CodeHintManager = brackets.getModule("editor/CodeHintManager"),
-        CSSUtils        = brackets.getModule("language/CSSUtils"),
-        FileSystem      = brackets.getModule("filesystem/FileSystem"),
-        FileUtils       = brackets.getModule("file/FileUtils"),
-        HTMLUtils       = brackets.getModule("language/HTMLUtils"),
-        ProjectManager  = brackets.getModule("project/ProjectManager"),
-        StringUtils     = brackets.getModule("utils/StringUtils"),
+    var AppInit             = brackets.getModule("utils/AppInit"),
+        CodeHintManager     = brackets.getModule("editor/CodeHintManager"),
+        CSSUtils            = brackets.getModule("language/CSSUtils"),
+        FileSystem          = brackets.getModule("filesystem/FileSystem"),
+        FileUtils           = brackets.getModule("file/FileUtils"),
+        HTMLUtils           = brackets.getModule("language/HTMLUtils"),
+        PreferencesManager  = brackets.getModule("preferences/PreferencesManager"),
+        ProjectManager      = brackets.getModule("project/ProjectManager"),
+        StringUtils         = brackets.getModule("utils/StringUtils"),
 
         Data            = require("text!data.json"),
 
@@ -43,7 +44,10 @@ define(function (require, exports, module) {
         data,
         htmlAttrs,
         styleModes      = ["css", "text/x-less", "text/x-scss"];
-    
+
+
+    PreferencesManager.definePreference("codehint.UrlCodeHints", "boolean", true);
+
     /**
      * @constructor
      */
diff --git a/src/language/CodeInspection.js b/src/language/CodeInspection.js
index 8e5e18cd80f..94c4ca47e5e 100644
--- a/src/language/CodeInspection.js
+++ b/src/language/CodeInspection.js
@@ -605,7 +605,11 @@ define(function (require, exports, module) {
         });
     
     prefs.definePreference(PREF_ASYNC_TIMEOUT, "number", 10000);
-        
+
+    prefs.definePreference(PREF_PREFER_PROVIDERS, "array", []);
+
+    prefs.definePreference(PREF_PREFERRED_ONLY, "boolean", false);
+
     // Initialize items dependent on HTML DOM
     AppInit.htmlReady(function () {
         // Create bottom panel to list error details