From d12d87b3d38f2028d8962d683e7bc730e467202f Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 23 Apr 2014 21:04:23 -0400
Subject: [PATCH 01/96] Initial commit to integrate themes into brackets core

---
 src/brackets.js                         |   1 +
 src/command/Commands.js                 |   1 +
 src/command/DefaultMenus.js             |   2 +
 src/themes/CodeMirrorAddons.js          |  37 ++++
 src/themes/DefaultSettings.js           |  24 +++
 src/themes/FontCommandsManager.js       |  42 ++++
 src/themes/FontSettings.js              |  62 ++++++
 src/themes/Init.js                      |  29 +++
 src/themes/LICENSE                      |  21 ++
 src/themes/MenuCommands.js              |  15 ++
 src/themes/README.md                    |  87 ++++++++
 src/themes/ScrollbarsApply.js           |  52 +++++
 src/themes/Settings.js                  |  90 ++++++++
 src/themes/String.js                    |  16 ++
 src/themes/Theme.js                     | 147 +++++++++++++
 src/themes/ThemeApply.js                |  32 +++
 src/themes/ThemeFiles.js                |  91 ++++++++
 src/themes/ThemeManager.js              | 254 +++++++++++++++++++++++
 src/themes/package.json                 |  16 ++
 src/themes/reset.css                    | 205 ++++++++++++++++++
 src/themes/theme/NightLion.css          | 166 +++++++++++++++
 src/themes/theme/aquaman.css            | 225 ++++++++++++++++++++
 src/themes/theme/default.css            |   3 +
 src/themes/theme/dracula.css            |  98 +++++++++
 src/themes/theme/hammsidian.css         | 125 +++++++++++
 src/themes/theme/light-table.css        | 124 +++++++++++
 src/themes/theme/monokai-dark-soda.css  |  55 +++++
 src/themes/theme/nando.css              |  53 +++++
 src/themes/theme/obsidian.css           |  80 +++++++
 src/themes/theme/pixie.css              | 265 ++++++++++++++++++++++++
 src/themes/theme/railscasts.css         |  73 +++++++
 src/themes/theme/selenitic.css          | 179 ++++++++++++++++
 src/themes/theme/visual-studio-2012.css | 247 ++++++++++++++++++++++
 src/themes/theme/visual-studio-ex.css   | 113 ++++++++++
 src/themes/theme/visual-studio.css      |  72 +++++++
 src/themes/theme/zamiere.css            | 120 +++++++++++
 src/themes/views/general.html           |  45 ++++
 src/themes/views/settings.css           |  17 ++
 src/themes/views/settings.html          |  20 ++
 src/themes/views/settings.js            |  82 ++++++++
 40 files changed, 3386 insertions(+)
 create mode 100644 src/themes/CodeMirrorAddons.js
 create mode 100644 src/themes/DefaultSettings.js
 create mode 100644 src/themes/FontCommandsManager.js
 create mode 100644 src/themes/FontSettings.js
 create mode 100644 src/themes/Init.js
 create mode 100644 src/themes/LICENSE
 create mode 100644 src/themes/MenuCommands.js
 create mode 100644 src/themes/README.md
 create mode 100644 src/themes/ScrollbarsApply.js
 create mode 100644 src/themes/Settings.js
 create mode 100644 src/themes/String.js
 create mode 100644 src/themes/Theme.js
 create mode 100644 src/themes/ThemeApply.js
 create mode 100644 src/themes/ThemeFiles.js
 create mode 100644 src/themes/ThemeManager.js
 create mode 100644 src/themes/package.json
 create mode 100644 src/themes/reset.css
 create mode 100644 src/themes/theme/NightLion.css
 create mode 100644 src/themes/theme/aquaman.css
 create mode 100644 src/themes/theme/default.css
 create mode 100644 src/themes/theme/dracula.css
 create mode 100644 src/themes/theme/hammsidian.css
 create mode 100644 src/themes/theme/light-table.css
 create mode 100644 src/themes/theme/monokai-dark-soda.css
 create mode 100644 src/themes/theme/nando.css
 create mode 100644 src/themes/theme/obsidian.css
 create mode 100644 src/themes/theme/pixie.css
 create mode 100644 src/themes/theme/railscasts.css
 create mode 100644 src/themes/theme/selenitic.css
 create mode 100644 src/themes/theme/visual-studio-2012.css
 create mode 100644 src/themes/theme/visual-studio-ex.css
 create mode 100644 src/themes/theme/visual-studio.css
 create mode 100644 src/themes/theme/zamiere.css
 create mode 100644 src/themes/views/general.html
 create mode 100644 src/themes/views/settings.css
 create mode 100644 src/themes/views/settings.html
 create mode 100644 src/themes/views/settings.js

diff --git a/src/brackets.js b/src/brackets.js
index 05a3f148fa5..a9eb72d6de3 100644
--- a/src/brackets.js
+++ b/src/brackets.js
@@ -102,6 +102,7 @@ define(function (require, exports, module) {
         NativeApp               = require("utils/NativeApp"),
         DeprecationWarning      = require("utils/DeprecationWarning"),
         ViewCommandHandlers     = require("view/ViewCommandHandlers"),
+        ThemeManager            = require("themes/ThemeManager"),
         _                       = require("thirdparty/lodash");
     
     // DEPRECATED: In future we want to remove the global CodeMirror, but for now we
diff --git a/src/command/Commands.js b/src/command/Commands.js
index 9dbd356269a..05369553148 100644
--- a/src/command/Commands.js
+++ b/src/command/Commands.js
@@ -109,6 +109,7 @@ define(function (require, exports, module) {
     exports.SORT_WORKINGSET_BY_NAME     = "view.sortWorkingSetByName";  // WorkingSetSort.js            _handleSortWorkingSetByName()
     exports.SORT_WORKINGSET_BY_TYPE     = "view.sortWorkingSetByType";  // WorkingSetSort.js            _handleSortWorkingSetByType()
     exports.SORT_WORKINGSET_AUTO        = "view.sortWorkingSetAuto";    // WorkingSetSort.js            _handleAutomaticSort()
+    exports.THEMES                      = "view.themes";                // themes
     
     // NAVIGATE
     exports.NAVIGATE_NEXT_DOC           = "navigate.nextDoc";           // DocumentCommandHandlers.js   handleGoNextDoc()
diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js
index 56ff64834f4..e11faf045a1 100644
--- a/src/command/DefaultMenus.js
+++ b/src/command/DefaultMenus.js
@@ -111,6 +111,8 @@ define(function (require, exports, module) {
          * View menu
          */
         menu = Menus.addMenu(Strings.VIEW_MENU, Menus.AppMenuBar.VIEW_MENU);
+        menu.addMenuItem(Commands.THEMES);
+        menu.addMenuDivider();
         menu.addMenuItem(Commands.VIEW_HIDE_SIDEBAR);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.VIEW_INCREASE_FONT_SIZE);
diff --git a/src/themes/CodeMirrorAddons.js b/src/themes/CodeMirrorAddons.js
new file mode 100644
index 00000000000..69f1558732e
--- /dev/null
+++ b/src/themes/CodeMirrorAddons.js
@@ -0,0 +1,37 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function () {
+    "use strict";
+
+    var CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror");
+
+    function initAddons() {
+        // Set some default value for codemirror...
+        CodeMirror.defaults.highlightSelectionMatches = true;
+        CodeMirror.defaults.styleSelectedText = true;
+    }
+
+    function init() {
+        var deferred = $.Deferred();
+
+        /**
+        *  This is where is all starts to load up...
+        */
+        require([
+            "thirdparty/CodeMirror2/addon/selection/mark-selection",
+            "thirdparty/CodeMirror2/addon/search/match-highlighter"
+        ], deferred.resolve);
+
+        return deferred.done(initAddons).promise();
+    }
+
+    return {
+        ready: init()
+    };
+});
+
diff --git a/src/themes/DefaultSettings.js b/src/themes/DefaultSettings.js
new file mode 100644
index 00000000000..661736bcf6a
--- /dev/null
+++ b/src/themes/DefaultSettings.js
@@ -0,0 +1,24 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function(require) {
+    var FileUtils = require("file/FileUtils");
+    var cm_path = FileUtils.getNativeBracketsDirectoryPath() + "/thirdparty/CodeMirror2";
+
+    return {
+        "fontSize": 12,
+        "lineHeight": '1.3em',
+        "fontType": "'SourceCodePro-Medium', ＭＳ ゴシック, 'MS Gothic', monospace",
+        "customScrollbars": true,
+        "theme": ["default"],
+        "paths": [
+            {path:require.toUrl("./") + "../../themes"},
+            {path:require.toUrl("./theme/")},
+            {path:cm_path + "/theme"}
+        ]
+    };
+});
diff --git a/src/themes/FontCommandsManager.js b/src/themes/FontCommandsManager.js
new file mode 100644
index 00000000000..2e4c0d91152
--- /dev/null
+++ b/src/themes/FontCommandsManager.js
@@ -0,0 +1,42 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ * @author Brad Gearon
+ *
+ * Licensed under MIT
+ */
+
+
+define(function (require) {
+    "use strict";
+
+    var Settings            = require("themes/Settings"),
+    	DefaultSettings     = require("themes/DefaultSettings"),
+        ViewCommandHandlers = require("view/ViewCommandHandlers"),
+        PreferencesManager  = require("preferences/PreferencesManager");
+
+    function ViewCommandsManager () {
+        $(ViewCommandHandlers).on("fontSizeChange", updateThemeFontSize);
+        $(Settings).on("change:fontSize", updateBracketsFontSize);
+        updateBracketsFontSize();
+    }
+
+    function updateThemeFontSize (evt, adjustment, fontSize /*, lineHeight*/) {
+        Settings.setValue("fontSize", fontSize);
+    }
+
+    function updateBracketsFontSize() {
+        var fontSize = Settings.getValue("fontSize"),
+            fontSizeNumeric = Number(fontSize.replace(/px|em/, "")),
+            fontSizeOffset = fontSizeNumeric - DefaultSettings.fontSize;
+
+        if(!isNaN(fontSizeOffset)) {
+            PreferencesManager.setViewState("fontSizeAdjustment", fontSizeOffset);
+            PreferencesManager.setViewState("fontSizeStyle", fontSize);
+        }
+    }
+
+    // Let's make sure we use Themes fonts by default
+    return {
+    	init: ViewCommandsManager
+    };
+});
diff --git a/src/themes/FontSettings.js b/src/themes/FontSettings.js
new file mode 100644
index 00000000000..358927c1077
--- /dev/null
+++ b/src/themes/FontSettings.js
@@ -0,0 +1,62 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function () {
+    "use strict";
+
+    var $lineHeight = $("<style type='text/css' id='lineHeight'>").appendTo("head"),
+        $fontSize = $("<style type='text/css' id='fontSize'>").appendTo("head"),
+        $fontType = $("<style type='text/css' id='fontType'>").appendTo("head");
+
+    var Settings = null;
+
+
+    function FontSettings(_settings) {
+        Settings = _settings;
+        $(Settings).on("change:lineHeight", FontSettings.updateLineHeight);
+        $(Settings).on("change:fontSize", FontSettings.updateFontSize);
+        $(Settings).on("change:fontType", FontSettings.updateFontType);
+        FontSettings.update();
+    }
+
+
+    FontSettings.updateLineHeight = function () {
+        clearFonts();
+        var value = Settings.getValue("lineHeight");
+        $lineHeight.text(".CodeMirror{" + "line-height: " + value + "; }");
+    };
+
+
+    FontSettings.updateFontSize = function () {
+        clearFonts();
+        var value = Settings.getValue("fontSize");
+        $fontSize.text(".CodeMirror{" + "font-size: " + value + " !important; }");
+    };
+
+
+    FontSettings.updateFontType = function () {
+        clearFonts();
+        var value = Settings.getValue("fontType");
+        $fontType.text(".CodeMirror{" + "font-family: " + value + " !important; }");
+    };
+
+
+    FontSettings.update = function () {
+        clearFonts();
+        FontSettings.updateLineHeight();
+        FontSettings.updateFontSize();
+        FontSettings.updateFontType();
+    };
+
+
+    function clearFonts() {
+        // Remove this tag that is intefering with font settings set in this module
+        $("#codemirror-dynamic-fonts").remove();
+    }
+
+    return FontSettings;
+});
diff --git a/src/themes/Init.js b/src/themes/Init.js
new file mode 100644
index 00000000000..a717bb2d1e4
--- /dev/null
+++ b/src/themes/Init.js
@@ -0,0 +1,29 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function (require, exports, module) {
+    "use strict";
+
+    require("themes/String");
+    require("themes/MenuCommands");
+
+    var ExtensionUtils   = require("utils/ExtensionUtils"),
+        ThemeManager     = require("themes/ThemeManager"),
+        CodeMirrorAddons = require("themes/CodeMirrorAddons");
+
+    // Load up reset.css to override brackground settings from brackets because
+    // they make the themes look really bad.
+    ExtensionUtils.loadStyleSheet(module, "reset.css");
+    ExtensionUtils.loadStyleSheet(module, "views/settings.css");
+
+	function init() {
+		CodeMirrorAddons.ready(ThemeManager);
+	}
+	
+	exports.init = init;
+});
+
diff --git a/src/themes/LICENSE b/src/themes/LICENSE
new file mode 100644
index 00000000000..d84ea80dbf0
--- /dev/null
+++ b/src/themes/LICENSE
@@ -0,0 +1,21 @@
+ Copyright (c) 2014 Miguel Castillo.
+
+ Licensed under MIT
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/src/themes/MenuCommands.js b/src/themes/MenuCommands.js
new file mode 100644
index 00000000000..af5c1ecf0c0
--- /dev/null
+++ b/src/themes/MenuCommands.js
@@ -0,0 +1,15 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function(require) {
+    "use strict";
+    var Commands       = require("command/Commands"),
+        CommandManager = require("command/CommandManager"),
+        Settings       = require("themes/Settings");
+
+    CommandManager.register("Themes", Commands.THEMES, Settings.open);
+});
diff --git a/src/themes/README.md b/src/themes/README.md
new file mode 100644
index 00000000000..7153822d32e
--- /dev/null
+++ b/src/themes/README.md
@@ -0,0 +1,87 @@
+Brackets-Themes
+===============
+
+Set CodeMirror and Custom themes in Brackets.
+
+
+Features
+===============
+
+* Automatic loading of CodeMirror's themes shipped with Brackets.
+* Enjoy a variety of <i>custom</i> themes created by other users like yourself! For <i>custom</i> themes 101 primer, please read below.
+* Configure font size and font type.
+* Disable scrollbars defined in themes.  Good if you just want to use the default scrollbars.
+* Support for LESS files!
+* Auto reload themes upon saving changes made to theme files.
+* Configure custom folders to load themes from.  This is good if you want to have a folder to hold your custom themes that you want to persist after Brackets/Themes updates.
+
+
+Screenshot
+===============
+<b>Visual Studio theme</b>
+![Visual Studio theme](https://raw.github.com/wiki/MiguelCastillo/Brackets-Themes/images/VisualStudio.png)
+
+<b>Monokai Dark Soda custom theme by @simpleshadow.</b>
+![Monokai Dark Soda theme](https://raw.github.com/wiki/MiguelCastillo/Brackets-Themes/images/MonokaiDarkSoda.png)
+
+Custom themes 101 guide
+===============
+
+Custom themes are codemirror's themes, so you will need to be familiar with codemirror's theme guidelines.  I provide a set of steps to get you started below, but for more details please navigate to http://codemirror.net/doc/manual.html and search for "theme".
+<br><br>
+Codemirror's themes are css files.  Important requirement is that the file name has to match your css class definition.  E.g. If your theme file is called "default", then your primary css class name needs to be "default".  Codemirror's guidelines require that the actual css class name starts with ".cm-s-", so your fully qualified css class name will be ".cm-s-default".
+<br><br>
+To get you started, you could use the already existing custom theme "default.css".  Let's do the following.
+<br>
+- Open the custom theme directory.  Navigate to your themes manager directory (extensions directory/themes) and you will find custom themes in the "theme" directory.  Brackets provides a quick way of accessing your extensions directory... Help > Show Extensions Folder.
+- Copy and paste the file "default.css" and rename it to "my-theme.css".
+- Open "my-theme.css" and replace "default" with "my-theme", which should end up looking like ".cm-s-my-theme".  You will also have a second class ".CodeMirror", just leave it there and the net result will look like ".cm-s-my-theme.CodeMirror".
+- In "my-theme.css", change "background-color: #F8F8F8;" to "backgound-color: red;".
+- Relaunch brackets, open a JavaScript file and you should see the document with a red background.
+<br><br>
+For details on what can be customized, please navigate to http://codemirror.net/doc/manual.html and search for "Customized Styling".  As you will notice, the documentation isn't exhautive but they suggest you use "codemirror.css" as a reference.  Give it a try, it is pretty straight forward.
+<br><br>
+If you have a cool theme you created and want to share, please send it my way and I will gladly add it to the custom themes.
+
+
+FAQ
+===============
+
+* Why disabling/enabling the scrollbars don't always take effect?
+  - This due to the fact that CodeMirror builds "fake" scrollbars that only get created when the document is loaded.  So toggling the scrollbars with the document open might not take effect as expected.  To get around this behavior, reopen the document or restart Brackets.
+
+
+How to
+===============
+
+* Install... Open Brackets then copy and paste https://github.com/MiguelCastillo/Brackets-Themes into File->Install Extension.  You don't need to restart Brackets.
+* Set a theme?  Find the Themes menu and make a selection.
+![Themes Menu](https://raw.github.com/wiki/MiguelCastillo/Brackets-Themes/images/SetTheme.png)
+
+Credit
+==============
+Corey Gwin: Monokai Dark Soda<br>
+Kulcsár Kázmér: Zamiere<br>
+Diego Alvarez: Aquaman<br>
+Felipe K. de Mello: Dracula<br>
+Fernando Hurtado: Nando<br>
+Jordan Hess: Pixie<br>
+John Hamm: Hammsidian<br>
+Christopher Kelly (scriptmunkee) for additions to reset.cs<br>
+
+
+Links
+===============
+Brackets? Right here... http://brackets.io/ <br>
+Brackets github? Right here... https://github.com/adobe/brackets
+
+
+Contact me
+===============
+
+If you have any issues or want to just drop in a line, you can use my personal email at manchagnu@gmail.com
+
+License
+===============
+
+Licensed under MIT
diff --git a/src/themes/ScrollbarsApply.js b/src/themes/ScrollbarsApply.js
new file mode 100644
index 00000000000..ae674e51740
--- /dev/null
+++ b/src/themes/ScrollbarsApply.js
@@ -0,0 +1,52 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function (require) {
+    "use strict";
+
+    var Settings = require("themes/Settings");
+    var $scrollbars = $("<style id='scrollbars'>").appendTo("head");
+    var theme;
+
+
+    function scrollbarsApply(themeManager) {
+        scrollbarsApply.update(themeManager);
+    }
+
+
+    scrollbarsApply.update = function(themeManager) {
+        theme = themeManager ? themeManager.getThemes()[0] : (theme || {});
+        if ( Settings.getValue("customScrollbars") ) {
+            var scrollbar = (theme.scrollbar || []).join(" ");
+            $scrollbars.text(scrollbar || "");
+        }
+        else {
+            $scrollbars.text("");
+        }
+    };
+
+
+    scrollbarsApply.enable = function(themeManager) {
+        Settings.setValue("customScrollbars", true);
+        scrollbarsApply.update(themeManager);
+    };
+
+
+    scrollbarsApply.disable = function(themeManager) {
+        Settings.setValue("customScrollbars", true);
+        scrollbarsApply.update(themeManager);
+    };
+
+
+    $(Settings).on("change:customScrollbars", function() {
+        scrollbarsApply.update();
+    });
+
+
+    return scrollbarsApply;
+});
+
diff --git a/src/themes/Settings.js b/src/themes/Settings.js
new file mode 100644
index 00000000000..5e0a3c57ac1
--- /dev/null
+++ b/src/themes/Settings.js
@@ -0,0 +1,90 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function (require) {
+    "use strict";
+
+    var _                       = require("thirdparty/lodash"),
+        PreferencesManager  = require("preferences/PreferencesManager"),
+        DefaultSettings     = require("themes/DefaultSettings"),
+        SettingsDialog      = require("themes/views/settings"),
+        PREFERENCES_KEY     = "brackets-themes",
+        _settings           = PreferencesManager.getExtensionPrefs(PREFERENCES_KEY);
+
+
+    function Settings() {
+        return PreferencesManager.ready.then(function() {
+            if ( Settings.getValue("paths") === (void 0) ) {
+                Settings.setValue("paths", DefaultSettings.paths);
+            }
+
+            if ( Settings.getValue("theme") === (void 0) ) {
+                Settings.setValue("theme",  DefaultSettings.theme);
+            }
+
+            if ( Settings.getValue("fontSize") === (void 0) ) {
+                Settings.setValue("fontSize", DefaultSettings.fontSize + "px");
+            }
+
+            if ( Settings.getValue("lineHeight") === (void 0) ) {
+                Settings.setValue("lineHeight", DefaultSettings.lineHeight);
+            }
+
+            if ( Settings.getValue("fontType") === (void 0) ) {
+                Settings.setValue("fontType", DefaultSettings.fontType);
+            }
+
+            if ( Settings.getValue("customScrollbars") === (void 0) ) {
+                Settings.setValue("customScrollbars", DefaultSettings.customScrollbars);
+            }
+
+            return Settings;
+        }).promise();
+    }
+
+    Settings.open = function() {
+        SettingsDialog.open(Settings);
+    };
+
+    Settings.close = function() {
+        SettingsDialog.close();
+    };
+
+    Settings.getValue = function() {
+        return _settings.get.apply(_settings, arguments);
+    };
+
+    Settings.setValue = function() {
+        _settings.set.apply(_settings, arguments);
+        $(Settings).trigger("change", arguments);
+        $(Settings).trigger("change:" + arguments[0], [arguments[1]]);
+    };
+
+    Settings.getAll = function() {
+        var pathLength = _settings.prefix.length;
+        var prefix = _settings.prefix;
+
+        return _.transform(_settings.base._scopes.user.data, function(result, value, key) {
+            if ( key.indexOf(prefix) === 0 ) {
+                result[key.substr(pathLength)] = value;
+            }
+        });
+    };
+
+    Settings.reset = function() {
+        Settings.setValue("paths", DefaultSettings.paths);
+        Settings.setValue("theme",  DefaultSettings.theme);
+        Settings.setValue("fontSize", DefaultSettings.fontSize + "px");
+        Settings.setValue("lineHeight", DefaultSettings.lineHeight);
+        Settings.setValue("fontType", DefaultSettings.fontType);
+        Settings.setValue("customScrollbars", DefaultSettings.customScrollbars);
+    };
+
+
+    Settings.ready = Settings();
+    return Settings;
+});
diff --git a/src/themes/String.js b/src/themes/String.js
new file mode 100644
index 00000000000..5e457b0e103
--- /dev/null
+++ b/src/themes/String.js
@@ -0,0 +1,16 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function() {
+
+    if (!String.prototype.endsWith) {
+        String.prototype.endsWith = function(suffix) {
+            return this.indexOf(suffix, this.length - suffix.length) !== -1;
+        };
+    }
+
+});
diff --git a/src/themes/Theme.js b/src/themes/Theme.js
new file mode 100644
index 00000000000..add500d99a6
--- /dev/null
+++ b/src/themes/Theme.js
@@ -0,0 +1,147 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function () {
+    "use strict";
+
+    var FileSystem     = require("filesystem/FileSystem"),
+        ExtensionUtils = require("utils/ExtensionUtils");
+
+    var commentRegex = /\/\*([\s\S]*?)\*\//mg,
+        scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg;
+
+    /**
+    *  Theme object to encasulate all the logic in one pretty bundle.
+    *  The theme will self register when it is created.
+    *
+    *  * Required settings are fileName and path
+    *
+    * @constructor
+    */
+    function Theme(file) {
+        var _self     = this,
+            fileName  = file.name;
+
+		_self.file        = file;
+        _self.displayName = toDisplayName(fileName);
+        _self.name        = fileName.substring(0, fileName.lastIndexOf('.'));
+        _self.className   = "theme-" + _self.name;
+    }
+
+
+    Theme.prototype.getFile = function() {
+        return this.file;
+    };
+
+
+    Theme.prototype.load = function(force) {
+        var theme = this;
+
+        if (theme.css && !force) {
+            return theme;
+        }
+
+        if (theme.css) {
+            $(theme.css).remove();
+        }
+
+        return readFile(this.getFile())
+            .then(function(content) {
+                var result = extractScrollbars(content);
+                theme.scrollbar = result.scrollbar;
+                return result.content;
+            })
+            .then(function(content) {
+                return lessify(content, theme);
+            })
+            .then(function(style) {
+                return ExtensionUtils.addEmbeddedStyleSheet(style);
+            })
+            .then(function(styleNode) {
+                theme.css = styleNode;
+                return theme;
+            })
+            .promise();
+    };
+
+
+    /**
+    *  Takes all dashes and converts them to white spaces...
+    *  Then takes all first letters and capitalizes them.
+    */
+    function toDisplayName (name) {
+        name = name.substring(0, name.lastIndexOf('.')).replace(/-/g, ' ');
+        var parts = name.split(" ");
+
+        $.each(parts.slice(0), function (index, part) {
+            parts[index] = part[0].toUpperCase() + part.substring(1);
+        });
+
+        return parts.join(" ");
+    }
+
+
+    function readFile(file) {
+        var deferred = $.Deferred();
+
+        try {
+            file.read(function( err, content /*, stat*/ ) {
+                if ( err ) {
+                    deferred.reject(err);
+                    return;
+                }
+
+                deferred.resolve(content);
+            });
+        }
+        catch(ex) {
+            deferred.reject(false);
+        }
+
+        return deferred.promise();
+    }
+
+
+    function extractScrollbars(content) {
+        var scrollbar = [];
+
+        // Go through and extract out scrollbar customizations so that we can
+        // enable/disable via settings.
+        content = content
+            .replace(commentRegex, "")
+            .replace(scrollbarsRegex, function(match) {
+                scrollbar.push(match);
+                return "";
+            });
+
+        return {
+            content: content,
+            scrollbar: scrollbar
+        };
+    }
+
+
+    function lessify(content, theme) {
+        var deferred = $.Deferred(),
+            parser = new less.Parser();
+
+        parser.parse("." + theme.className + "{" + content + "}", function (err, tree) {
+            if (err) {
+                deferred.reject(err);
+            }
+            else {
+                deferred.resolve(tree.toCSS());
+            }
+        });
+
+        return deferred.promise();
+    }
+
+
+    return Theme;
+});
+
diff --git a/src/themes/ThemeApply.js b/src/themes/ThemeApply.js
new file mode 100644
index 00000000000..e617fc52e32
--- /dev/null
+++ b/src/themes/ThemeApply.js
@@ -0,0 +1,32 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function() {
+    "use strict";
+
+    var ExtensionUtils = require("utils/ExtensionUtils");
+
+    /**
+    *  Handles updating codemirror with the current selection of themes.
+    */
+    function ThemeApply (themeManager, cm) {
+        var newThemes     = themeManager.selected.join(" "),
+            currentThemes = cm.getOption("theme");
+
+        // Check if the editor already has the theme applied...
+        if (currentThemes === newThemes) {
+            return;
+        }
+
+        // Setup current and further documents to get the new theme...
+        CodeMirror.defaults.theme = newThemes;
+        cm.setOption("theme", newThemes);
+        $(ExtensionUtils).trigger("Themes.themeChanged", themeManager.getThemes());
+    }
+
+    return ThemeApply;
+});
diff --git a/src/themes/ThemeFiles.js b/src/themes/ThemeFiles.js
new file mode 100644
index 00000000000..0bb120be04a
--- /dev/null
+++ b/src/themes/ThemeFiles.js
@@ -0,0 +1,91 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function(require) {
+    "use strict";
+
+
+    var FileSystem  = require("filesystem/FileSystem");
+
+    // Root directory for CodeMirror themes
+    var validExtensions = ["css", "less"];
+
+
+    /**
+    *  Return all the files in the specified path
+    */
+    function loadDirectory (path) {
+        var result = $.Deferred();
+
+        if ( !path ) {
+            return result.resolve({
+                files: [],
+                path: path,
+                error: "Path not defined"
+            });
+        }
+
+        function readContent(err, entries) {
+            var i, files = [];
+            entries = entries || [];
+
+            for (i = 0; i < entries.length; i++) {
+                if (entries[i].isFile && validExtensions.indexOf(getExtension(entries[i].name)) !== -1) {
+                    files.push(entries[i].name);
+                }
+            }
+
+            result.resolve({
+                files: files,
+                path: path,
+                error: err
+            });
+        }
+
+        try {
+            FileSystem.getDirectoryForPath(path).getContents(readContent);
+        }
+        catch (ex) {
+            result.resolve({
+                files: [],
+                path: path,
+                error: ex.toString()
+            });
+        }
+
+        return result.promise();
+    }
+
+
+    function loadList(paths) {
+        var i, length, directories = [];
+
+        for ( i = 0, length = paths.length; i < length; i++ ) {
+            try {
+                directories.push(loadDirectory( paths[i].path ));
+            }
+            catch(ex) {
+            }
+        }
+
+        return $.when.apply((void 0), directories).promise();
+    }
+
+
+    function getExtension(file) {
+        var lastIndexOf = file.lastIndexOf(".") + 1;
+        return file.substr(lastIndexOf);
+    }
+
+
+    return {
+        loadList: loadList,
+        loadDirectory: loadDirectory
+    };
+
+});
+
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
new file mode 100644
index 00000000000..8fe36fc7087
--- /dev/null
+++ b/src/themes/ThemeManager.js
@@ -0,0 +1,254 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function (require, exports, module) {
+    "use strict";
+
+    require("themes/String");
+    require("themes/MenuCommands");
+
+    var _                   = require("thirdparty/lodash"),
+        EditorManager       = require("editor/EditorManager"),
+        FileSystem          = require("filesystem/FileSystem"),
+        ExtensionUtils      = require("utils/ExtensionUtils"),
+        Settings            = require("themes/Settings"),
+        Theme               = require("themes/Theme"),
+        themeSettings       = require("themes/views/settings"),
+        themeFiles          = require("themes/ThemeFiles"),
+        themeApply          = require("themes/ThemeApply"),
+        scrollbarsApply     = require("themes/ScrollbarsApply"),
+        fontSettings        = require("themes/FontSettings"),
+        fontCommandsManager = require("themes/FontCommandsManager"),
+        CodeMirrorAddons    = require("themes/CodeMirrorAddons");
+
+
+    // Load up reset.css to override brackground settings from brackets because
+    // they make the themes look really bad.
+    ExtensionUtils.loadStyleSheet(module, "reset.css");
+    ExtensionUtils.loadStyleSheet(module, "views/settings.css");
+
+
+    /**
+    */
+    var ThemeManager = {};
+
+
+    /**
+    * Refresh currently load theme
+    */
+    ThemeManager.refresh = function(force) {
+        var cm = getCM();
+        if ( cm ) {
+            setDocumentMode(cm);
+            themeApply(ThemeManager, cm);
+            refreshEditor(cm);
+        }
+
+        if ( force === true ) {
+            loadThemes(ThemeManager.getThemes(), force === true).done(function() {
+                setDocumentTheme(Settings.getValue("theme"));
+                scrollbarsApply(ThemeManager);
+
+                if ( cm ) {
+                    refreshEditor(cm);
+                }
+            });
+        }
+    };
+
+
+    /**
+    * Returns all current theme objects
+    */
+    ThemeManager.getThemes = function() {
+        return _.map(Settings.getValue("theme").slice(0), function (item) {
+            return ThemeManager.themes[item];
+        });
+    };
+
+
+    /**
+    * Loads a theme from a package
+    */
+    ThemeManager.loadPackage = function() {
+    };
+
+
+    /**
+    * Loads a theme from a file. fileName is the full path to the file
+    */
+    ThemeManager.loadFile = function(fileName) {
+        var deferred = new $.Deferred();
+        var file = FileSystem.getFileForPath (fileName);
+
+        file.exists(function( err, exists ) {
+            if ( exists ) {
+                var theme = new Theme(file);
+                deferred.resolve((ThemeManager.themes[theme.name] = theme));
+            }
+            else if ( err ) {
+                deferred.reject(err);
+            }
+        });
+
+        return deferred.promise();
+    };
+
+
+    /**
+    * Load css/less files from a directory to be treated as themes
+    */
+    ThemeManager.loadDirectory = function(path) {
+        return themeFiles.loadDirectory(path).then(loadThemesFiles);
+    };
+
+
+    /**
+    * Process theme meta deta to create theme instances
+    */
+    function loadThemesFiles(themes) {
+        if (themes.error) {
+            return;
+        }
+
+        // Iterate through each name in the themes and make them theme objects
+        var deferred = _.map(themes.files, function (themeFile) {
+            return ThemeManager.loadFile(themes.path + "/" + themeFile);
+        });
+
+        return $.when.apply((void 0), deferred);
+    }
+
+
+    /**
+    * Add theme class to the document to add proper theme styling scoping.
+    * New class is added, old class is removed.  This basically allows
+    * themeSettings to get nicely cleaned up from the DOM.
+    */
+    function setDocumentTheme(newThemes) {
+        var oldThemes = ThemeManager.selected;
+        ThemeManager.selected = (newThemes = newThemes || []);
+
+        // We gotta prefix theme names with "theme" because themes that start with a number
+        // will not render correctly.  Class names that start with a number are invalid
+        newThemes = _.map(newThemes, function(theme){ return "theme-" + theme; }).join(" ");
+        oldThemes = _.map(oldThemes, function(theme){ return "theme-" + theme; }).join(" ");
+        $("html").removeClass(oldThemes.replace(' ', ',')).addClass(newThemes.replace(' ', ','));
+    }
+
+
+    /**
+    *
+    */
+    function setDocumentMode(cm) {
+        var mode = cm.getDoc().getMode();
+        var docMode = mode && (mode.helperType || mode.name);
+        $("html").removeClass("doctype-" + ThemeManager.docMode).addClass("doctype-" + docMode);
+        ThemeManager.docMode = docMode;
+    }
+
+
+    /**
+    * Loads theme style files
+    */
+    function loadThemes(themes, refresh) {
+        var pending = _.map(themes, function (theme) {
+            if ( theme ) {
+                return theme.load(refresh);
+            }
+        });
+
+        return $.when.apply((void 0), pending);
+    }
+
+
+    /**
+    * Will trigger a refresh of codemirror instance and editor resize so that
+    * inline widgets get properly
+    */
+    function refreshEditor(cm) {
+        // Really dislike timing issues with CodeMirror.  I have to refresh
+        // the editor after a little bit of time to make sure that themes
+        // are properly applied to quick edit widgets
+        setTimeout(function(){
+            cm.refresh();
+            EditorManager.resizeEditor();
+        }, 100);
+    }
+
+
+    function getCM() {
+        var editor = EditorManager.getActiveEditor();
+        if (!editor || !editor._codeMirror) {
+            return;
+        }
+        return editor._codeMirror;
+    }
+
+
+    function init() {
+        if ( init._ready ) {
+            return init._ready;
+        }
+
+        init._ready = $.when(Settings.ready, CodeMirrorAddons.ready).done(function() {
+            // Very first thing is the font settings need to be setup
+            fontSettings(Settings);
+            fontCommandsManager.init();
+
+            ThemeManager.selected = Settings.getValue("theme");
+            ThemeManager.docMode = "";
+            ThemeManager.themes = {};
+
+            // Load files in the configured directories
+            $.when.apply((void 0), _.map(Settings.getValue("paths"), function(path) {
+                return ThemeManager.loadDirectory(path.path);
+            }))
+            .done(function() {
+                ThemeManager.refresh(true);
+                themeSettings.themes(ThemeManager.themes);
+
+                $(EditorManager).on("activeEditorChange", function() {
+                    ThemeManager.refresh();
+                });
+            });
+
+            $(Settings)
+                .on("change:theme", function(evt, theme) {
+                    setDocumentTheme(theme);
+                    ThemeManager.refresh(true);
+                })
+                .on("change:fontSize", function() {
+                    ThemeManager.refresh();
+                });
+
+            FileSystem.on("change", function(evt, file) {
+                var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
+                    theme = ThemeManager.themes[name];
+
+                if ( theme && theme.getFile().parentPath === file.parentPath ) {
+                    ThemeManager.refresh(true);
+                }
+            });
+        });
+
+        return init._ready;
+    }
+
+
+    //
+    // Exposed API
+    //
+    return {
+        ready: init(),
+        refresh: ThemeManager.refresh,
+        loadFile: ThemeManager.loadFile,
+        loadPackage: ThemeManager.loadPackage,
+        getThemes: ThemeManager.getThemes
+    };
+
+});
diff --git a/src/themes/package.json b/src/themes/package.json
new file mode 100644
index 00000000000..906677c8fe9
--- /dev/null
+++ b/src/themes/package.json
@@ -0,0 +1,16 @@
+{
+    "title": "Themes",
+    "name": "themes",
+    "description": "CodeMirror and custom themes in Brackets",
+    "version": "0.7.7",
+    "author": "Miguel Castillo",
+    "email": "mahchagnu@gmail.com",
+    "homepage": "https://github.com/MiguelCastillo/Brackets-Themes",
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/MiguelCastillo/Brackets-Themes.git"
+    },
+    "engines": {
+    "brackets": ">=0.38.0"
+  }
+}
diff --git a/src/themes/reset.css b/src/themes/reset.css
new file mode 100644
index 00000000000..c3118ff479f
--- /dev/null
+++ b/src/themes/reset.css
@@ -0,0 +1,205 @@
+.CodeMirror:not(.cm-s-default) .CodeMirror-scroll
+{
+    background-color: transparent;
+}
+
+.CodeMirror:not(.cm-s-default) .CodeMirror-activeline-background,
+.CodeMirror:not(.cm-s-default) .CodeMirror-activeline .CodeMirror-gutter-elt
+{
+    background-color: transparent !important;
+}
+
+.CodeMirror:not(.cm-s-default) .CodeMirror-activeline-background
+{
+    outline: 1px solid #dddddd;
+}
+
+.CodeMirror:not(.cm-s-default) .CodeMirror-matchingtag
+{
+    background: transparent;/*rgba(49, 49, 49, 0.9);*/
+}
+
+.CodeMirror:not(.cm-s-default) .CodeMirror-activeline .CodeMirror-gutter-elt
+{
+    z-index: 5;
+}
+
+.CodeMirror-cursors {
+    z-index: 5 !important;
+}
+
+
+/**
+* Overrides for CodeMirror themes.
+*/
+
+.CodeMirror.cm-s-light-table .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-monokai-dark-soda .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-nando .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-obsidian .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+
+.CodeMirror.cm-s-pixie .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-visual-studio-ex .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 1);
+}
+
+.CodeMirror.cm-s-visual-studio .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 1);
+}
+
+.CodeMirror.cm-s-zamiere .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-3024-day .CodeMirror-matchingtag
+{
+    background: rgba(93, 212, 124, 0.78);
+}
+
+.CodeMirror.cm-s-3024-night .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-ambiance .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-base16-dark .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.1);
+}
+
+.CodeMirror.cm-s-base16-light .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.7);
+}
+
+.CodeMirror.cm-s-blackboard .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-cobalt .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-eclipse .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 1);
+}
+
+.CodeMirror.cm-s-elegant .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 1);
+}
+
+.CodeMirror.cm-s-erlang-dark .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-lesser-dark .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-mbo .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-midnight .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.7);
+}
+
+.CodeMirror.cm-s-monokai .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.1);
+}
+
+.CodeMirror.cm-s-neat .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 1);
+}
+
+.CodeMirror.cm-s-night .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-paraiso-dark .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-paraiso-light .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 1);
+}
+
+.CodeMirror.cm-s-rubyblue .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-solarized.CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 1);
+}
+
+.CodeMirror.cm-s-the-matrix .CodeMirror-matchingtag
+{
+    background: rgba(0, 255, 0, 0.3);
+}
+
+.CodeMirror.cm-s-tomorrow-night-eighties .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-twilight .CodeMirror-matchingtag
+{
+    background: rgba(33, 96, 33, .8);
+}
+
+.CodeMirror.cm-s-vibrant-ink .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.3);
+}
+
+.CodeMirror.cm-s-xq-dark .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 0.5);
+}
+
+.CodeMirror.cm-s-xq-light .CodeMirror-matchingtag
+{
+    background: rgba(207, 234, 214, 1);
+}
diff --git a/src/themes/theme/NightLion.css b/src/themes/theme/NightLion.css
new file mode 100644
index 00000000000..cad14755717
--- /dev/null
+++ b/src/themes/theme/NightLion.css
@@ -0,0 +1,166 @@
+/*
+BearTheme is bare theme for styling Adobe Brackets (Code Mirror) editor. Some elements need be overwritien, if you find comment with "may need !important", give it a try.
+Good luck, have fun!
+*/
+
+    /*Sidebar*/
+
+#sidebar{} /*General sidebar style*/
+#sidebar #working-set-header{} /*"Working files" header*/
+#sidebar #open-files-container{} /*Working files style*/
+#sidebar #open-files-container ul li.selected a{} /*Selected working file*/
+#sidebar #open-files-container ul li.selected a span.extension{} /*Selected working file's extension*/
+#sidebar #open-files-container ul li .file-status-icon{} /*Icon next to a file, dot, X etc.*/
+
+
+    /*Project file header*/
+#sidebar #project-files-header{} /*Browser header, path select, search, X etc.*/
+#sidebar #project-files-header #project-dropdown-toggle{} /*Path select toggle*/
+#sidebar #project-files-header #project-dropdown-toggle #project-title{} /*Currently selected project title*/
+#sidebar #project-files-header #project-dropdown-toggle .dropdown-arrow{} /*Select toggle arrow - SVG image*/
+#sidebar #project-files-header #closeAllFolders{} /*Close all icon*/
+#sidebar #project-files-header #search-files-button{} /*Search file icon*/
+
+
+    /*Project files container*/
+#sidebar #project-files-container{} /*Project files - WITHOUT header*/
+#sidebar #project-files-container .jstree-icon{} /*Icon next to files (left side), like close/open arrow for parent element*/
+#sidebar #project-files-container li.jstree-closed{} /*Closed tree element*/
+#sidebar #project-files-container li.jstree-open{} /*Open tree element*/
+#sidebar #project-files-container ul li a{} /*Project container file*/
+#sidebar #project-files-container ul li a.jstree-hovered{} /*Project container file hovered*/
+#sidebar #project-files-container ul li a span.extension{} /*Project container file's extension*/
+
+
+    /*Main area*/
+.CodeMirror{background-color: #1a1a1a; color: #777; }/*Main coding area, without line count.*/
+.CodeMirror-lines{}/*Code lines, syntax coloring has higher priority then .CodeMirror-lines*/
+
+.CodeMirror div.CodeMirror-cursor { border-left: 1px solid #333; z-index: 3;} /*Cursor stling*/
+.CodeMirror div.CodeMirror-secondarycursor {} /* Shown when moving in bi-directional text  - from CM docs*/
+
+	/*Brackets is based on webkit, so you can use scrollbar styling. Example below contains 8px width, grey scrollbar for the main area. You can use it with other section, just remember about z-indexes or things like 'selected' with overlap your scrollbar.*/
+.CodeMirror .CodeMirror-vscrollbar{ width: 8px; bottom:8px !important;} /*Scrollbar vertical. These values MUST be the same as height/width of scrollbars*/
+.CodeMirror .CodeMirror-hscrollbar{ height:8px; right:8px !important;} /*Scrollbar horizontal. These values MUST be the same as height/width of scrollbars*/
+
+.CodeMirror ::-webkit-scrollbar { width: 12px; height:12px;} /* The width of vertical scrollbars and height of horizontal scrollbars*/
+.CodeMirror ::-webkit-scrollbar-track {background-color: #333 !important;} /* The track that scrollbars run in */
+.CodeMirror ::-webkit-scrollbar-thumb {background-color: #a5a4a4 !important; border-radius: 4px} /* The scrollbar thumb */
+
+.CodeMirror-scrollbar-filler {height:8px !important; width:8px !important; background:none;} /* Corner where scrollbars meet. Width and height MUST be the same as that of scrollbars. Background should be the same as that of the scrollbar track*/
+.CodeMirror-gutter-filler{ height:8px !important;} /* Linenumber area left of horizontal scrollbar. Height MUST be the same as width/height of scrollbars */
+
+
+
+.CodeMirror .CodeMirror-scroll .CodeMirror-gutters{background-color: #545454; color:#ffffff;}/*Left vertical bar with line count*/
+.CodeMirror-gutter{color:#ffffff;} /*Left bar with line count - it will affect global line count, BUT line count in inline editor won't be changed.*/
+.CodeMirror-linenumbers{color:#ffffff;} /*Line count bar only, without "gutter"*/
+.CodeMirror-foldgutter{color:#ffffff;} /*It's exactly .CodeMirror-gutter{} without .CodeMirror-linenumbers{}.*/
+
+
+    /*Syntax elements & action*/
+.CodeMirror .cm-atom{color: #40D5B9 ;} /*Atribbute value ex. #f00 in color:#f00;*/
+.CodeMirror .cm-def{color: #F995E0  ;} /*variable definition*/
+.CodeMirror .cm-number{ color: #76B8EB;} /*Numbers*/
+.CodeMirror .cm-variable{ color: #e6e6e6;} /*Variable name ex. class Variable_name */
+.CodeMirror .cm-variable-2{color: #76B8EB ;} /*Variable declaration ex. $variable */
+.CodeMirror .cm-property{color: #e6e6e6;} /*Property ex. color in color:#f00;*/
+.CodeMirror .cm-operator{color: #666666;} /*Operators ex. dots (:) between property and atom value */
+.CodeMirror .cm-comment{color: #4F6B85;} /*Comment*/
+.CodeMirror .cm-string{color: #40D5B9 ;} /*String elements ex. "description" in name="description" - including quotation*/
+.CodeMirror .cm-meta{color: #9E9E9E;} /*Meta elements like ex.: <!DOCTYPE html>*/
+.CodeMirror .cm-qualifier{color: #40D5B9;} /*Final qualifier like css class ex.: .cm-qualifier*/
+.CodeMirror .cm-tag{color: #999 ;} /*Tags ex. ul or <ul>*/
+.CodeMirror .cm-attribute{color: #76B8EB ;} /*Attribute ex. rel, href, name*/
+.CodeMirror .cm-keyword {color: #e6e6e6;} /*Element call ex. array, class, public function, if, elseif, !important*/
+.CodeMirror .cm-matchingtag{color: #FFD37F;}
+
+.CodeMirror .CodeMirror-matchingtag{} /*Matching tags, open/close. Try !important for bg, color etc. if it doesn't work*/
+div.CodeMirror span.CodeMirror-matchingbracket{} /*Matching brackets, open/close*/
+
+.CodeMirror-selected{background-color: #2D3F4F; color: #000000 !important;} /*Selected lines - may need !important*/
+.CodeMirror-activeline-background{;} /*Active line - may need !important*/
+.CodeMirror-gutter-elt{} /*Active line, line count section*/
+div.CodeMirror span.CodeMirror-searching{background-color: #ffffff !important;} /*Search result highlight- may need !important*/
+
+
+    /*Status bar - bottom*/
+#status-bar{}/*Bottom status bar*/
+#status-bar #status-info{}/*Line & column info*/
+#status-bar #status-indicators{}/*Second part of the status bar*/
+#status-bar #status-indicators{} #status-indent{} /*Indent status info*/
+#status-bar #status-indicators{} #status-language{} /*Language info*/
+#status-bar #status-indicators{} #fileSizeInfo{} /*File size*/
+#status-bar #status-indicators{} #filePathInfo{} /*File path*/
+
+    /*Status bar - ex. debug area*/
+#problems-panel{} /*Bottom error panel main wrapper*/
+#problems-panel .toolbar{} /*Error panel toolbar with title and X*/
+#problems-panel .toolbar .title{} /*Error panel toolbar title eg. "JSLint Errors"*/
+#problems-panel .toolbar .close{} /*X to close error panel*/
+#problems-panel .toolbar .table-container{} /*Table container with errors*/
+#problems-panel .table .tbody{} /*Table with errors - additional classes for look: table-striped table-condensed row-highlight, fimilar for people working with Boostrap*/
+#problems-panel .table .tbody tr{} /*Single row containing line number, "error" message and code info*/
+#problems-panel .table .tbody tr td.line-number{} /*Line number for error row*/
+/*There are no separated classes for error and code excerpt, the only hint I can give is: error is second child and excerpt is 3rd chaild of tr.*/
+
+    /*Right toolbar - live preview, extensions*/
+#main-toolbar{} /*Whole toolbar*/
+#main-toolbar .buttons{} /*Buttons group*/
+
+
+    /*Modal windows like context-menu, quick-view or hint container*/
+#context-menu-bar .dropdown-menu{} /*Dropdown menu, available under right-click - may need !important*/
+#context-menu-bar .dropdown-menu a{} /*Single option, treat it like <li> ex. background*/
+#context-menu-bar .dropdown-menu a:hover{} /*Single option, treat it like <li> ex. background - hover state. RGBA is not working!*/
+
+		/*If you need different dropdown style for different sections, use IDs below.*/
+			#context-menu-bar #project-context-menu .dropdown-menu{} /*Dropdown menu for project files section*/
+			#context-menu-bar #editor-context-menu .dropdown-menu{} /*Dropdown menu for editor section*/
+			#context-menu-bar #inline-editor-context-menu .dropdown-menu{} /*Dropdown menu for inline editor like Quick Edit*/
+		/*--back to general--*/
+
+#codehint-menu-bar .dropdown-menu{} /*Code hint menu, dropdown visible when writing code.*/
+#codehint-menu-bar .dropdown-menu li a{} /*Code hint menu option, dropdown visible when writing code. Treat like <li>*/
+#codehint-menu-bar .dropdown-menu li a span.code-hint-item{} /*Single hint in dropdown menu, automaticlly puts already typed text into <strong>*/
+
+    /*Inline editor(Ex. Quick Edit - Ctrl + E)*/
+.inline-widget{} /*Inline widget wrap, won't affect line count bar*/
+.inline-text-editor{} /*Whole editing area - without active rule*/
+.inline-text-editor .CodeMirror-lines{}/*Code lines in inline editor, syntax coloring has higher priority then .CodeMirror-lines*/
+.inline-editor-header{} /*Inline text editor header, includes info about inline editor file*/
+.inline-editor-header a.filename{} /*Filename visible in inline editor - may need !important*/
+.inline-editor-header a.filename span.line-number{} /*Line number next to filename - may need !important*/
+.inline-editor-header button.btn{} /*Button responsible for "New rule"*/
+
+/*Global rules apply to inline editor scroll, just use .inline-widget class to target only bar options of this area. Example below.*/
+.inline-widget .CodeMirror-gutter{} /*Inline editor "gutter", won't affect line count in inline editor*/
+.inline-widget .CodeMirror-linenumbers{} /*Inline editor line numbers bar - no "gutter"*/
+
+.inline-widget .related-container{} /*Related container with similar rules*/
+.inline-widget .related-container .selection {} /*Currently selected style rule*/
+.inline-widget .related-container ul li.selected {} /*Currently selected style rule from related container - text*/
+.inline-widget .related-container .related ul li{} /*List element with rule*/
+.inline-widget .related-container .related ul li .related-file{} /*File information for rule*/
+
+    /*Inline widget - extended color picker*/
+.inline-widget .color-editor{} /*Extended color editor area*/
+
+.inline-widget .color-editor .sliders .color-selection-field{} /*Color selection square - big one*/
+.inline-widget .color-editor .hue-slider{} /*Hue slider*/
+.inline-widget .color-editor .opacity-slider{} /*Opacity slider*/
+
+.inline-widget .color-editor input.color-value{} /*Input for color value*/
+.inline-widget .color-editor ul.button-bar{} /*Buttons for RGBa, HEX, HSLA*/
+.inline-widget .color-editor ul.button-bar li a{} /*Single buttons <li>*/
+.inline-widget .color-editor ul.button-bar li a.rgba{} /*RGBa button*/
+.inline-widget .color-editor ul.button-bar li a.hex{} /*HEX button*/
+.inline-widget .color-editor ul.button-bar li a.hsla{} /*HSLA button*/
+
+.inline-widget .color-editor .large-swatches{} /*Big swatches with currently picked and original color*/
+.inline-widget .color-editor .large-swatches .current-color{} /*Current color swatch*/
+.inline-widget .color-editor .large-swatches .original-color{} /*Original color swatch*/
+
+.inline-widget .color-editor ul.swatches{} /*Small swatches with color suggestions*/
+.inline-widget .color-editor ul.swatches li .swatch-bg{} /*Swatch sample*/
+.inline-widget .color-editor ul.swatches li span.value{} /*Swatch label with color value*/
\ No newline at end of file
diff --git a/src/themes/theme/aquaman.css b/src/themes/theme/aquaman.css
new file mode 100644
index 00000000000..6ac762bd606
--- /dev/null
+++ b/src/themes/theme/aquaman.css
@@ -0,0 +1,225 @@
+
+/* Made with love by @DiegoAlvarezA */
+
+#main-toolbar {
+    background:#3c3f41;
+}
+
+#sidebar #working-set-header ,
+#sidebar #open-files-container ul li.selected a ,
+#sidebar #open-files-container ul li a:hover,
+#sidebar #project-files-header,
+#sidebar #project-files-header #project-dropdown-toggle {
+    color:#f8cb4f;
+}
+
+
+#sidebar #open-files-container {
+    color:#fafafa;
+}
+
+
+#sidebar #open-files-container ul li a span.extension,
+#sidebar #project-files-container ul li a span.extension {
+    color:#fce8b1
+}
+
+
+#sidebar #project-files-container ul li a {
+    color:#fafafa;
+    -webkit-transition:all 0.1s ease-in-out;
+}
+
+#sidebar #project-files-container ul li a.jstree-hovered {
+    color:#f8cb4f;
+    -webkit-transform:translateX(5px);
+}
+
+
+
+    .cm-s-aquaman.CodeMirror{
+        background:#242424;
+        color:#e0e0e0;
+    }
+
+    .cm-s-aquaman .CodeMirror-gutters {
+        background-color: #242424;
+        border-right:0;
+    }
+
+
+     .cm-s-aquaman .CodeMirror-hscrollbar{
+        bottom: 2px;
+        border-color: #202020;
+    }
+
+     .cm-s-aquaman .CodeMirror-vscrollbar{
+        right: 2px;
+        border-color: #202020;
+    }
+
+    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar {
+        height: 10px;
+    }
+
+    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar {
+        width: 10px;
+    }
+    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar-track ,
+    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar-track   {
+        background: transparent;
+    }
+    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar-thumb ,
+    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar-thumb  {
+        background: #3c3f41;
+
+    }
+    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar-thumb:hover ,
+    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar-thumb:hover {
+        background: #dd8440;
+    }
+    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar-thumb:active ,
+    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar-thumb:active{
+        background: #4bd278;
+    }
+
+    .cm-s-aquaman .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
+        background-color: transparent;
+    }
+
+
+.cm-s-aquaman .cm-keyword       {color: #f6bf28;}
+.cm-s-aquaman .cm-number        {color: #f8cb4f;}
+.cm-s-aquaman .cm-variable      {color: #dd8440;}
+.cm-s-aquaman .cm-variable-2    {color: #f8cb4f;}
+.cm-s-aquaman .cm-variable-3    {color: #f8cb4f;}
+.cm-s-aquaman .cm-property      {color: #fcc6a0;}
+.cm-s-aquaman .cm-operator      {color: #e0e0e0;}
+.cm-s-aquaman .cm-atom          {color: #f8cb4f;}
+.cm-s-aquaman .cm-comment       {color: #4b4b4b; /* background:#d6d6d6; */}
+.cm-s-aquaman .cm-comment:hover {color: #242424; background:#d6d6d6;}
+.cm-s-aquaman .cm-string        {color: #f8cb4f;}
+.cm-s-aquaman .cm-string-2      {color: #f8cb4f;}
+.cm-s-aquaman .cm-def           {color: #41cf70;}
+.cm-s-aquaman .cm-meta          {color: #f8cb4f;}
+.cm-s-aquaman .cm-qualifier     {color: #41cf70;}
+.cm-s-aquaman .cm-tag             {color: #dd8440;}
+.cm-s-aquaman .cm-builtin       {color: #45cf5e;}
+.cm-s-aquaman .cm-attribute     {color: #45cf5e;}
+.cm-s-aquaman .cm-link             {color: #dd8440;}
+
+
+
+    .cm-s-aquaman .CodeMirror-selected {
+        background: #dd8440!important;
+        opacity:0.1;
+
+    }
+
+    .cm-s-aquaman .cm-matchhighlight {
+        background: #dd8440;
+        color:#2c2c2c!important;
+        border-radius:0px;
+
+    }
+
+
+    .cm-s-aquaman .CodeMirror-matchingtag {
+        color: #4bd164 !important;
+        text-decoration:underline;
+
+    }
+
+    .cm-s-aquaman span.CodeMirror-searching {
+        background: #4bd278;
+        color:#2c2c2c !important;
+        border-radius:0px;
+    }
+
+
+    .cm-s-aquaman .cm-matchhighlight.CodeMirror-searching.CodeMirror-selectedtext {
+        background: #dd8440 ;
+        color:#2c2c2c !important;
+        border-radius:0px;
+    }
+
+
+    .cm-s-aquaman span.CodeMirror-matchingbracket {
+        color: #f7c741 !important;
+        background:transparent;
+        font-weight: bold;
+        backface-visibility: hidden;
+
+    }
+
+    .cm-s-aquaman span.CodeMirror-nonmatchingbracket {
+        color: #f7c741 !important;
+        backface-visibility: hidden;
+
+    }
+
+
+    .cm-s-aquaman div.CodeMirror-cursor ,
+    .cm-s-aquaman div.CodeMirror-secondarycursor {
+        border-left: 2px solid #ff8833;
+        z-index:5;
+    }
+
+
+#status-bar {
+    border-top:1px solid #484b4d;
+    background:#3c3f41;
+
+}
+
+#status-bar #status-info {
+    color:#f7c741;
+
+}
+
+#status-bar #status-indicators{
+    background:#3c3f41;
+
+}
+
+#status-bar #status-indicators #status-language {
+    color:#dd8440;
+}
+
+
+#status-bar #status-indicators #status-indent {
+    color:#41cf70;
+}
+
+#context-menu-bar .dropdown-menu a{color:#3c3f41}
+#context-menu-bar .dropdown-menu a:hover{background:#f8cb4f}
+
+
+.inline-widget .CodeMirror-gutter {
+    background: #242424 !important;
+
+}
+
+.inline-editor-header{
+    box-shadow: inset 0 0 5px #1f1f1f;
+    background:#242424;
+    height:30px;
+    width:100%;
+}
+
+
+.inline-editor-header a.filename span.line-number{
+    color:#e0e0e0 !important;
+}
+
+
+.inline-editor-header a.filename {
+    color:#f8cb4f !important;
+}
+
+
+.inline-widget .color-editor ul.swatches li span.value{color:#525252}
+
+
+
+
diff --git a/src/themes/theme/default.css b/src/themes/theme/default.css
new file mode 100644
index 00000000000..4c43136823f
--- /dev/null
+++ b/src/themes/theme/default.css
@@ -0,0 +1,3 @@
+.cm-s-default .CodeMirror-lines {
+    pointer-events: all;
+}
diff --git a/src/themes/theme/dracula.css b/src/themes/theme/dracula.css
new file mode 100644
index 00000000000..e2f1b6082ca
--- /dev/null
+++ b/src/themes/theme/dracula.css
@@ -0,0 +1,98 @@
+.cm-s-dracula.CodeMirror { background: #282a36 !important; color: #EEE; }
+
+.CodeMirror div.CodeMirror-cursor { border-left: 1px solid #FFF !important; }
+.CodeMirror-selected { background: #3a3d4e !important; color: #eee !important; }
+.CodeMirror-lines{ line-height: 14px !important; }
+
+.cm-s-dracula .cm-keyword { color: #8be9fd !important; font-style: italic; }
+
+.cm-s-dracula .cm-js-atom { color: #FFF5B4 !important; }
+.cm-s-dracula .cm-css-atom { color: #bd93f9 !important; }
+
+.cm-s-dracula .cm-js-number {color: #bd93f9 !important; }
+.cm-s-dracula .cm-css-number {color: #bd93f9 !important; }
+
+.cm-s-dracula .cm-js-def { color: #8be9fd !important; }
+.cm-s-dracula .cm-css-def { color: #bd93f9 !important; }
+
+.cm-s-dracula .cm-js-variable { color: #ccc !important; }
+.cm-s-dracula .cm-js-variable-2 { color: #ccc !important; }
+.cm-s-dracula .cm-css-variable { color: #50fa7b !important; }
+.cm-s-dracula .cm-css-variable-2 { color: #50fa7b !important; }
+
+.cm-s-dracula .cm-js-property { color: #50fa7b !important; }
+.cm-s-dracula .cm-css-property { color: #6AEDFF !important;}
+
+.cm-s-dracula .cm-js-operator { color: #bd93f9 !important;}
+.cm-s-dracula .cm-css-operator  { color: #ccc !important; }
+
+.cm-s-dracula .cm-js-comment { color: #6272a4 !important; font-style: normal; }
+.cm-s-dracula .cm-css-comment { color: #6272a4 !important; font-style: italic; }
+.cm-s-dracula .cm-xml-comment { color: #6272a4 !important; font-style: normal !important; }
+
+.cm-s-dracula .cm-js-string { color: #f1fa8c !important; }
+.cm-s-dracula .cm-js-string-2 { color: #f1fa8c !important; }
+.cm-s-dracula .cm-css-string { color: #f1fa8c !important;}
+.cm-s-dracula .cm-css-string-2 { color: #8be9fd !important; }
+
+.cm-s-dracula .cm-js-meta { color: #8be9fd !important; }
+.cm-s-dracula .cm-css-meta { color: #6AEDFF !important;}
+
+.cm-s-dracula .cm-qualifier { color: #50fa7b !important; }
+
+.cm-s-dracula .cm-js-tag { color: #8be9fd !important; }
+.cm-s-dracula .cm-css-tag { color: #ff79c6 !important; }
+.cm-s-dracula .cm-xml-tag { color: #ff79c6 !important; }
+
+.cm-s-dracula .cm-js-attribute { color: #50fa7b !important; }
+.cm-s-dracula .cm-xml-attribute { color: #ff79c6 !important; }
+
+div.CodeMirror span.CodeMirror-matchingbracket { border: 1px solid #15CA1A !important; border-radius: 4px; color: #ccc !important;}
+
+div.CodeMirror span.cm-matchhighlight.CodeMirror-searching.CodeMirror-selectedtext { background-color: #3a3d4e !important;}
+
+/* */
+.cm-execution-line { background-color: rgba(137,245,162,.2) !important; outline: 1px solid #181818 !important;}
+.cm-js-hr { color: #AEAEAE !important; }
+.cm-js-link { color: #8be9fd !important; }
+.CodeMirror-linenumber { border-right: none !important;}
+.cm-xml-error { color: #bf4c4c  !important; }
+.cm-xml-string { color: #f1fa8c !important; }
+.cm-xml-link { color: #f1fa8c !important; }
+.cm-comment { color: #6272a4 !important; font-style: normal !important; }
+.cm-error { color: #bf4c4c  !important; }
+.cm-string { color: #f1fa8c !important; }
+.cm-tag { color: #ff79c6 !important; }
+.cm-attribute { color: #50fa7b !important; }
+.cm-link { color: #f1fa8c !important; }
+
+
+/*--GLOBAL EDITOR STYLES--*/
+.cm-breakpoint .CodeMirror-gutter-elt { color: #000 !important; font-weight: 700 !important;}
+.CodeMirror-cursor { border-left: 1px solid #FFF !important; }
+.cm-error { background: #9D1E15 !important; border-radius: 2px !important; color: #eee !important;}
+.CodeMirror-gutter-elt { color: #888 !important;}
+.CodeMirror-gutters {background: #282828 !important; border-right: 2px solid #2b2b2b !important; }
+.CodeMirror-selected { background: #3a3d4e !important; color: #eee !important; }
+.CodeMirror-nonmatchingbracket { border: 1px solid #db0404 !important; border-radius: 4px; color: #ccc !important;}
+.cm-search-highlight-start:before { border-color: #94a3dd !important;}
+.cm-search-highlight-end:before { border-color: #94a3dd !important;}
+.cm-search-highlight:before { border-color: #94a3dd !important; padding: 2px !important;}
+.cm-line-with-selection .cm-column-with-selection.cm-search-highlight:before { background-color: #94a3dd !important; border-radius: 2px !important;}
+span.cm-token-highlight { background-color: transparent !important; padding: 0px !important;}
+span.cm-token-highlight:before { border-color: #94a3dd !important; }
+.cm-line-with-selection span.cm-column-with-selection { color: #000 !important; background-color: #94a3dd !important; }
+.cm-whitespace:before { color: #555 !important;}
+.cm-tab:before { border-bottom: 1px solid #555 !important;}
+
+.cm-highlight {
+    -webkit-animation: "fadeout-revised" 3s 0s !important;
+}
+
+.cm-highlight *:not(.CodeMirror-linenumber){
+    color: #000 !important;
+}
+
+.CodeMirror .webkit-html-warning-message{
+    color: #411f07 !important;
+}
diff --git a/src/themes/theme/hammsidian.css b/src/themes/theme/hammsidian.css
new file mode 100644
index 00000000000..dd788b7ef9f
--- /dev/null
+++ b/src/themes/theme/hammsidian.css
@@ -0,0 +1,125 @@
+.cm-s-hammsidian.CodeMirror
+{
+    font-family: consolas !important;
+    background-color: #293134;
+    color: #E0E2E4;
+    font-size: 16px !important;
+}
+
+.cm-s-hammsidian.CodeMirror .CodeMirror-lines pre
+{
+    z-index: 3;
+}
+
+.cm-s-hammsidian.CodeMirror .CodeMirror-gutters
+{
+    background-color: #293134;
+}
+
+.cm-s-hammsidian.CodeMirror .CodeMirror-linenumber
+{
+    background-color: #293134;
+    color: #81969A;
+}
+
+.cm-s-hammsidian.CodeMirror .CodeMirror-matchingbracket
+{
+    color: #dedede;
+    outline: 1px solid #dedede;
+}
+
+.cm-s-hammsidian.CodeMirror .CodeMirror-linebackground,
+.cm-s-hammsidian.CodeMirror .CodeMirror-activeline
+{
+    background-color: #2F393C;
+}
+
+
+.cm-s-hammsidian.CodeMirror .cm-atom { color: #EC7600; }
+.cm-s-hammsidian.CodeMirror .cm-qualifier { color: #678CB1; }
+
+/*CodeMirror does not add notation for css...  Which would be really nice. */
+/*.cm-s-hammsidian.CodeMirror .cm-property { color: red; }*/
+
+.cm-s-hammsidian.CodeMirror .cm-keyword { color: #93C763; }
+.cm-s-hammsidian.CodeMirror .cm-comment { color: #7D8C93; }
+.cm-s-hammsidian.CodeMirror .cm-string {color: #EC7600;}
+.cm-s-hammsidian.CodeMirror .cm-string-2 {color: #EC7600;}
+.cm-s-hammsidian.CodeMirror .cm-variable { color: #E0E2E4; }
+/*.cm-s-hammsidian.CodeMirror .cm-variable-2 { color: #EC7600; }*/
+.cm-s-hammsidian.CodeMirror .cm-tag { color: rgb(147,199,99); }
+.cm-s-hammsidian.CodeMirror .cm-attribute { color: #678CB1; }
+.cm-s-hammsidian.CodeMirror .cm-property { color: rgb(140,140,180); }
+.cm-s-hammsidian.CodeMirror .cm-number { color: #FF9E3D;}
+
+/*.cm-s-hammsidian.CodeMirror .cm-meta { color: #EC7600; }*/
+.cm-s-hammsidian.CodeMirror .cm-error { color: #EC7600; }
+
+.cm-s-hammsidian.CodeMirror .cm-matchhighlight:not(.CodeMirror-selectedtext)
+{
+      background-color: #616161;
+    color: white;
+}
+
+.CodeMirror-gutters {
+  border-right: 1px solid #444;
+}
+
+.CodeMirror-foldmarker {
+    padding-right:5px;
+    padding-left:5px;
+    background:#4d4d4d;
+    border:1px solid #ddd;
+    margin-right:3px;
+    margin-left:3px;
+    border-radius:3px;
+    color:#fff;
+    cursor:pointer;
+}
+
+.cm-s-hammsidian.CodeMirror .CodeMirror-selectedtext
+{
+      background-color: #804000;
+}
+
+.cm-s-hammsidian.CodeMirror .CodeMirror-selected
+{
+      background: transparent;
+}
+
+.cm-s-hammsidian.CodeMirror-focused .CodeMirror-selected
+{
+      background: transparent;
+}
+
+.cm-s-hammsidian.CodeMirror .CodeMirror-cursor
+{
+    z-index: 5;
+    border-left: 1px solid white;
+}
+
+#status-bar {
+    border-top:1px solid #484b4d;
+    background:#3c3f41;
+
+}
+
+#status-bar #status-info {
+    color:#f7c741;
+
+}
+
+#status-bar #status-indicators{
+    background:#3c3f41;
+
+}
+
+#status-bar #status-indicators #status-language {
+    color:#ed8d47;
+}
+
+
+#status-bar #status-indicators #status-indent {
+    color:#4bd278;
+}
+
diff --git a/src/themes/theme/light-table.css b/src/themes/theme/light-table.css
new file mode 100644
index 00000000000..881dfedd158
--- /dev/null
+++ b/src/themes/theme/light-table.css
@@ -0,0 +1,124 @@
+.cm-s-light-table.CodeMirror {
+	background-color: #202020;
+    color:#ccc;
+    padding-left: 8px;
+}
+.cm-s-light-table .CodeMirror-sizer{
+	padding-bottom: 90px;
+}
+
+.cm-s-light-table .CodeMirror-scroll{
+	margin-right: 5px;
+	border-color: #202020;
+}
+.cm-s-light-table .CodeMirror-vscrollbar{
+	overflow-y: hidden;
+}
+.cm-s-light-table ::-webkit-scrollbar {
+    width: 10px;
+}
+.cm-s-light-table ::-webkit-scrollbar-track {
+    background: transparent;
+}
+.cm-s-light-table ::-webkit-scrollbar-thumb {
+    background: rgba(255,255,255,.2);
+    border-radius: 5px;
+}
+.cm-s-light-table ::-webkit-scrollbar-thumb:hover{
+	background: rgba(255,255,255,.3);
+}
+.cm-s-light-table ::-webkit-scrollbar-thumb:active{
+	background: rgba(255,255,255,.4);
+}
+
+.cm-s-light-table.CodeMirror .inline-widget{
+	background: #272727;
+	color: #ccc;
+}
+.cm-s-light-table.CodeMirror .inline-widget h1,
+.cm-s-light-table.CodeMirror .inline-widget h2,
+.cm-s-light-table.CodeMirror .inline-widget h3{
+	color: #ccc;
+}
+.cm-s-light-table.CodeMirror .inline-widget p,
+.cm-s-light-table.CodeMirror .inline-widget dt,
+.cm-s-light-table.CodeMirror .inline-widget li,
+.cm-s-light-table.CodeMirror .inline-widget code{
+	color: #fff;
+}
+.cm-s-light-table.CodeMirror .CodeMirror-gutters {
+    border-color: #202020;
+    background: #202020;
+}
+.cm-s-light-table.CodeMirror .CodeMirror-linenumbers {
+	background-color: #202020;
+}
+.cm-s-light-table.CodeMirror .CodeMirror-linenumber {
+	color: #99997a;
+	padding-left: 15px;
+}
+.cm-s-light-table.CodeMirror .CodeMirror-activeline,
+.cm-s-light-table.CodeMirror.CodeMirror-focused .CodeMirror-activeline .CodeMirror-gutter-elt{
+	background: rgba(255,255,255,.1);
+}
+.cm-s-light-table.CodeMirror pre{
+	/*padding between line number & content*/
+	padding: 0 8px;
+}
+
+.cm-s-light-table.CodeMirror .CodeMirror-cursor {
+	border-left: 1px solid #ffffff;
+}
+.cm-s-light-table.CodeMirror .CodeMirror-selected {
+	background: rgba(255,255,255,.2);
+}
+
+.cm-s-light-table.CodeMirror .CodeMirror-matchingbracket {
+	border-bottom: 1px solid #33ffff;
+    color: #ccc19b;
+}
+.cm-s-light-table.CodeMirror .CodeMirror-unmatchingbracket {
+	border-bottom: 1px solid #cb3233;
+    color: #cb3233;
+}
+
+
+.cm-s-light-table.CodeMirror .cm-comment { 
+    color: #968879;
+}
+.cm-s-light-table.CodeMirror .cm-property {
+    color: #aaaaaa;
+}
+.cm-s-light-table.CodeMirror .cm-qualifier { 
+    color: #aaeeab;
+}
+.cm-s-light-table.CodeMirror .cm-tag { 
+    color: #7ac1ff;
+}
+.cm-s-light-table.CodeMirror .cm-def { 
+    color: #aaccff;
+}
+.cm-s-light-table.CodeMirror .cm-number {
+    color: #ccccab;
+}
+.cm-s-light-table.CodeMirror .cm-atom { 
+    color: #cc9dc7;
+}
+.cm-s-light-table.CodeMirror .cm-keyword{
+    color: #aacd80;
+}
+.cm-s-light-table.CodeMirror .cm-string{
+    color: #aadddd;
+}
+.cm-s-light-table.CodeMirror .cm-string-2{
+    color: #7ad1dd;
+}
+.cm-s-light-table.CodeMirror .cm-variable { 
+    color: #ccc19b; 
+}
+.cm-s-light-table.CodeMirror .cm-variable-2 { 
+    color: #aaccff; 
+}
+.cm-s-light-table.CodeMirror .cm-attribute {
+    color: #83e1b2;
+}
\ No newline at end of file
diff --git a/src/themes/theme/monokai-dark-soda.css b/src/themes/theme/monokai-dark-soda.css
new file mode 100644
index 00000000000..8e6e0915930
--- /dev/null
+++ b/src/themes/theme/monokai-dark-soda.css
@@ -0,0 +1,55 @@
+.cm-s-monokai-dark-soda.CodeMirror {
+  background-color: #242424;
+  color: #fff;
+}
+
+.CodeMirror div.CodeMirror-cursor {
+  border-left: 1px solid #f8f8f0;
+  z-index: 3;
+}
+
+.CodeMirror-selected {
+    background: #3d3d3d;
+    opacity: .23;
+}
+
+.cm-s-monokai-dark-soda .cm-keyword {color: #ff007f;}
+.cm-s-monokai-dark-soda .cm-atom {color: #c48cff;}
+.cm-s-monokai-dark-soda .cm-number {color: #c48cff;}
+.cm-s-monokai-dark-soda .cm-def {color: #fd963f;}
+.cm-s-monokai-dark-soda .cm-variable {color: #fff;}
+.cm-s-monokai-dark-soda .cm-variable-2 {color: #c48cff;}
+.cm-s-monokai-dark-soda .cm-property {color: #52e3f6;}
+.cm-s-monokai-dark-soda .cm-operator {color: #ff007f;}
+.cm-s-monokai-dark-soda .cm-comment {color: #8c8c8c;}
+.cm-s-monokai-dark-soda .cm-string {color: #ece47e;}
+.cm-s-monokai-dark-soda .cm-string-2 {color: #ece47e;}
+.cm-s-monokai-dark-soda .cm-meta {color: #a7ec21;}
+.cm-s-monokai-dark-soda .cm-qualifier {color: #a7ec21;}
+.cm-s-monokai-dark-soda .cm-bracket {color: #f9faf4;}
+.cm-s-monokai-dark-soda .cm-tag {color: #ff007f;}
+.cm-s-monokai-dark-soda .cm-attribute {color: #a7ec21;}
+
+.cm-s-monokai-dark-soda .cm-matchhighlight:not(.CodeMirror-selectedtext) {
+    background-color: #616161;
+    color: white;
+}
+
+.cm-s-monokai-dark-soda .cm-matchhighlight {
+  background-color: #00CCFF;
+  color: #242424;
+}
+
+.CodeMirror .CodeMirror-matchingbracket {
+    color: #a7ec21;
+    font-weight: bold;
+}
+
+.CodeMirror .CodeMirror-gutters {
+    background-color: #242424;
+}
+
+.CodeMirror .CodeMirror-searching {
+  color: #242424;
+  background-color: #ffe69d !important;
+}
diff --git a/src/themes/theme/nando.css b/src/themes/theme/nando.css
new file mode 100644
index 00000000000..8e550ed7572
--- /dev/null
+++ b/src/themes/theme/nando.css
@@ -0,0 +1,53 @@
+/**
+ * @author  Héctor Fernando Hurtado
+ * @version 2013-05-27
+ */
+
+.cm-s-nando.CodeMirror {
+	background: rgb(30,30,30); /* Old browsers */
+background: -moz-linear-gradient(top, rgba(30,30,30,1) 0%, black 100%); /* FF3.6+ */
+background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(30,30,30,1)), color-stop(100%,black)); /* Chrome,Safari4+ */
+background: -webkit-linear-gradient(top, rgba(30,30,30,1) 0%,black 100%); /* Chrome10+,Safari5.1+ */
+background: -o-linear-gradient(top, rgba(30,30,30,1) 0%,black 100%); /* Opera 11.10+ */
+background: -ms-linear-gradient(top, rgba(30,30,30,1) 0%,black 100%); /* IE10+ */
+background: linear-gradient(to bottom, rgba(30,30,30,1) 0%,black 100%); /* W3C */
+filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1e1e1e', endColorstr='#353535',GradientType=0 ); /* IE6-9 */
+
+    color: #fbffa0;
+}
+.cm-s-nando div.CodeMirror-selected {background: #075601 !important;}
+.cm-s-nando .CodeMirror-activeline-background { background: #222 !important; }
+
+.cm-s-nando .CodeMirror-gutters { background: rgb( 30, 30, 30 ); border-right:1px solid #f4f4f4; }
+
+.cm-s-nando span.cm-meta {color: #c1c1c1;}
+.cm-s-nando span.cm-keyword { line-height: 1em; font-weight: bold; color: #aaffb4; }
+.cm-s-nando span.cm-atom {color: #f4f4f4;}
+.cm-s-nando span.cm-number {color: #f4f4f4;}
+.cm-s-nando span.cm-def {color: #e7adff;}
+.cm-s-nando span.cm-variable {color: #f4f4f4;}
+.cm-s-nando span.cm-variable-2 {color: #f4f4f4;}
+.cm-s-nando span.cm-variable-3 {color: #f4f4f4;}
+.cm-s-nando span.cm-property {color: #c1c1c1;}
+.cm-s-nando span.cm-operator {color: #f4f4f4;}
+.cm-s-nando span.cm-comment {color: #c1c1c1;}
+.cm-s-nando span.cm-string {color: #c1c1c1;}
+.cm-s-nando span.cm-string-2 {color: #c1c1c1;}
+.cm-s-nando span.cm-error {color: #ff7a7a;}
+.cm-s-nando span.cm-qualifier {color: #adf6ff;}
+.cm-s-nando span.cm-builtin {color: #f4f4f4;}
+.cm-s-nando span.cm-bracket {color: #f4f4f4;}
+.cm-s-nando span.cm-tag {color: #aaffb4;}
+.cm-s-nando span.cm-attribute {color: #adf6ff;}
+.cm-s-nando span.cm-link {color: #a9d7f9;}
+
+.cm-s-nando .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-nando .CodeMirror-linenumber { color: #f4f4f4; }
+div.CodeMirror span.CodeMirror-matchingbracket { color: #f4f4f4; }
+
+.cm-s-nando .CodeMirror-matchingbracket {
+	/* outline:1px solid grey; */
+    font-weight: bold;
+	color: #adf6ff !important;
+}
diff --git a/src/themes/theme/obsidian.css b/src/themes/theme/obsidian.css
new file mode 100644
index 00000000000..bc91bd1d2c5
--- /dev/null
+++ b/src/themes/theme/obsidian.css
@@ -0,0 +1,80 @@
+.cm-s-obsidian.CodeMirror
+{
+    font-family: monaco;
+    background-color: #293134;
+    color: #E0E2E4;
+}
+
+.cm-s-obsidian.CodeMirror .CodeMirror-lines pre
+{
+    z-index: 3;
+}
+
+.cm-s-obsidian.CodeMirror .CodeMirror-gutters
+{
+	background-color: #293134;
+}
+
+.cm-s-obsidian.CodeMirror .CodeMirror-linenumber
+{
+	background-color: #293134;
+	color: #81969A;
+}
+
+.cm-s-obsidian.CodeMirror .CodeMirror-matchingbracket
+{
+    color: #dedede;
+	outline: 1px solid #dedede;
+}
+
+.cm-s-obsidian.CodeMirror .CodeMirror-linebackground,
+.cm-s-obsidian.CodeMirror .CodeMirror-activeline
+{
+    background-color: #2F393C;
+}
+
+
+.cm-s-obsidian.CodeMirror .cm-atom { color: #EC7600; }
+.cm-s-obsidian.CodeMirror .cm-qualifier { color: #678CB1; }
+
+/*CodeMirror does not add notation for css...  Which would be really nice. */
+/*.cm-s-obsidian.CodeMirror .cm-property { color: red; }*/
+
+.cm-s-obsidian.CodeMirror .cm-keyword { color: #93C763; }
+.cm-s-obsidian.CodeMirror .cm-comment { color: #7D8C93; }
+.cm-s-obsidian.CodeMirror .cm-string {color: #EC7600;}
+.cm-s-obsidian.CodeMirror .cm-string-2 {color: #EC7600;}
+.cm-s-obsidian.CodeMirror .cm-variable { color: #E0E2E4; }
+.cm-s-obsidian.CodeMirror .cm-variable-2 { color: #E0E2E4; }
+.cm-s-obsidian.CodeMirror .cm-tag { color: #678CB1; }
+.cm-s-obsidian.CodeMirror .cm-attribute { color: #678CB1; }
+.cm-s-obsidian.CodeMirror .cm-property { color: #E0E2E4; }
+.cm-s-obsidian.CodeMirror .cm-number { color: #FFCD22; }
+
+.cm-s-obsidian.CodeMirror .cm-matchhighlight:not(.CodeMirror-selectedtext)
+{
+  	background-color: #616161;
+    color: white;
+}
+
+.cm-s-obsidian.CodeMirror .CodeMirror-selectedtext
+{
+  	background-color: #804000;
+}
+
+.cm-s-obsidian.CodeMirror .CodeMirror-selected
+{
+  	background: transparent;
+}
+
+.cm-s-obsidian.CodeMirror-focused .CodeMirror-selected
+{
+  	background: transparent;
+}
+
+.cm-s-obsidian.CodeMirror .CodeMirror-cursor
+{
+    z-index: 5;
+    border-left: 1px solid white;
+}
+
diff --git a/src/themes/theme/pixie.css b/src/themes/theme/pixie.css
new file mode 100644
index 00000000000..115f3cec6c8
--- /dev/null
+++ b/src/themes/theme/pixie.css
@@ -0,0 +1,265 @@
+.panel {
+  background:#2b2b2b;
+}
+
+#main-toolbar,
+#status-bar,
+#status-indicators {
+  background:#242424;
+  color:#ccc;
+}
+
+/*#sidebar {
+  position: inherit !important;
+}
+#working-set-header {
+  display: none !important;
+}
+#open-files-container {
+  width: 100% !important;
+  position: absolute !important;
+  z-index: 10 !important;
+  max-height: auto !important;
+  height: auto !important;
+  overflow: hidden !important;
+}
+#open-files-container li {
+  float: left;
+}*/
+
+#status-info {
+  color:#ccc;
+}
+
+#open-files-container,
+#working-set-header {
+  color:#aaa;
+  background:#111;
+}
+#project-files-header {
+  color:#aaa;
+  background:#222;
+}
+.recent-folder,
+#open-folder-link {
+  color:#ddd;
+}
+#project-dropdown.dropdown-menu a.selected {
+  background: #0081c2;
+}
+.dropdown-menu {
+  background: #333;
+  color: #aaa;
+}
+.dropdown-menu .divider {
+  background: #222;
+  border-bottom: 1px solid #444;
+}
+.sidebar-selection {
+  background: #1a1a1a;
+}
+.sidebar-selection-triangle {
+  display: none !important;
+}
+
+.jstree-brackets li.jstree-closed > a,
+.jstree-brackets li.jstree-open > a {
+  color:#ccc;
+}
+
+#open-files-container .extension,
+.jstree-brackets li .extension {
+  color:#aaa;
+}
+
+.cm-s-pixie.CodeMirror {
+    background-color:#202020;
+    color:#fff;
+}
+
+.cm-s-pixie.CodeMirror div.CodeMirror-cursor {
+  border-left:1px solid #f8f8f0;
+  z-index:3;
+}
+
+.cm-s-pixie .CodeMirror-selected {
+  background:#3d3d3d;
+  opacity:.5;
+}
+
+.cm-s-pixie .cm-keyword    {color:#CC7833;}
+.cm-s-pixie .cm-atom       {color:#A5C261;}
+.cm-s-pixie .cm-number     {color:#A5C261;}
+.cm-s-pixie .cm-def        {color:#A0BD2D;}
+.cm-s-pixie .cm-variable   {color:#FFCC33;}
+.cm-s-pixie .cm-variable-2 {color:#DA4939;}
+.cm-s-pixie .cm-property   {color:#DAD6CD;}
+.cm-s-pixie .cm-operator   {color:#34A2D9;}
+.cm-s-pixie .cm-comment    {color:#BC9458;}
+.cm-s-pixie .cm-string     {color:#A0BD2D;}
+.cm-s-pixie .cm-string-2   {color:#A5C261;}
+.cm-s-pixie .cm-meta       {color:#CC7833;}
+.cm-s-pixie .cm-qualifier  {color:#FFCC33;}
+.cm-s-pixie .cm-bracket    {color:#FF3333;}
+.cm-s-pixie .cm-tag        {color:#E8BF6A;}
+.cm-s-pixie .cm-attribute  {color:#FFCC33;}
+.cm-s-pixie .cm-builtin  {color:#CC7833;}
+
+.cm-s-pixie .cm-matchhighlight {
+  background:#00CCFF;
+  box-shadow:0 0 5px #00CCFF;
+  color:#000;
+  border-radius:2px;
+}
+
+.cm-s-pixie.CodeMirror span.CodeMirror-nonmatchingbracket {
+  color:#FF3333;
+  text-shadow: none;
+  border-bottom: 1px solid #FF3333;
+}
+
+.cm-s-pixie.CodeMirror span.CodeMirror-matchingbracket {
+  color:#DAD6CD;
+  text-shadow: none;
+  border-bottom: 1px solid #DAD6CD;
+}
+
+.cm-s-pixie.CodeMirror span.cm-matchhighlight.CodeMirror-searching.CodeMirror-selectedtext {
+  background-color:#FFCC33;
+  color:#000;
+  border:0;
+  box-shadow:0 0 5px #FFCC33;
+  border-radius:2px;
+}
+
+.cm-s-pixie.CodeMirror span.CodeMirror-matchingtag {
+  color: #E8BF6A !important;
+  background-color: #222222 !important;
+}
+
+.cm-s-pixie.CodeMirror span.CodeMirror-searching {
+  background-color:#00CCFF;
+  box-shadow:0 0 5px #00CCFF;
+  color:#000;
+  border-radius:2px;
+}
+
+.cm-s-pixie .CodeMirror-activeline-background {
+  background:hsla(0,0%,0%,0.5)!important;
+  margin:-1px -10px;
+}
+
+.cm-s-pixie div.CodeMirror-gutter {
+  color:#ccc;
+}
+
+.cm-s-pixie div.CodeMirror-gutters {
+  background-color:#333435;
+  box-shadow:0 0 10px hsla(0,0%,0%,.8);
+  padding:0 15px 20px 10px;
+  border-right:0;
+}
+
+.cm-s-pixie span.CodeMirror-widget {
+  margin:-3px 0px;
+  display:inline-block;
+}
+.cm-s-pixie span.CodeMirror-foldmarker {
+  display:inline-table;
+  background:#ccc;
+  border:0;
+  color:#000;
+  border-radius:3px;
+  font-size:20px;
+  margin:3px;
+  padding:0px 5px;
+  height:15px;
+  line-height:15px;
+  overflow:hidden;
+  white-space:nowrap;
+}
+
+/* Let's get this party started */
+::-webkit-scrollbar {
+    -webkit-appearance: none;
+    width: 12px;
+}
+
+/* Track */
+::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+    background-color: #1a1a1a;
+}
+
+/* Handle */
+::-webkit-scrollbar-thumb {
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+    background: rgba(100,100,100,1);
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
+}
+::-webkit-scrollbar-thumb:window-inactive {
+    background: rgba(55,55,55,0.9);
+}
+
+.extension-manager-dialog .modal-header,
+.extension-manager-dialog .modal-footer {
+  background: #222;
+}
+.extension-manager-dialog .modal-body {
+  background: #1a1a1a;
+}
+.extension-manager-dialog .modal-footer {
+  border-color: #1a1a1a;
+}
+.extension-manager-dialog .modal-header .nav-tabs > li > a {
+  color: #eee;
+}
+.extension-manager-dialog .modal-header .nav-tabs > .active > a,
+.extension-manager-dialog .modal-header .nav-tabs > .active > a:hover {
+  background: #333;
+  border-color: #1a1a1a #1a1a1a transparent #1a1a1a;
+}
+.table-striped tbody tr:nth-child(odd) td,
+.table-striped tbody tr:nth-child(odd) th {
+  background: #333;
+  color: #eee;
+}
+.table-striped tbody tr:nth-child(even) td,
+.table-striped tbody tr:nth-child(even) th {
+  background: #2a2a2a;
+  color: #eee;
+}
+body.platform-win .extension-manager-dialog .modal-body .extension-list .ext-name,
+body.platform-win .extension-manager-dialog .modal-body .extension-list .ext-desc {
+  color: #eee;
+}
+.extension-manager-dialog .modal-header .nav-tabs {
+  border-color: #1a1a1a;
+}
+.extension-manager-dialog .modal-body .info-message {
+  background: #1a1a1a;
+  color: #888;
+}
+#project-dropdown-toggle {
+  width: auto;
+}
+#devdocs-viewer-iframe ._header {
+  background-color: #222;
+}
+.toolbar .nav .dropdown-menu li a,
+.context-menu .dropdown-menu li a,
+.codehint-menu .dropdown-menu li a {
+  color: #bbb;
+}
+.toolbar .nav .dropdown-menu li a:hover,
+.context-menu .dropdown-menu li a:hover,
+.codehint-menu .dropdown-menu li a:hover,
+.toolbar .nav .dropdown-menu li a.highlight,
+.context-menu .dropdown-menu li a.highlight,
+.codehint-menu .dropdown-menu li a.highlight {
+  color: #eee;
+  background: #0081c2;
+}
diff --git a/src/themes/theme/railscasts.css b/src/themes/theme/railscasts.css
new file mode 100644
index 00000000000..a15c7cb14ce
--- /dev/null
+++ b/src/themes/theme/railscasts.css
@@ -0,0 +1,73 @@
+.cm-s-railscasts.CodeMirror
+{
+    background-color: #232323;
+    color: #E0E2E4;
+}
+
+.cm-s-railscasts.CodeMirror .CodeMirror-lines pre
+{
+    z-index: 3;
+}
+
+.cm-s-railscasts.CodeMirror .CodeMirror-gutters
+{
+    background-color: #293134;
+}
+
+.cm-s-railscasts.CodeMirror .CodeMirror-linenumber
+{
+    background-color: #1F1F1F;
+    color: #81969A;
+}
+
+.cm-s-railscasts.CodeMirror .CodeMirror-matchingbracket
+{
+    color: #dedede;
+    outline: 1px solid #dedede;
+}
+
+.cm-s-railscasts.CodeMirror .CodeMirror-linebackground,
+.cm-s-railscasts.CodeMirror .CodeMirror-activeline
+{
+    background-color: #2F393C;
+}
+
+.cm-s-railscasts.CodeMirror .cm-atom { color: #678CB1; }
+.cm-s-railscasts.CodeMirror .cm-qualifier { color: #678CB1; }
+.cm-s-railscasts.CodeMirror .cm-keyword { color: #EC7600; }
+.cm-s-railscasts.CodeMirror .cm-comment { color: #BC9458 }
+.cm-s-railscasts.CodeMirror .cm-string {color: #93C763;}
+.cm-s-railscasts.CodeMirror .cm-string-2 {color: #93C763;}
+.cm-s-railscasts.CodeMirror .cm-variable { color: #E0E2E4; }
+.cm-s-railscasts.CodeMirror .cm-variable-2 { color: #E0E2E4; }
+.cm-s-railscasts.CodeMirror .cm-tag { color: #678CB1; }
+.cm-s-railscasts.CodeMirror .cm-attribute { color: #678CB1; }
+.cm-s-railscasts.CodeMirror .cm-property { color: #E0E2E4; }
+.cm-s-railscasts.CodeMirror .cm-number { color: #FFCD22; }
+
+.cm-s-railscasts.CodeMirror .cm-matchhighlight:not(.CodeMirror-selectedtext)
+{
+    background-color: #616161;
+    color: white;
+}
+
+.cm-s-railscasts.CodeMirror .CodeMirror-selectedtext
+{
+    background-color: #804000;
+}
+
+.cm-s-railscasts.CodeMirror .CodeMirror-selected
+{
+    background: transparent;
+}
+
+.cm-s-railscasts.CodeMirror-focused .CodeMirror-selected
+{
+    background: transparent;
+}
+
+.cm-s-railscasts.CodeMirror .CodeMirror-cursor
+{
+    z-index: 5;
+    border-left: 1px solid white;
+}
diff --git a/src/themes/theme/selenitic.css b/src/themes/theme/selenitic.css
new file mode 100644
index 00000000000..08af1afada1
--- /dev/null
+++ b/src/themes/theme/selenitic.css
@@ -0,0 +1,179 @@
+.cm-s-selenitic.CodeMirror {
+  background: #333333;
+  color: #dfdfbf;
+}
+.cm-s-selenitic .CodeMirror-gutters {
+  background-color: #333333;
+  border-right: 0;
+}
+.cm-s-selenitic .CodeMirror-hscrollbar {
+  bottom: 2px;
+  border-color: #202020;
+}
+.cm-s-selenitic .CodeMirror-vscrollbar {
+  right: 2px;
+  border-color: #202020;
+}
+.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar {
+  height: 10px;
+}
+.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar {
+  width: 10px;
+}
+.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar-track,
+.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar-track {
+  background: transparent;
+}
+.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar-thumb,
+.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar-thumb {
+  background: #3c3f41;
+}
+.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar-thumb:hover,
+.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar-thumb:hover {
+  background: #dd8440;
+}
+.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar-thumb:active,
+.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar-thumb:active {
+  background: #4bd278;
+}
+.cm-s-selenitic .CodeMirror-scrollbar-filler,
+.cm-s-selenitic .CodeMirror-gutter-filler {
+  background-color: transparent;
+}
+.cm-s-selenitic .cm-keyword {
+  color: #efc986;
+}
+.cm-s-selenitic .cm-number {
+  color: #6e96be;
+}
+.cm-s-selenitic .cm-variable {
+  color: #dfdfbf;
+}
+.cm-s-selenitic .cm-variable-2 {
+  color: #efc986;
+}
+.cm-s-selenitic .cm-variable-3 {
+  color: #dfdfbf;
+}
+.cm-s-selenitic .cm-property {
+  color: #8acccf;
+}
+.cm-s-selenitic .cm-operator {
+  color: #000000;
+}
+.cm-s-selenitic .cm-atom {
+  color: #efc986;
+}
+.cm-s-selenitic .cm-comment {
+  color: #7a987a;
+  background: #000000;
+}
+.cm-s-selenitic .cm-comment:hover {
+  color: #b3c5b3;
+  background: #000000;
+}
+.cm-s-selenitic .cm-string {
+  color: #dfaf8f;
+}
+.cm-s-selenitic .cm-string-2 {
+  color: #dfaf8f;
+}
+.cm-s-selenitic .cm-def {
+  color: #8acccf;
+}
+.cm-s-selenitic .cm-meta {
+  color: #000000;
+}
+.cm-s-selenitic .cm-qualifier {
+  color: #000000;
+}
+.cm-s-selenitic .cm-tag {
+  color: #efc986;
+}
+.cm-s-selenitic .cm-builtin {
+  color: #efc986;
+}
+.cm-s-selenitic .cm-attribute {
+  color: #dfdfbf;
+}
+.cm-s-selenitic .cm-link {
+  color: #dfaf8f;
+}
+.cm-s-selenitic .CodeMirror-selected {
+  background: #486a65 !important;
+  opacity: 0.3;
+}
+.cm-s-selenitic .cm-matchhighlight {
+  background: #505050;
+  color: #000000 !important;
+  border-radius: 0px;
+}
+.cm-s-selenitic .CodeMirror-matchingtag {
+  color: #a5a5a5 !important;
+  text-decoration: underline;
+}
+.cm-s-selenitic span.CodeMirror-searching {
+  background: #4bd278;
+  color: #2c2c2c !important;
+  border-radius: 0px;
+}
+.cm-s-selenitic .cm-matchhighlight.CodeMirror-searching.CodeMirror-selectedtext {
+  background: #dd8440;
+  color: #2c2c2c !important;
+  border-radius: 0px;
+}
+.cm-s-selenitic span.CodeMirror-matchingbracket {
+  color: #a5a5a5 !important;
+  background: transparent;
+  font-weight: bold;
+  backface-visibility: hidden;
+}
+.cm-s-selenitic span.CodeMirror-nonmatchingbracket {
+  color: #d7dde8 !important;
+  backface-visibility: hidden;
+}
+.cm-s-selenitic div.CodeMirror-cursor,
+.cm-s-selenitic div.CodeMirror-secondarycursor {
+  border-left: 2px solid #ff8833;
+  z-index: 5;
+}
+#status-bar {
+  border-top: 1px solid #484b4d;
+  background: #3c3f41;
+}
+#status-bar #status-info {
+  color: #f7c741;
+}
+#status-bar #status-indicators {
+  background: #3c3f41;
+}
+#status-bar #status-indicators #status-language {
+  color: #dd8440;
+}
+#status-bar #status-indicators #status-indent {
+  color: #41cf70;
+}
+#context-menu-bar .dropdown-menu a {
+  color: #3c3f41;
+}
+#context-menu-bar .dropdown-menu a:hover {
+  background: #f8cb4f;
+}
+.inline-widget .CodeMirror-gutter {
+  background: #242424 !important;
+}
+.inline-widget .CodeMirror-gutter .color-editor ul.swatches li span.value {
+  color: #525252;
+}
+.inline-editor-header {
+  box-shadow: inset 0 0 5px #1f1f1f;
+  background: #242424;
+  height: 30px;
+  width: 100%;
+}
+.inline-editor-header a.filename span.line-number {
+  color: #e0e0e0 !important;
+}
+.inline-editor-header a.filename {
+  color: #f8cb4f !important;
+}
diff --git a/src/themes/theme/visual-studio-2012.css b/src/themes/theme/visual-studio-2012.css
new file mode 100644
index 00000000000..10a1f35f31a
--- /dev/null
+++ b/src/themes/theme/visual-studio-2012.css
@@ -0,0 +1,247 @@
+/* Main UI */
+*:focus {
+    outline: none !important;
+	box-shadow: none !important;
+}
+
+#sidebar{
+    background:#D6DBE9;
+    text-shadow:none;
+}
+
+#working-set-header {
+	background:#D6DBE9;
+	border-bottom: 4px solid #293955;
+	color: #60728C;
+	text-shadow: none;
+	
+}
+#open-files-container{ /* Working files */
+    background: #293955;
+	color: #fff;
+}
+
+#project-files-header {/* "working files" header and folder header*/
+    color:#777!important;
+}
+
+#working-set-option-btn, #project-dropdown-toggle, #main-toolbar a, .btn {
+	color:#60728C;
+}
+.btn {
+	color:#000;
+	background: linear-gradient(to bottom, #f0f0f0 0%,#e5e5e5 100%);
+	border: 1px solid #ACACAC;
+	border-radius: 0px;
+	box-shadow: none;
+	text-shadow: none;
+}
+.btn.primary {
+	border-color: #E5C365;
+}
+.btn.active {
+	background: none;
+	background-color:#FFF0D0 !important;
+	border-color: #E5C365;
+	color: #E5C365 !important;
+}
+.btn:not([disabled]):hover {
+	background: none;
+}
+#working-set-option-btn:hover, #project-dropdown-toggle:hover, #main-toolbar a:hover, .btn:not([disabled]):hover { /* Open url when hover */
+    color:#000;
+	background-color:#FFF0D0 !important;
+	border: 1px solid #E5C365;
+	border-radius: 0px;
+}
+input {
+	border: 1px solid #ACACAC;
+	background-color: #f0f0f0;
+	border-radius: 0px;
+}
+input:focus {
+	border: 1px solid #E5C365;
+}
+
+#main-toolbar a {
+	margin-left: 2px;
+	margin-top: 6px;
+	margin-bottom: -1px;
+	border: 1px solid transparent;
+}
+
+#project-files-container {
+	padding-top: 5px;
+	background: #293955;
+}
+
+.jstree-brackets li a,
+.jstree-brackets li a .extension, /* Files, folder and extensions */
+#open-files-container li a,
+#open-files-container li a .extension,
+#open-files-container li a.jstree-clicked { /* Files, folder and extensions in "working fiels"*/
+    color:#fff;
+}
+.jstree-brackets li.selected a,
+.jstree-brackets li.selected a .extension,
+.jstree-brackets li a.jstree-clicked,
+.jstree-brackets li a.jstree-clicked .extension, /* Files, folder and extensions */
+#open-files-container li.selected a,
+#open-files-container li.selected a .extension,
+#open-files-container li.selected a.jstree-clicked { /* Files, folder and extensions in "working fiels"*/
+    color:#000;
+}
+
+.sidebar-selection{ /* Selected file or folder */
+    background:#FFF0D0;
+	margin-left:0px;
+}
+
+.sidebar-selection-triangle{ /* ^ the cool arrow */
+    background:transparent;
+}
+
+.sidebar-selection-triangle.triangle-visible::before{
+    border-left:12px solid #FFF0D0;
+	display:none;
+}
+
+#main-toolbar{ /* Toolbar to the right */
+    background:#D6DBE9;
+}
+
+#status-bar{ /* Bottom status bar */
+    background:#293955;
+}
+
+#status-indicators,
+#status-info{ /* Status bar text */
+    background:transparent;
+	color: #fff;
+}
+
+/* Context menu */
+.dropdown-menu {
+	background-color: red;
+	border: 1px solid #9ba7b7 !important;
+	border-radius: none !important;
+	background: linear-gradient(to bottom, #e9ecee 0%, #d0d7e2 100%) !important;
+}
+.dropdown-menu .divider {
+	border: none !important;
+	background-color: #bec3cb;
+}
+.dropdown-menu a {
+	color: #3f3f3f;
+	border: 1px solid transparent;
+	margin: 1px 4px !important;
+	padding-top: 2px !important;
+	padding-bottom: 2px !important;
+}
+.dropdown-menu a:hover, .dropdown-menu a.highlight {
+	color:#000;
+	background-color:#FFF0D0 !important;
+	border: 1px solid #E5C365;
+	margin: 1px 4px !important;
+	border-radius: 0px;
+}
+
+/* Code Editor */
+.cm-s-visual-studio-2012.CodeMirror
+{
+    border-left: 2px solid #FFF0D0;
+	background-color: #fefefe;
+    color:black;
+	font-family: consolas !important;
+}
+
+.cm-s-visual-studio-2012.CodeMirror .CodeMirror-gutters
+{
+    background-color: #fefefe;
+}
+
+.cm-s-visual-studio-2012.CodeMirror .CodeMirror-linenumber
+{
+    color: /*#0E97A1*/ #BAC1D6;
+    background-color: #fefefe;
+	font-family: consolas !important;
+}
+
+.cm-s-visual-studio-2012.CodeMirror .CodeMirror-matchingbracket
+{
+    color: black;
+    background-color: #dedede;
+}
+
+.cm-s-visual-studio-2012.CodeMirror .CodeMirror-linebackground
+{
+    outline: 2px solid #dddddd;
+    z-index: 3;
+}
+
+.cm-s-visual-studio-2012 .CodeMirror-activeline-background,
+.cm-s-visual-studio-2012 .CodeMirror-activeline .CodeMirror-gutter-elt
+{
+    background: transparent !important;
+}
+
+.cm-s-visual-studio-2012 .CodeMirror-activeline-background
+{
+    outline: 2px solid #dddddd;
+}
+
+.cm-s-visual-studio-2012 .CodeMirror-activeline .CodeMirror-gutter-elt
+{
+    outline: 0px;
+}
+
+
+.cm-s-visual-studio-2012.CodeMirror .cm-matchhighlight
+{
+    background-color: yellow;
+}
+
+.cm-s-visual-studio-2012.CodeMirror .CodeMirror-selectedtext
+{
+    background-color: #ADD6FF;
+}
+
+.cm-s-visual-studio-2012.CodeMirror .CodeMirror-selected,
+.cm-s-visual-studio-2012.CodeMirror-focused .CodeMirror-selected
+{
+    background: transparent;
+}
+
+
+.cm-s-visual-studio-2012.CodeMirror .cm-atom,
+.cm-s-visual-studio-2012.CodeMirror .cm-qualifier,
+.cm-s-visual-studio-2012.CodeMirror .cm-def,
+.cm-s-visual-studio-2012.CodeMirror .cm-keyword {
+	color: #0000FF;
+}
+
+/* css */
+/* css selectors */
+.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-qualifier /* .class */ { color: #800000; }
+.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-builtin /* #id */ { color: #ff0000; }
+.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-tag /* tag */ { color: #8063d4; }
+.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-variable-3 /* :pseudo */ { color: #af552b; }
+
+
+/* css values */
+.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-number { color: #2B91AF; }
+.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-keyword /* !important */ { color: #FF0000; }
+.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-variable /* other value, like font name */ { color: #3399ff; }
+
+/*CodeMirror does not add notation for css...  Which would be really nice. */
+/*.cm-s-visual-studio-2012.CodeMirror .cm-property { color: red; }*/
+
+.cm-s-visual-studio-2012.CodeMirror .cm-comment { color: green; }
+.cm-s-visual-studio-2012.CodeMirror .cm-string {color: #800000;}
+.cm-s-visual-studio-2012.CodeMirror .cm-string-2 {color: #800000;}
+.cm-s-visual-studio-2012.CodeMirror .cm-variable { color: black; }
+.cm-s-visual-studio-2012.CodeMirror .cm-variable-2 { color: #2B91AF; }
+.cm-s-visual-studio-2012.CodeMirror .cm-tag { color: #800000; }
+.cm-s-visual-studio-2012.CodeMirror .cm-attribute { color: red; }
+.cm-s-visual-studio-2012.CodeMirror .cm-property { color: black; }
+
diff --git a/src/themes/theme/visual-studio-ex.css b/src/themes/theme/visual-studio-ex.css
new file mode 100644
index 00000000000..c29ac520880
--- /dev/null
+++ b/src/themes/theme/visual-studio-ex.css
@@ -0,0 +1,113 @@
+#sidebar{
+    background:#f6f6f6;
+    text-shadow:none;
+}
+
+#working-set-header,
+#open-files-container{ /* Working files */
+    background:#f0f0f0;
+}
+
+#project-files-header,
+#working-set-header{/* "working files" header and folder header*/
+    color:#777!important;
+}
+
+#project-dropdown-toggle:hover{ /* Open url when hover */
+    color:#555!important;
+    background:#e8e8e8;
+}
+
+.jstree-brackets li a,
+.jstree-brackets li .extension,
+.jstree-brackets li a.jstree-clicked, /* Files, folder and extensions */
+#open-files-container li a,
+#open-files-container li .extension,
+#open-files-container li a.jstree-clicked{ /* Files, folder and extensions in "working fiels"*/
+    color:#222!important;
+}
+
+.sidebar-selection{ /* Selected file or folder */
+    background:#cccedb;
+}
+
+.sidebar-selection-triangle{ /* ^ the cool arrow */
+    background:transparent;
+}
+
+.sidebar-selection-triangle.triangle-visible::before{
+    border-left:12px solid #cccedb;
+}
+
+#main-toolbar{ /* Toolbar to the right */
+    background:#f6f6f6;
+}
+
+#status-bar{ /* Bottom status bar */
+    background:#f6f6f6;
+    border-top:1px solid #d4d4d4;
+}
+
+#status-indicators,
+#status-info{ /* Status bar text */
+    background:transparent;
+}
+
+.CodeMirror-scroll{
+    background-color: #fefefe;
+    color:black;
+}
+
+.CodeMirror .CodeMirror-lines pre{
+    z-index: 3;
+}
+
+.CodeMirror .CodeMirror-gutters{
+    background-color: #fefefe;
+}
+
+.CodeMirror .CodeMirror-linenumber{
+    color: #0E97A1;
+    background-color: #fefefe;
+}
+
+.CodeMirror .CodeMirror-matchingbracket{
+    color: black;
+    background-color: #dedede;
+}
+
+.CodeMirror .CodeMirror-linebackground{
+    outline: 2px solid #dddddd;
+      z-index: 3;
+}
+
+
+.CodeMirror span.cm-atom { color: blue; }
+.CodeMirror span.cm-qualifier, .CodeMirror span.cm-builtin { color: #800000; }
+
+.CodeMirror span.cm-keyword { color: blue; }
+.CodeMirror span.cm-comment { color: green; }
+.CodeMirror span.cm-string {color: #800000;}
+.CodeMirror span.cm-string-2 {color: #800000;}
+.CodeMirror span.cm-variable { color: black; }
+.CodeMirror span.cm-variable-2 { color: black; }
+.CodeMirror span.cm-tag { color: #800000; }
+.CodeMirror span.cm-attribute { color: red; }
+.CodeMirror span.cm-property { color: black; }
+
+.CodeMirror span.cm-matchhighlight{
+      background-color: yellow;
+}
+
+.CodeMirror .CodeMirror-selectedtext{
+      background-color: #ADD6FF;
+}
+
+.CodeMirror .CodeMirror-selected{
+      background: transparent;
+}
+
+.CodeMirror-focused .CodeMirror-selected{
+      background: transparent;
+}
+
diff --git a/src/themes/theme/visual-studio.css b/src/themes/theme/visual-studio.css
new file mode 100644
index 00000000000..35c90e1ae10
--- /dev/null
+++ b/src/themes/theme/visual-studio.css
@@ -0,0 +1,72 @@
+.cm-s-visual-studio.CodeMirror
+{
+    background-color: #fefefe;
+    color:black;
+}
+
+.cm-s-visual-studio.CodeMirror .CodeMirror-gutters
+{
+    background-color: #fefefe;
+}
+
+.cm-s-visual-studio.CodeMirror .CodeMirror-linenumber
+{
+    color: #0E97A1;
+    background-color: #fefefe;
+}
+
+.cm-s-visual-studio.CodeMirror .CodeMirror-matchingbracket
+{
+    color: black;
+    background-color: #dedede;
+}
+
+.cm-s-visual-studio.CodeMirror .CodeMirror-linebackground
+{
+    outline: 2px solid #dddddd;
+}
+
+.cm-s-visual-studio .CodeMirror-activeline-background,
+.cm-s-visual-studio .CodeMirror-activeline .CodeMirror-gutter-elt
+{
+    background: transparent !important;
+}
+
+.cm-s-visual-studio .CodeMirror-activeline-background
+{
+    outline: 2px solid #dddddd;
+}
+
+.cm-s-visual-studio.CodeMirror .cm-matchhighlight
+{
+    background-color: yellow;
+}
+
+.cm-s-visual-studio.CodeMirror .CodeMirror-selectedtext
+{
+    background-color: #ADD6FF;
+}
+
+.cm-s-visual-studio.CodeMirror .CodeMirror-selected,
+.cm-s-visual-studio.CodeMirror-focused .CodeMirror-selected
+{
+    background: transparent;
+}
+
+
+.cm-s-visual-studio.CodeMirror .cm-atom { color: blue; }
+.cm-s-visual-studio.CodeMirror .cm-qualifier { color: #800000; }
+
+/*CodeMirror does not add notation for css...  Which would be really nice. */
+/*.cm-s-visual-studio.CodeMirror .cm-property { color: red; }*/
+
+.cm-s-visual-studio.CodeMirror .cm-keyword { color: blue; }
+.cm-s-visual-studio.CodeMirror .cm-comment { color: green; }
+.cm-s-visual-studio.CodeMirror .cm-string {color: #800000;}
+.cm-s-visual-studio.CodeMirror .cm-string-2 {color: #800000;}
+.cm-s-visual-studio.CodeMirror .cm-variable { color: black; }
+.cm-s-visual-studio.CodeMirror .cm-variable-2 { color: black; }
+.cm-s-visual-studio.CodeMirror .cm-tag { color: #800000; }
+.cm-s-visual-studio.CodeMirror .cm-attribute { color: red; }
+.cm-s-visual-studio.CodeMirror .cm-property { color: black; }
+
diff --git a/src/themes/theme/zamiere.css b/src/themes/theme/zamiere.css
new file mode 100644
index 00000000000..bfebf479331
--- /dev/null
+++ b/src/themes/theme/zamiere.css
@@ -0,0 +1,120 @@
+.panel {
+  background:#3C3F41;
+}
+
+#status-bar,
+#status-indicators {
+  background:#242424;
+  color:#ccc;
+}
+
+#status-info {
+  color:#ccc;
+}
+
+#open-files-container,
+#working-set-header,
+#project-files-header {
+  color:#aaa;
+  background:#565A5D;
+}
+
+.jstree-brackets li.jstree-closed > a,
+.jstree-brackets li.jstree-open > a {
+  color:#ccc;
+}
+
+#open-files-container .extension,
+.jstree-brackets li .extension {
+  color:#aaa;
+}
+
+.cm-s-zamiere.CodeMirror {
+  background-color:#202020;
+  color:#fff;
+}
+
+.cm-s-zamiere.CodeMirror div.CodeMirror-cursor {
+  border-left:1px solid #f8f8f0;
+  z-index:3;
+}
+
+.cm-s-zamiere .CodeMirror-selected {
+  background:#3d3d3d;
+  opacity:.5;
+}
+
+.cm-s-zamiere .cm-keyword    {color:#FFCC33;}
+.cm-s-zamiere .cm-atom       {color:#99CC66;}
+.cm-s-zamiere .cm-number     {color:#99CC66;}
+.cm-s-zamiere .cm-def        {color:#A9D158;}
+.cm-s-zamiere .cm-variable   {color:#34A2D9;}
+.cm-s-zamiere .cm-variable-2 {color:#3399CC;}
+.cm-s-zamiere .cm-property   {color:#DAD6CD;}
+.cm-s-zamiere .cm-operator   {color:#FFCC33;}
+.cm-s-zamiere .cm-comment    {color:#747166;}
+.cm-s-zamiere .cm-string     {color:#A9D158;}
+.cm-s-zamiere .cm-string-2   {color:#A9D158;}
+.cm-s-zamiere .cm-meta       {color:#FFCC33;}
+.cm-s-zamiere .cm-qualifier  {color:#FFCC33;}
+.cm-s-zamiere .cm-bracket    {color:#FFFFFF;}
+.cm-s-zamiere .cm-tag        {color:#FFCC33;}
+.cm-s-zamiere .cm-attribute  {color:#FFCC33;}
+
+.cm-s-zamiere.CodeMirror span.CodeMirror-matchingbracket {
+  color:#00CCFF;
+  text-shadow:0 0 3px #00CCFF;
+}
+
+.cm-s-zamiere .cm-matchhighlight {
+  box-shadow:0 0 5px #00CCFF;
+  background-color: #00CCFF;
+  color: black;
+  border-radius:2px;
+}
+
+.cm-s-zamiere .CodeMirror-searching {
+  color:#000;
+}
+
+.cm-s-zamiere .cm-matchhighlight:not(.CodeMirror-selectedtext) {
+  background-color: rgba(0, 204, 255, 0.4);
+  box-shadow:0 0 5px #00CCFF;
+  color:#ccc;
+  border-radius:2px;
+}
+
+.cm-s-zamiere .CodeMirror-activeline-background {
+  background:hsla(0,0%,0%,0.5)!important;
+  margin:-1px -10px;
+}
+
+.cm-s-zamiere div.CodeMirror-gutter {
+  color:#ccc;
+}
+
+.cm-s-zamiere div.CodeMirror-gutters {
+  background-color:#101010;
+  box-shadow:0 0 10px hsla(0,0%,0%,.8);
+  padding:0 15px 20px 10px;
+  border-right:0;
+}
+
+.cm-s-zamiere span.CodeMirror-widget {
+  margin:-3px 0px;
+  display:inline-block;
+}
+.cm-s-zamiere span.CodeMirror-foldmarker {
+  display:inline-table;
+  background:#ccc;
+  border:0;
+  color:#000;
+  border-radius:3px;
+  font-size:20px;
+  margin:3px;
+  padding:0px 5px;
+  height:15px;
+  line-height:15px;
+  overflow:hidden;
+  white-space:nowrap;
+}
diff --git a/src/themes/views/general.html b/src/themes/views/general.html
new file mode 100644
index 00000000000..6e46d17ff19
--- /dev/null
+++ b/src/themes/views/general.html
@@ -0,0 +1,45 @@
+<form class="form-horizontal">
+    <div class="control-group">
+        <label class="control-label">Current theme:</label>
+        <div class="controls">
+            <select>
+            {{#themes}}
+                <option style="text-align:left;" value="{{displayName}}" data-target="theme" theme-id="{{name}}">{{displayName}}</option>
+            {{/themes}}
+            </select>
+        </div>
+    </div>
+
+    <div class="control-group">
+        <label class="control-label">Custom Scrollbars:</label>
+        <div class="controls">
+            {{#settings.customScrollbars}}
+                <input type="checkbox" data-target="customScrollbars" checked>
+            {{/settings.customScrollbars}}
+            {{^settings.customScrollbars}}
+                <input type="checkbox" data-target="customScrollbars">
+            {{/settings.customScrollbars}}
+        </div>
+    </div>
+
+    <div class="control-group">
+        <label class="control-label">Font size:</label>
+        <div class="controls">
+            <input type="text" data-target="fontSize" value="{{settings.fontSize}}">
+        </div>
+    </div>
+
+    <div class="control-group">
+        <label class="control-label">Font type:</label>
+        <div class="controls">
+            <input type="text" data-target="fontType" value="{{settings.fontType}}">
+        </div>
+    </div>
+
+    <div class="control-group">
+        <label class="control-label">Line height:</label>
+        <div class="controls">
+            <input type="text" data-target="lineHeight" value="{{settings.lineHeight}}">
+        </div>
+    </div>
+</form>
diff --git a/src/themes/views/settings.css b/src/themes/views/settings.css
new file mode 100644
index 00000000000..74b498ca190
--- /dev/null
+++ b/src/themes/views/settings.css
@@ -0,0 +1,17 @@
+.themeSettings td {
+    padding: 2px;
+}
+
+.themeSettings .modal-body {
+    min-height: 300px;
+    max-height: 300px;
+    padding: 4px;
+}
+
+.themeSettings .row {
+    margin: 0px;
+}
+
+.themeSettings .label {
+    padding: 4px !important;
+}
diff --git a/src/themes/views/settings.html b/src/themes/views/settings.html
new file mode 100644
index 00000000000..1ac4b8e1db0
--- /dev/null
+++ b/src/themes/views/settings.html
@@ -0,0 +1,20 @@
+<div class="brackets-themes-settings-dialog modal">
+    <div class="modal-header">
+        <h1 class="dialog-title">Themes Settings</h1>
+    </div>
+    <div class="modal-body">
+        <div class="row">
+            <ul class="nav nav-pills nav-stacked span2" style="max-width: 100px;">
+                <li><a class="default" data-target="#generalSettings" data-toggle="tab">General</a></li>
+            </ul>
+
+            <div class="tab-content span6">
+                <div class="tab-pane active" id="generalSettings"></div>
+            </div>
+        </div>
+    </div>
+    <div class="modal-footer">
+        <a class="dialog-button btn cancel" data-button-id="cancel">Cancel</a>
+        <a class="dialog-button btn primary save" data-button-id="save">Save</a>
+    </div>
+</div>
diff --git a/src/themes/views/settings.js b/src/themes/views/settings.js
new file mode 100644
index 00000000000..9e8dddadb23
--- /dev/null
+++ b/src/themes/views/settings.js
@@ -0,0 +1,82 @@
+/*
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+define(function(require) {
+    "use strict";
+
+    var _       = require("thirdparty/lodash"),
+    	Dialogs = require("widgets/Dialogs"),
+
+        tmpl = {
+            "settings": require("text!themes/views/settings.html"),
+            "general": require("text!themes/views/general.html")
+        };
+
+    var _themes;
+
+    // Setup all the templates so that we can easily render them with Mustache
+    var $settings = $(tmpl.settings).addClass("themeSettings");
+    $("#generalSettings", $settings).html(tmpl.general);
+
+
+    function open(settings) {
+        var themes = _.map(_themes, function(theme) {return theme;});
+        var currentSettings = settings.getAll();
+        var newSettings     = {};
+        var template = $("<div>").append($settings).html();
+        var $template = $(Mustache.render(template, {"settings": currentSettings, "themes": themes}));
+
+        $template
+            .find("[data-toggle=tab].default")
+            .tab("show");
+
+        // Select the correct theme by default.
+        $template.find("[theme-id='" + currentSettings.theme[0] + "']").attr("selected", "selected");
+
+
+        $template
+            .on("change", "[data-target]:checkbox", function() {
+                var $target = $(this);
+                var attr = $target.attr("data-target");
+                newSettings[attr] = $target.is(":checked");
+            })
+            .on("change", "[data-target]:text", function() {
+                var $target = $(this);
+                var attr = $target.attr("data-target");
+                newSettings[attr] = $target.val();
+            })
+            .change("select", function() {
+                var $target = $(":selected", this);
+                var attr = $target.attr("data-target");
+                if ( attr ) {
+                    settings.setValue( "theme", [$target.attr("theme-id")] );
+                }
+            });
+
+        Dialogs.showModalDialogUsingTemplate($template).done(function( id ) {
+            if ( id === "save" ) {
+                for( var i in newSettings ) {
+                    if ( currentSettings.hasOwnProperty(i) ) {
+                        settings.setValue( i, newSettings[i] );
+                    }
+                }
+            }
+        });
+    }
+
+
+    function setThemes(themes) {
+        _themes = themes;
+    }
+
+
+    return {
+        open: open,
+        themes: setThemes
+    };
+});
+

From 657df8581063fff00113c86ed6c2268b915873cf Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 23 Apr 2014 21:50:31 -0400
Subject: [PATCH 02/96] Delete stale Init.js file

---
 src/themes/Init.js | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 src/themes/Init.js

diff --git a/src/themes/Init.js b/src/themes/Init.js
deleted file mode 100644
index a717bb2d1e4..00000000000
--- a/src/themes/Init.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-
-define(function (require, exports, module) {
-    "use strict";
-
-    require("themes/String");
-    require("themes/MenuCommands");
-
-    var ExtensionUtils   = require("utils/ExtensionUtils"),
-        ThemeManager     = require("themes/ThemeManager"),
-        CodeMirrorAddons = require("themes/CodeMirrorAddons");
-
-    // Load up reset.css to override brackground settings from brackets because
-    // they make the themes look really bad.
-    ExtensionUtils.loadStyleSheet(module, "reset.css");
-    ExtensionUtils.loadStyleSheet(module, "views/settings.css");
-
-	function init() {
-		CodeMirrorAddons.ready(ThemeManager);
-	}
-	
-	exports.init = init;
-});
-

From 5cb408518c495f17158139a2ee785f3c9fa075a4 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 23 Apr 2014 21:52:58 -0400
Subject: [PATCH 03/96] Cleaned up jslint errors/warnings

---
 src/themes/CodeMirrorAddons.js    |  3 ++
 src/themes/DefaultSettings.js     |  7 +++-
 src/themes/FontCommandsManager.js |  6 ++-
 src/themes/FontSettings.js        |  3 ++
 src/themes/MenuCommands.js        |  3 ++
 src/themes/ScrollbarsApply.js     |  2 +
 src/themes/Settings.js            | 62 +++++++++++++++++--------------
 src/themes/String.js              |  4 ++
 src/themes/Theme.js               |  4 +-
 src/themes/ThemeApply.js          |  5 ++-
 src/themes/ThemeFiles.js          |  2 +
 src/themes/ThemeManager.js        |  3 ++
 src/themes/views/settings.js      |  4 +-
 13 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/src/themes/CodeMirrorAddons.js b/src/themes/CodeMirrorAddons.js
index 69f1558732e..2a24102ec23 100644
--- a/src/themes/CodeMirrorAddons.js
+++ b/src/themes/CodeMirrorAddons.js
@@ -5,6 +5,9 @@
  */
 
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
+
 define(function () {
     "use strict";
 
diff --git a/src/themes/DefaultSettings.js b/src/themes/DefaultSettings.js
index 661736bcf6a..4c12bbd3809 100644
--- a/src/themes/DefaultSettings.js
+++ b/src/themes/DefaultSettings.js
@@ -5,9 +5,14 @@
  */
 
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
+
 define(function(require) {
+    "use strict";
+
     var FileUtils = require("file/FileUtils");
-    var cm_path = FileUtils.getNativeBracketsDirectoryPath() + "/thirdparty/CodeMirror2";
+    var cm_path   = FileUtils.getNativeBracketsDirectoryPath() + "/thirdparty/CodeMirror2";
 
     return {
         "fontSize": 12,
diff --git a/src/themes/FontCommandsManager.js b/src/themes/FontCommandsManager.js
index 2e4c0d91152..ad1f2f0417e 100644
--- a/src/themes/FontCommandsManager.js
+++ b/src/themes/FontCommandsManager.js
@@ -5,12 +5,14 @@
  * Licensed under MIT
  */
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
 
 define(function (require) {
     "use strict";
 
     var Settings            = require("themes/Settings"),
-    	DefaultSettings     = require("themes/DefaultSettings"),
+        DefaultSettings     = require("themes/DefaultSettings"),
         ViewCommandHandlers = require("view/ViewCommandHandlers"),
         PreferencesManager  = require("preferences/PreferencesManager");
 
@@ -37,6 +39,6 @@ define(function (require) {
 
     // Let's make sure we use Themes fonts by default
     return {
-    	init: ViewCommandsManager
+        init: ViewCommandsManager
     };
 });
diff --git a/src/themes/FontSettings.js b/src/themes/FontSettings.js
index 358927c1077..17c023f7f17 100644
--- a/src/themes/FontSettings.js
+++ b/src/themes/FontSettings.js
@@ -5,6 +5,9 @@
  */
 
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
+
 define(function () {
     "use strict";
 
diff --git a/src/themes/MenuCommands.js b/src/themes/MenuCommands.js
index af5c1ecf0c0..aa96ea5894c 100644
--- a/src/themes/MenuCommands.js
+++ b/src/themes/MenuCommands.js
@@ -5,6 +5,9 @@
  */
 
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
+
 define(function(require) {
     "use strict";
     var Commands       = require("command/Commands"),
diff --git a/src/themes/ScrollbarsApply.js b/src/themes/ScrollbarsApply.js
index ae674e51740..fc9ed38e97a 100644
--- a/src/themes/ScrollbarsApply.js
+++ b/src/themes/ScrollbarsApply.js
@@ -4,6 +4,8 @@
  * Licensed under MIT
  */
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
 
 define(function (require) {
     "use strict";
diff --git a/src/themes/Settings.js b/src/themes/Settings.js
index 5e0a3c57ac1..786ebd621a2 100644
--- a/src/themes/Settings.js
+++ b/src/themes/Settings.js
@@ -4,6 +4,8 @@
  * Licensed under MIT
  */
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
 
 define(function (require) {
     "use strict";
@@ -17,33 +19,6 @@ define(function (require) {
 
 
     function Settings() {
-        return PreferencesManager.ready.then(function() {
-            if ( Settings.getValue("paths") === (void 0) ) {
-                Settings.setValue("paths", DefaultSettings.paths);
-            }
-
-            if ( Settings.getValue("theme") === (void 0) ) {
-                Settings.setValue("theme",  DefaultSettings.theme);
-            }
-
-            if ( Settings.getValue("fontSize") === (void 0) ) {
-                Settings.setValue("fontSize", DefaultSettings.fontSize + "px");
-            }
-
-            if ( Settings.getValue("lineHeight") === (void 0) ) {
-                Settings.setValue("lineHeight", DefaultSettings.lineHeight);
-            }
-
-            if ( Settings.getValue("fontType") === (void 0) ) {
-                Settings.setValue("fontType", DefaultSettings.fontType);
-            }
-
-            if ( Settings.getValue("customScrollbars") === (void 0) ) {
-                Settings.setValue("customScrollbars", DefaultSettings.customScrollbars);
-            }
-
-            return Settings;
-        }).promise();
     }
 
     Settings.open = function() {
@@ -85,6 +60,37 @@ define(function (require) {
     };
 
 
-    Settings.ready = Settings();
+    function init() {
+        return PreferencesManager.ready.then(function() {
+            if ( Settings.getValue("paths") === (void 0) ) {
+                Settings.setValue("paths", DefaultSettings.paths);
+            }
+
+            if ( Settings.getValue("theme") === (void 0) ) {
+                Settings.setValue("theme",  DefaultSettings.theme);
+            }
+
+            if ( Settings.getValue("fontSize") === (void 0) ) {
+                Settings.setValue("fontSize", DefaultSettings.fontSize + "px");
+            }
+
+            if ( Settings.getValue("lineHeight") === (void 0) ) {
+                Settings.setValue("lineHeight", DefaultSettings.lineHeight);
+            }
+
+            if ( Settings.getValue("fontType") === (void 0) ) {
+                Settings.setValue("fontType", DefaultSettings.fontType);
+            }
+
+            if ( Settings.getValue("customScrollbars") === (void 0) ) {
+                Settings.setValue("customScrollbars", DefaultSettings.customScrollbars);
+            }
+
+            return Settings;
+        }).promise();
+    }
+
+
+    Settings.ready = init();
     return Settings;
 });
diff --git a/src/themes/String.js b/src/themes/String.js
index 5e457b0e103..183b11133b6 100644
--- a/src/themes/String.js
+++ b/src/themes/String.js
@@ -5,7 +5,11 @@
  */
 
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
+
 define(function() {
+    "use strict";
 
     if (!String.prototype.endsWith) {
         String.prototype.endsWith = function(suffix) {
diff --git a/src/themes/Theme.js b/src/themes/Theme.js
index add500d99a6..3174dc41d92 100644
--- a/src/themes/Theme.js
+++ b/src/themes/Theme.js
@@ -4,6 +4,8 @@
  * Licensed under MIT
  */
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require, less */
 
 define(function () {
     "use strict";
@@ -26,7 +28,7 @@ define(function () {
         var _self     = this,
             fileName  = file.name;
 
-		_self.file        = file;
+        _self.file        = file;
         _self.displayName = toDisplayName(fileName);
         _self.name        = fileName.substring(0, fileName.lastIndexOf('.'));
         _self.className   = "theme-" + _self.name;
diff --git a/src/themes/ThemeApply.js b/src/themes/ThemeApply.js
index e617fc52e32..b44466cb965 100644
--- a/src/themes/ThemeApply.js
+++ b/src/themes/ThemeApply.js
@@ -5,7 +5,10 @@
  */
 
 
-define(function() {
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require, CodeMirror */
+
+define(function(require) {
     "use strict";
 
     var ExtensionUtils = require("utils/ExtensionUtils");
diff --git a/src/themes/ThemeFiles.js b/src/themes/ThemeFiles.js
index 0bb120be04a..8158ed6cee5 100644
--- a/src/themes/ThemeFiles.js
+++ b/src/themes/ThemeFiles.js
@@ -4,6 +4,8 @@
  * Licensed under MIT
  */
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
 
 define(function(require) {
     "use strict";
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index 8fe36fc7087..b3738537e9b 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -5,6 +5,9 @@
  */
 
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
+
 define(function (require, exports, module) {
     "use strict";
 
diff --git a/src/themes/views/settings.js b/src/themes/views/settings.js
index 9e8dddadb23..c16a340f5af 100644
--- a/src/themes/views/settings.js
+++ b/src/themes/views/settings.js
@@ -4,12 +4,14 @@
  * Licensed under MIT
  */
 
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require, Mustache */
 
 define(function(require) {
     "use strict";
 
     var _       = require("thirdparty/lodash"),
-    	Dialogs = require("widgets/Dialogs"),
+        Dialogs = require("widgets/Dialogs"),
 
         tmpl = {
             "settings": require("text!themes/views/settings.html"),

From abf3e494bcd6f0890613c03ff6618afe96667163 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 23 Apr 2014 21:55:48 -0400
Subject: [PATCH 04/96] Removed string.js. Not needed anymore

---
 src/themes/String.js       | 20 --------------------
 src/themes/ThemeManager.js |  1 -
 2 files changed, 21 deletions(-)
 delete mode 100644 src/themes/String.js

diff --git a/src/themes/String.js b/src/themes/String.js
deleted file mode 100644
index 183b11133b6..00000000000
--- a/src/themes/String.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
-
-define(function() {
-    "use strict";
-
-    if (!String.prototype.endsWith) {
-        String.prototype.endsWith = function(suffix) {
-            return this.indexOf(suffix, this.length - suffix.length) !== -1;
-        };
-    }
-
-});
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index b3738537e9b..c9d3b3e9402 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -11,7 +11,6 @@
 define(function (require, exports, module) {
     "use strict";
 
-    require("themes/String");
     require("themes/MenuCommands");
 
     var _                   = require("thirdparty/lodash"),

From 5473380c75870cae5d4ffe7b6fec6f5bbdf03b76 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 23 Apr 2014 21:56:18 -0400
Subject: [PATCH 05/96] Removed custom themes from the themes extension

---
 src/themes/theme/NightLion.css          | 166 ---------------
 src/themes/theme/aquaman.css            | 225 --------------------
 src/themes/theme/default.css            |   3 -
 src/themes/theme/dracula.css            |  98 ---------
 src/themes/theme/hammsidian.css         | 125 -----------
 src/themes/theme/light-table.css        | 124 -----------
 src/themes/theme/monokai-dark-soda.css  |  55 -----
 src/themes/theme/nando.css              |  53 -----
 src/themes/theme/obsidian.css           |  80 -------
 src/themes/theme/pixie.css              | 265 ------------------------
 src/themes/theme/railscasts.css         |  73 -------
 src/themes/theme/selenitic.css          | 179 ----------------
 src/themes/theme/visual-studio-2012.css | 247 ----------------------
 src/themes/theme/visual-studio-ex.css   | 113 ----------
 src/themes/theme/visual-studio.css      |  72 -------
 src/themes/theme/zamiere.css            | 120 -----------
 16 files changed, 1998 deletions(-)
 delete mode 100644 src/themes/theme/NightLion.css
 delete mode 100644 src/themes/theme/aquaman.css
 delete mode 100644 src/themes/theme/default.css
 delete mode 100644 src/themes/theme/dracula.css
 delete mode 100644 src/themes/theme/hammsidian.css
 delete mode 100644 src/themes/theme/light-table.css
 delete mode 100644 src/themes/theme/monokai-dark-soda.css
 delete mode 100644 src/themes/theme/nando.css
 delete mode 100644 src/themes/theme/obsidian.css
 delete mode 100644 src/themes/theme/pixie.css
 delete mode 100644 src/themes/theme/railscasts.css
 delete mode 100644 src/themes/theme/selenitic.css
 delete mode 100644 src/themes/theme/visual-studio-2012.css
 delete mode 100644 src/themes/theme/visual-studio-ex.css
 delete mode 100644 src/themes/theme/visual-studio.css
 delete mode 100644 src/themes/theme/zamiere.css

diff --git a/src/themes/theme/NightLion.css b/src/themes/theme/NightLion.css
deleted file mode 100644
index cad14755717..00000000000
--- a/src/themes/theme/NightLion.css
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-BearTheme is bare theme for styling Adobe Brackets (Code Mirror) editor. Some elements need be overwritien, if you find comment with "may need !important", give it a try.
-Good luck, have fun!
-*/
-
-    /*Sidebar*/
-
-#sidebar{} /*General sidebar style*/
-#sidebar #working-set-header{} /*"Working files" header*/
-#sidebar #open-files-container{} /*Working files style*/
-#sidebar #open-files-container ul li.selected a{} /*Selected working file*/
-#sidebar #open-files-container ul li.selected a span.extension{} /*Selected working file's extension*/
-#sidebar #open-files-container ul li .file-status-icon{} /*Icon next to a file, dot, X etc.*/
-
-
-    /*Project file header*/
-#sidebar #project-files-header{} /*Browser header, path select, search, X etc.*/
-#sidebar #project-files-header #project-dropdown-toggle{} /*Path select toggle*/
-#sidebar #project-files-header #project-dropdown-toggle #project-title{} /*Currently selected project title*/
-#sidebar #project-files-header #project-dropdown-toggle .dropdown-arrow{} /*Select toggle arrow - SVG image*/
-#sidebar #project-files-header #closeAllFolders{} /*Close all icon*/
-#sidebar #project-files-header #search-files-button{} /*Search file icon*/
-
-
-    /*Project files container*/
-#sidebar #project-files-container{} /*Project files - WITHOUT header*/
-#sidebar #project-files-container .jstree-icon{} /*Icon next to files (left side), like close/open arrow for parent element*/
-#sidebar #project-files-container li.jstree-closed{} /*Closed tree element*/
-#sidebar #project-files-container li.jstree-open{} /*Open tree element*/
-#sidebar #project-files-container ul li a{} /*Project container file*/
-#sidebar #project-files-container ul li a.jstree-hovered{} /*Project container file hovered*/
-#sidebar #project-files-container ul li a span.extension{} /*Project container file's extension*/
-
-
-    /*Main area*/
-.CodeMirror{background-color: #1a1a1a; color: #777; }/*Main coding area, without line count.*/
-.CodeMirror-lines{}/*Code lines, syntax coloring has higher priority then .CodeMirror-lines*/
-
-.CodeMirror div.CodeMirror-cursor { border-left: 1px solid #333; z-index: 3;} /*Cursor stling*/
-.CodeMirror div.CodeMirror-secondarycursor {} /* Shown when moving in bi-directional text  - from CM docs*/
-
-	/*Brackets is based on webkit, so you can use scrollbar styling. Example below contains 8px width, grey scrollbar for the main area. You can use it with other section, just remember about z-indexes or things like 'selected' with overlap your scrollbar.*/
-.CodeMirror .CodeMirror-vscrollbar{ width: 8px; bottom:8px !important;} /*Scrollbar vertical. These values MUST be the same as height/width of scrollbars*/
-.CodeMirror .CodeMirror-hscrollbar{ height:8px; right:8px !important;} /*Scrollbar horizontal. These values MUST be the same as height/width of scrollbars*/
-
-.CodeMirror ::-webkit-scrollbar { width: 12px; height:12px;} /* The width of vertical scrollbars and height of horizontal scrollbars*/
-.CodeMirror ::-webkit-scrollbar-track {background-color: #333 !important;} /* The track that scrollbars run in */
-.CodeMirror ::-webkit-scrollbar-thumb {background-color: #a5a4a4 !important; border-radius: 4px} /* The scrollbar thumb */
-
-.CodeMirror-scrollbar-filler {height:8px !important; width:8px !important; background:none;} /* Corner where scrollbars meet. Width and height MUST be the same as that of scrollbars. Background should be the same as that of the scrollbar track*/
-.CodeMirror-gutter-filler{ height:8px !important;} /* Linenumber area left of horizontal scrollbar. Height MUST be the same as width/height of scrollbars */
-
-
-
-.CodeMirror .CodeMirror-scroll .CodeMirror-gutters{background-color: #545454; color:#ffffff;}/*Left vertical bar with line count*/
-.CodeMirror-gutter{color:#ffffff;} /*Left bar with line count - it will affect global line count, BUT line count in inline editor won't be changed.*/
-.CodeMirror-linenumbers{color:#ffffff;} /*Line count bar only, without "gutter"*/
-.CodeMirror-foldgutter{color:#ffffff;} /*It's exactly .CodeMirror-gutter{} without .CodeMirror-linenumbers{}.*/
-
-
-    /*Syntax elements & action*/
-.CodeMirror .cm-atom{color: #40D5B9 ;} /*Atribbute value ex. #f00 in color:#f00;*/
-.CodeMirror .cm-def{color: #F995E0  ;} /*variable definition*/
-.CodeMirror .cm-number{ color: #76B8EB;} /*Numbers*/
-.CodeMirror .cm-variable{ color: #e6e6e6;} /*Variable name ex. class Variable_name */
-.CodeMirror .cm-variable-2{color: #76B8EB ;} /*Variable declaration ex. $variable */
-.CodeMirror .cm-property{color: #e6e6e6;} /*Property ex. color in color:#f00;*/
-.CodeMirror .cm-operator{color: #666666;} /*Operators ex. dots (:) between property and atom value */
-.CodeMirror .cm-comment{color: #4F6B85;} /*Comment*/
-.CodeMirror .cm-string{color: #40D5B9 ;} /*String elements ex. "description" in name="description" - including quotation*/
-.CodeMirror .cm-meta{color: #9E9E9E;} /*Meta elements like ex.: <!DOCTYPE html>*/
-.CodeMirror .cm-qualifier{color: #40D5B9;} /*Final qualifier like css class ex.: .cm-qualifier*/
-.CodeMirror .cm-tag{color: #999 ;} /*Tags ex. ul or <ul>*/
-.CodeMirror .cm-attribute{color: #76B8EB ;} /*Attribute ex. rel, href, name*/
-.CodeMirror .cm-keyword {color: #e6e6e6;} /*Element call ex. array, class, public function, if, elseif, !important*/
-.CodeMirror .cm-matchingtag{color: #FFD37F;}
-
-.CodeMirror .CodeMirror-matchingtag{} /*Matching tags, open/close. Try !important for bg, color etc. if it doesn't work*/
-div.CodeMirror span.CodeMirror-matchingbracket{} /*Matching brackets, open/close*/
-
-.CodeMirror-selected{background-color: #2D3F4F; color: #000000 !important;} /*Selected lines - may need !important*/
-.CodeMirror-activeline-background{;} /*Active line - may need !important*/
-.CodeMirror-gutter-elt{} /*Active line, line count section*/
-div.CodeMirror span.CodeMirror-searching{background-color: #ffffff !important;} /*Search result highlight- may need !important*/
-
-
-    /*Status bar - bottom*/
-#status-bar{}/*Bottom status bar*/
-#status-bar #status-info{}/*Line & column info*/
-#status-bar #status-indicators{}/*Second part of the status bar*/
-#status-bar #status-indicators{} #status-indent{} /*Indent status info*/
-#status-bar #status-indicators{} #status-language{} /*Language info*/
-#status-bar #status-indicators{} #fileSizeInfo{} /*File size*/
-#status-bar #status-indicators{} #filePathInfo{} /*File path*/
-
-    /*Status bar - ex. debug area*/
-#problems-panel{} /*Bottom error panel main wrapper*/
-#problems-panel .toolbar{} /*Error panel toolbar with title and X*/
-#problems-panel .toolbar .title{} /*Error panel toolbar title eg. "JSLint Errors"*/
-#problems-panel .toolbar .close{} /*X to close error panel*/
-#problems-panel .toolbar .table-container{} /*Table container with errors*/
-#problems-panel .table .tbody{} /*Table with errors - additional classes for look: table-striped table-condensed row-highlight, fimilar for people working with Boostrap*/
-#problems-panel .table .tbody tr{} /*Single row containing line number, "error" message and code info*/
-#problems-panel .table .tbody tr td.line-number{} /*Line number for error row*/
-/*There are no separated classes for error and code excerpt, the only hint I can give is: error is second child and excerpt is 3rd chaild of tr.*/
-
-    /*Right toolbar - live preview, extensions*/
-#main-toolbar{} /*Whole toolbar*/
-#main-toolbar .buttons{} /*Buttons group*/
-
-
-    /*Modal windows like context-menu, quick-view or hint container*/
-#context-menu-bar .dropdown-menu{} /*Dropdown menu, available under right-click - may need !important*/
-#context-menu-bar .dropdown-menu a{} /*Single option, treat it like <li> ex. background*/
-#context-menu-bar .dropdown-menu a:hover{} /*Single option, treat it like <li> ex. background - hover state. RGBA is not working!*/
-
-		/*If you need different dropdown style for different sections, use IDs below.*/
-			#context-menu-bar #project-context-menu .dropdown-menu{} /*Dropdown menu for project files section*/
-			#context-menu-bar #editor-context-menu .dropdown-menu{} /*Dropdown menu for editor section*/
-			#context-menu-bar #inline-editor-context-menu .dropdown-menu{} /*Dropdown menu for inline editor like Quick Edit*/
-		/*--back to general--*/
-
-#codehint-menu-bar .dropdown-menu{} /*Code hint menu, dropdown visible when writing code.*/
-#codehint-menu-bar .dropdown-menu li a{} /*Code hint menu option, dropdown visible when writing code. Treat like <li>*/
-#codehint-menu-bar .dropdown-menu li a span.code-hint-item{} /*Single hint in dropdown menu, automaticlly puts already typed text into <strong>*/
-
-    /*Inline editor(Ex. Quick Edit - Ctrl + E)*/
-.inline-widget{} /*Inline widget wrap, won't affect line count bar*/
-.inline-text-editor{} /*Whole editing area - without active rule*/
-.inline-text-editor .CodeMirror-lines{}/*Code lines in inline editor, syntax coloring has higher priority then .CodeMirror-lines*/
-.inline-editor-header{} /*Inline text editor header, includes info about inline editor file*/
-.inline-editor-header a.filename{} /*Filename visible in inline editor - may need !important*/
-.inline-editor-header a.filename span.line-number{} /*Line number next to filename - may need !important*/
-.inline-editor-header button.btn{} /*Button responsible for "New rule"*/
-
-/*Global rules apply to inline editor scroll, just use .inline-widget class to target only bar options of this area. Example below.*/
-.inline-widget .CodeMirror-gutter{} /*Inline editor "gutter", won't affect line count in inline editor*/
-.inline-widget .CodeMirror-linenumbers{} /*Inline editor line numbers bar - no "gutter"*/
-
-.inline-widget .related-container{} /*Related container with similar rules*/
-.inline-widget .related-container .selection {} /*Currently selected style rule*/
-.inline-widget .related-container ul li.selected {} /*Currently selected style rule from related container - text*/
-.inline-widget .related-container .related ul li{} /*List element with rule*/
-.inline-widget .related-container .related ul li .related-file{} /*File information for rule*/
-
-    /*Inline widget - extended color picker*/
-.inline-widget .color-editor{} /*Extended color editor area*/
-
-.inline-widget .color-editor .sliders .color-selection-field{} /*Color selection square - big one*/
-.inline-widget .color-editor .hue-slider{} /*Hue slider*/
-.inline-widget .color-editor .opacity-slider{} /*Opacity slider*/
-
-.inline-widget .color-editor input.color-value{} /*Input for color value*/
-.inline-widget .color-editor ul.button-bar{} /*Buttons for RGBa, HEX, HSLA*/
-.inline-widget .color-editor ul.button-bar li a{} /*Single buttons <li>*/
-.inline-widget .color-editor ul.button-bar li a.rgba{} /*RGBa button*/
-.inline-widget .color-editor ul.button-bar li a.hex{} /*HEX button*/
-.inline-widget .color-editor ul.button-bar li a.hsla{} /*HSLA button*/
-
-.inline-widget .color-editor .large-swatches{} /*Big swatches with currently picked and original color*/
-.inline-widget .color-editor .large-swatches .current-color{} /*Current color swatch*/
-.inline-widget .color-editor .large-swatches .original-color{} /*Original color swatch*/
-
-.inline-widget .color-editor ul.swatches{} /*Small swatches with color suggestions*/
-.inline-widget .color-editor ul.swatches li .swatch-bg{} /*Swatch sample*/
-.inline-widget .color-editor ul.swatches li span.value{} /*Swatch label with color value*/
\ No newline at end of file
diff --git a/src/themes/theme/aquaman.css b/src/themes/theme/aquaman.css
deleted file mode 100644
index 6ac762bd606..00000000000
--- a/src/themes/theme/aquaman.css
+++ /dev/null
@@ -1,225 +0,0 @@
-
-/* Made with love by @DiegoAlvarezA */
-
-#main-toolbar {
-    background:#3c3f41;
-}
-
-#sidebar #working-set-header ,
-#sidebar #open-files-container ul li.selected a ,
-#sidebar #open-files-container ul li a:hover,
-#sidebar #project-files-header,
-#sidebar #project-files-header #project-dropdown-toggle {
-    color:#f8cb4f;
-}
-
-
-#sidebar #open-files-container {
-    color:#fafafa;
-}
-
-
-#sidebar #open-files-container ul li a span.extension,
-#sidebar #project-files-container ul li a span.extension {
-    color:#fce8b1
-}
-
-
-#sidebar #project-files-container ul li a {
-    color:#fafafa;
-    -webkit-transition:all 0.1s ease-in-out;
-}
-
-#sidebar #project-files-container ul li a.jstree-hovered {
-    color:#f8cb4f;
-    -webkit-transform:translateX(5px);
-}
-
-
-
-    .cm-s-aquaman.CodeMirror{
-        background:#242424;
-        color:#e0e0e0;
-    }
-
-    .cm-s-aquaman .CodeMirror-gutters {
-        background-color: #242424;
-        border-right:0;
-    }
-
-
-     .cm-s-aquaman .CodeMirror-hscrollbar{
-        bottom: 2px;
-        border-color: #202020;
-    }
-
-     .cm-s-aquaman .CodeMirror-vscrollbar{
-        right: 2px;
-        border-color: #202020;
-    }
-
-    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar {
-        height: 10px;
-    }
-
-    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar {
-        width: 10px;
-    }
-    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar-track ,
-    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar-track   {
-        background: transparent;
-    }
-    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar-thumb ,
-    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar-thumb  {
-        background: #3c3f41;
-
-    }
-    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar-thumb:hover ,
-    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar-thumb:hover {
-        background: #dd8440;
-    }
-    .cm-s-aquaman .CodeMirror-vscrollbar::-webkit-scrollbar-thumb:active ,
-    .cm-s-aquaman .CodeMirror-hscrollbar::-webkit-scrollbar-thumb:active{
-        background: #4bd278;
-    }
-
-    .cm-s-aquaman .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-        background-color: transparent;
-    }
-
-
-.cm-s-aquaman .cm-keyword       {color: #f6bf28;}
-.cm-s-aquaman .cm-number        {color: #f8cb4f;}
-.cm-s-aquaman .cm-variable      {color: #dd8440;}
-.cm-s-aquaman .cm-variable-2    {color: #f8cb4f;}
-.cm-s-aquaman .cm-variable-3    {color: #f8cb4f;}
-.cm-s-aquaman .cm-property      {color: #fcc6a0;}
-.cm-s-aquaman .cm-operator      {color: #e0e0e0;}
-.cm-s-aquaman .cm-atom          {color: #f8cb4f;}
-.cm-s-aquaman .cm-comment       {color: #4b4b4b; /* background:#d6d6d6; */}
-.cm-s-aquaman .cm-comment:hover {color: #242424; background:#d6d6d6;}
-.cm-s-aquaman .cm-string        {color: #f8cb4f;}
-.cm-s-aquaman .cm-string-2      {color: #f8cb4f;}
-.cm-s-aquaman .cm-def           {color: #41cf70;}
-.cm-s-aquaman .cm-meta          {color: #f8cb4f;}
-.cm-s-aquaman .cm-qualifier     {color: #41cf70;}
-.cm-s-aquaman .cm-tag             {color: #dd8440;}
-.cm-s-aquaman .cm-builtin       {color: #45cf5e;}
-.cm-s-aquaman .cm-attribute     {color: #45cf5e;}
-.cm-s-aquaman .cm-link             {color: #dd8440;}
-
-
-
-    .cm-s-aquaman .CodeMirror-selected {
-        background: #dd8440!important;
-        opacity:0.1;
-
-    }
-
-    .cm-s-aquaman .cm-matchhighlight {
-        background: #dd8440;
-        color:#2c2c2c!important;
-        border-radius:0px;
-
-    }
-
-
-    .cm-s-aquaman .CodeMirror-matchingtag {
-        color: #4bd164 !important;
-        text-decoration:underline;
-
-    }
-
-    .cm-s-aquaman span.CodeMirror-searching {
-        background: #4bd278;
-        color:#2c2c2c !important;
-        border-radius:0px;
-    }
-
-
-    .cm-s-aquaman .cm-matchhighlight.CodeMirror-searching.CodeMirror-selectedtext {
-        background: #dd8440 ;
-        color:#2c2c2c !important;
-        border-radius:0px;
-    }
-
-
-    .cm-s-aquaman span.CodeMirror-matchingbracket {
-        color: #f7c741 !important;
-        background:transparent;
-        font-weight: bold;
-        backface-visibility: hidden;
-
-    }
-
-    .cm-s-aquaman span.CodeMirror-nonmatchingbracket {
-        color: #f7c741 !important;
-        backface-visibility: hidden;
-
-    }
-
-
-    .cm-s-aquaman div.CodeMirror-cursor ,
-    .cm-s-aquaman div.CodeMirror-secondarycursor {
-        border-left: 2px solid #ff8833;
-        z-index:5;
-    }
-
-
-#status-bar {
-    border-top:1px solid #484b4d;
-    background:#3c3f41;
-
-}
-
-#status-bar #status-info {
-    color:#f7c741;
-
-}
-
-#status-bar #status-indicators{
-    background:#3c3f41;
-
-}
-
-#status-bar #status-indicators #status-language {
-    color:#dd8440;
-}
-
-
-#status-bar #status-indicators #status-indent {
-    color:#41cf70;
-}
-
-#context-menu-bar .dropdown-menu a{color:#3c3f41}
-#context-menu-bar .dropdown-menu a:hover{background:#f8cb4f}
-
-
-.inline-widget .CodeMirror-gutter {
-    background: #242424 !important;
-
-}
-
-.inline-editor-header{
-    box-shadow: inset 0 0 5px #1f1f1f;
-    background:#242424;
-    height:30px;
-    width:100%;
-}
-
-
-.inline-editor-header a.filename span.line-number{
-    color:#e0e0e0 !important;
-}
-
-
-.inline-editor-header a.filename {
-    color:#f8cb4f !important;
-}
-
-
-.inline-widget .color-editor ul.swatches li span.value{color:#525252}
-
-
-
-
diff --git a/src/themes/theme/default.css b/src/themes/theme/default.css
deleted file mode 100644
index 4c43136823f..00000000000
--- a/src/themes/theme/default.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.cm-s-default .CodeMirror-lines {
-    pointer-events: all;
-}
diff --git a/src/themes/theme/dracula.css b/src/themes/theme/dracula.css
deleted file mode 100644
index e2f1b6082ca..00000000000
--- a/src/themes/theme/dracula.css
+++ /dev/null
@@ -1,98 +0,0 @@
-.cm-s-dracula.CodeMirror { background: #282a36 !important; color: #EEE; }
-
-.CodeMirror div.CodeMirror-cursor { border-left: 1px solid #FFF !important; }
-.CodeMirror-selected { background: #3a3d4e !important; color: #eee !important; }
-.CodeMirror-lines{ line-height: 14px !important; }
-
-.cm-s-dracula .cm-keyword { color: #8be9fd !important; font-style: italic; }
-
-.cm-s-dracula .cm-js-atom { color: #FFF5B4 !important; }
-.cm-s-dracula .cm-css-atom { color: #bd93f9 !important; }
-
-.cm-s-dracula .cm-js-number {color: #bd93f9 !important; }
-.cm-s-dracula .cm-css-number {color: #bd93f9 !important; }
-
-.cm-s-dracula .cm-js-def { color: #8be9fd !important; }
-.cm-s-dracula .cm-css-def { color: #bd93f9 !important; }
-
-.cm-s-dracula .cm-js-variable { color: #ccc !important; }
-.cm-s-dracula .cm-js-variable-2 { color: #ccc !important; }
-.cm-s-dracula .cm-css-variable { color: #50fa7b !important; }
-.cm-s-dracula .cm-css-variable-2 { color: #50fa7b !important; }
-
-.cm-s-dracula .cm-js-property { color: #50fa7b !important; }
-.cm-s-dracula .cm-css-property { color: #6AEDFF !important;}
-
-.cm-s-dracula .cm-js-operator { color: #bd93f9 !important;}
-.cm-s-dracula .cm-css-operator  { color: #ccc !important; }
-
-.cm-s-dracula .cm-js-comment { color: #6272a4 !important; font-style: normal; }
-.cm-s-dracula .cm-css-comment { color: #6272a4 !important; font-style: italic; }
-.cm-s-dracula .cm-xml-comment { color: #6272a4 !important; font-style: normal !important; }
-
-.cm-s-dracula .cm-js-string { color: #f1fa8c !important; }
-.cm-s-dracula .cm-js-string-2 { color: #f1fa8c !important; }
-.cm-s-dracula .cm-css-string { color: #f1fa8c !important;}
-.cm-s-dracula .cm-css-string-2 { color: #8be9fd !important; }
-
-.cm-s-dracula .cm-js-meta { color: #8be9fd !important; }
-.cm-s-dracula .cm-css-meta { color: #6AEDFF !important;}
-
-.cm-s-dracula .cm-qualifier { color: #50fa7b !important; }
-
-.cm-s-dracula .cm-js-tag { color: #8be9fd !important; }
-.cm-s-dracula .cm-css-tag { color: #ff79c6 !important; }
-.cm-s-dracula .cm-xml-tag { color: #ff79c6 !important; }
-
-.cm-s-dracula .cm-js-attribute { color: #50fa7b !important; }
-.cm-s-dracula .cm-xml-attribute { color: #ff79c6 !important; }
-
-div.CodeMirror span.CodeMirror-matchingbracket { border: 1px solid #15CA1A !important; border-radius: 4px; color: #ccc !important;}
-
-div.CodeMirror span.cm-matchhighlight.CodeMirror-searching.CodeMirror-selectedtext { background-color: #3a3d4e !important;}
-
-/* */
-.cm-execution-line { background-color: rgba(137,245,162,.2) !important; outline: 1px solid #181818 !important;}
-.cm-js-hr { color: #AEAEAE !important; }
-.cm-js-link { color: #8be9fd !important; }
-.CodeMirror-linenumber { border-right: none !important;}
-.cm-xml-error { color: #bf4c4c  !important; }
-.cm-xml-string { color: #f1fa8c !important; }
-.cm-xml-link { color: #f1fa8c !important; }
-.cm-comment { color: #6272a4 !important; font-style: normal !important; }
-.cm-error { color: #bf4c4c  !important; }
-.cm-string { color: #f1fa8c !important; }
-.cm-tag { color: #ff79c6 !important; }
-.cm-attribute { color: #50fa7b !important; }
-.cm-link { color: #f1fa8c !important; }
-
-
-/*--GLOBAL EDITOR STYLES--*/
-.cm-breakpoint .CodeMirror-gutter-elt { color: #000 !important; font-weight: 700 !important;}
-.CodeMirror-cursor { border-left: 1px solid #FFF !important; }
-.cm-error { background: #9D1E15 !important; border-radius: 2px !important; color: #eee !important;}
-.CodeMirror-gutter-elt { color: #888 !important;}
-.CodeMirror-gutters {background: #282828 !important; border-right: 2px solid #2b2b2b !important; }
-.CodeMirror-selected { background: #3a3d4e !important; color: #eee !important; }
-.CodeMirror-nonmatchingbracket { border: 1px solid #db0404 !important; border-radius: 4px; color: #ccc !important;}
-.cm-search-highlight-start:before { border-color: #94a3dd !important;}
-.cm-search-highlight-end:before { border-color: #94a3dd !important;}
-.cm-search-highlight:before { border-color: #94a3dd !important; padding: 2px !important;}
-.cm-line-with-selection .cm-column-with-selection.cm-search-highlight:before { background-color: #94a3dd !important; border-radius: 2px !important;}
-span.cm-token-highlight { background-color: transparent !important; padding: 0px !important;}
-span.cm-token-highlight:before { border-color: #94a3dd !important; }
-.cm-line-with-selection span.cm-column-with-selection { color: #000 !important; background-color: #94a3dd !important; }
-.cm-whitespace:before { color: #555 !important;}
-.cm-tab:before { border-bottom: 1px solid #555 !important;}
-
-.cm-highlight {
-    -webkit-animation: "fadeout-revised" 3s 0s !important;
-}
-
-.cm-highlight *:not(.CodeMirror-linenumber){
-    color: #000 !important;
-}
-
-.CodeMirror .webkit-html-warning-message{
-    color: #411f07 !important;
-}
diff --git a/src/themes/theme/hammsidian.css b/src/themes/theme/hammsidian.css
deleted file mode 100644
index dd788b7ef9f..00000000000
--- a/src/themes/theme/hammsidian.css
+++ /dev/null
@@ -1,125 +0,0 @@
-.cm-s-hammsidian.CodeMirror
-{
-    font-family: consolas !important;
-    background-color: #293134;
-    color: #E0E2E4;
-    font-size: 16px !important;
-}
-
-.cm-s-hammsidian.CodeMirror .CodeMirror-lines pre
-{
-    z-index: 3;
-}
-
-.cm-s-hammsidian.CodeMirror .CodeMirror-gutters
-{
-    background-color: #293134;
-}
-
-.cm-s-hammsidian.CodeMirror .CodeMirror-linenumber
-{
-    background-color: #293134;
-    color: #81969A;
-}
-
-.cm-s-hammsidian.CodeMirror .CodeMirror-matchingbracket
-{
-    color: #dedede;
-    outline: 1px solid #dedede;
-}
-
-.cm-s-hammsidian.CodeMirror .CodeMirror-linebackground,
-.cm-s-hammsidian.CodeMirror .CodeMirror-activeline
-{
-    background-color: #2F393C;
-}
-
-
-.cm-s-hammsidian.CodeMirror .cm-atom { color: #EC7600; }
-.cm-s-hammsidian.CodeMirror .cm-qualifier { color: #678CB1; }
-
-/*CodeMirror does not add notation for css...  Which would be really nice. */
-/*.cm-s-hammsidian.CodeMirror .cm-property { color: red; }*/
-
-.cm-s-hammsidian.CodeMirror .cm-keyword { color: #93C763; }
-.cm-s-hammsidian.CodeMirror .cm-comment { color: #7D8C93; }
-.cm-s-hammsidian.CodeMirror .cm-string {color: #EC7600;}
-.cm-s-hammsidian.CodeMirror .cm-string-2 {color: #EC7600;}
-.cm-s-hammsidian.CodeMirror .cm-variable { color: #E0E2E4; }
-/*.cm-s-hammsidian.CodeMirror .cm-variable-2 { color: #EC7600; }*/
-.cm-s-hammsidian.CodeMirror .cm-tag { color: rgb(147,199,99); }
-.cm-s-hammsidian.CodeMirror .cm-attribute { color: #678CB1; }
-.cm-s-hammsidian.CodeMirror .cm-property { color: rgb(140,140,180); }
-.cm-s-hammsidian.CodeMirror .cm-number { color: #FF9E3D;}
-
-/*.cm-s-hammsidian.CodeMirror .cm-meta { color: #EC7600; }*/
-.cm-s-hammsidian.CodeMirror .cm-error { color: #EC7600; }
-
-.cm-s-hammsidian.CodeMirror .cm-matchhighlight:not(.CodeMirror-selectedtext)
-{
-      background-color: #616161;
-    color: white;
-}
-
-.CodeMirror-gutters {
-  border-right: 1px solid #444;
-}
-
-.CodeMirror-foldmarker {
-    padding-right:5px;
-    padding-left:5px;
-    background:#4d4d4d;
-    border:1px solid #ddd;
-    margin-right:3px;
-    margin-left:3px;
-    border-radius:3px;
-    color:#fff;
-    cursor:pointer;
-}
-
-.cm-s-hammsidian.CodeMirror .CodeMirror-selectedtext
-{
-      background-color: #804000;
-}
-
-.cm-s-hammsidian.CodeMirror .CodeMirror-selected
-{
-      background: transparent;
-}
-
-.cm-s-hammsidian.CodeMirror-focused .CodeMirror-selected
-{
-      background: transparent;
-}
-
-.cm-s-hammsidian.CodeMirror .CodeMirror-cursor
-{
-    z-index: 5;
-    border-left: 1px solid white;
-}
-
-#status-bar {
-    border-top:1px solid #484b4d;
-    background:#3c3f41;
-
-}
-
-#status-bar #status-info {
-    color:#f7c741;
-
-}
-
-#status-bar #status-indicators{
-    background:#3c3f41;
-
-}
-
-#status-bar #status-indicators #status-language {
-    color:#ed8d47;
-}
-
-
-#status-bar #status-indicators #status-indent {
-    color:#4bd278;
-}
-
diff --git a/src/themes/theme/light-table.css b/src/themes/theme/light-table.css
deleted file mode 100644
index 881dfedd158..00000000000
--- a/src/themes/theme/light-table.css
+++ /dev/null
@@ -1,124 +0,0 @@
-.cm-s-light-table.CodeMirror {
-	background-color: #202020;
-    color:#ccc;
-    padding-left: 8px;
-}
-.cm-s-light-table .CodeMirror-sizer{
-	padding-bottom: 90px;
-}
-
-.cm-s-light-table .CodeMirror-scroll{
-	margin-right: 5px;
-	border-color: #202020;
-}
-.cm-s-light-table .CodeMirror-vscrollbar{
-	overflow-y: hidden;
-}
-.cm-s-light-table ::-webkit-scrollbar {
-    width: 10px;
-}
-.cm-s-light-table ::-webkit-scrollbar-track {
-    background: transparent;
-}
-.cm-s-light-table ::-webkit-scrollbar-thumb {
-    background: rgba(255,255,255,.2);
-    border-radius: 5px;
-}
-.cm-s-light-table ::-webkit-scrollbar-thumb:hover{
-	background: rgba(255,255,255,.3);
-}
-.cm-s-light-table ::-webkit-scrollbar-thumb:active{
-	background: rgba(255,255,255,.4);
-}
-
-.cm-s-light-table.CodeMirror .inline-widget{
-	background: #272727;
-	color: #ccc;
-}
-.cm-s-light-table.CodeMirror .inline-widget h1,
-.cm-s-light-table.CodeMirror .inline-widget h2,
-.cm-s-light-table.CodeMirror .inline-widget h3{
-	color: #ccc;
-}
-.cm-s-light-table.CodeMirror .inline-widget p,
-.cm-s-light-table.CodeMirror .inline-widget dt,
-.cm-s-light-table.CodeMirror .inline-widget li,
-.cm-s-light-table.CodeMirror .inline-widget code{
-	color: #fff;
-}
-.cm-s-light-table.CodeMirror .CodeMirror-gutters {
-    border-color: #202020;
-    background: #202020;
-}
-.cm-s-light-table.CodeMirror .CodeMirror-linenumbers {
-	background-color: #202020;
-}
-.cm-s-light-table.CodeMirror .CodeMirror-linenumber {
-	color: #99997a;
-	padding-left: 15px;
-}
-.cm-s-light-table.CodeMirror .CodeMirror-activeline,
-.cm-s-light-table.CodeMirror.CodeMirror-focused .CodeMirror-activeline .CodeMirror-gutter-elt{
-	background: rgba(255,255,255,.1);
-}
-.cm-s-light-table.CodeMirror pre{
-	/*padding between line number & content*/
-	padding: 0 8px;
-}
-
-.cm-s-light-table.CodeMirror .CodeMirror-cursor {
-	border-left: 1px solid #ffffff;
-}
-.cm-s-light-table.CodeMirror .CodeMirror-selected {
-	background: rgba(255,255,255,.2);
-}
-
-.cm-s-light-table.CodeMirror .CodeMirror-matchingbracket {
-	border-bottom: 1px solid #33ffff;
-    color: #ccc19b;
-}
-.cm-s-light-table.CodeMirror .CodeMirror-unmatchingbracket {
-	border-bottom: 1px solid #cb3233;
-    color: #cb3233;
-}
-
-
-.cm-s-light-table.CodeMirror .cm-comment { 
-    color: #968879;
-}
-.cm-s-light-table.CodeMirror .cm-property {
-    color: #aaaaaa;
-}
-.cm-s-light-table.CodeMirror .cm-qualifier { 
-    color: #aaeeab;
-}
-.cm-s-light-table.CodeMirror .cm-tag { 
-    color: #7ac1ff;
-}
-.cm-s-light-table.CodeMirror .cm-def { 
-    color: #aaccff;
-}
-.cm-s-light-table.CodeMirror .cm-number {
-    color: #ccccab;
-}
-.cm-s-light-table.CodeMirror .cm-atom { 
-    color: #cc9dc7;
-}
-.cm-s-light-table.CodeMirror .cm-keyword{
-    color: #aacd80;
-}
-.cm-s-light-table.CodeMirror .cm-string{
-    color: #aadddd;
-}
-.cm-s-light-table.CodeMirror .cm-string-2{
-    color: #7ad1dd;
-}
-.cm-s-light-table.CodeMirror .cm-variable { 
-    color: #ccc19b; 
-}
-.cm-s-light-table.CodeMirror .cm-variable-2 { 
-    color: #aaccff; 
-}
-.cm-s-light-table.CodeMirror .cm-attribute {
-    color: #83e1b2;
-}
\ No newline at end of file
diff --git a/src/themes/theme/monokai-dark-soda.css b/src/themes/theme/monokai-dark-soda.css
deleted file mode 100644
index 8e6e0915930..00000000000
--- a/src/themes/theme/monokai-dark-soda.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.cm-s-monokai-dark-soda.CodeMirror {
-  background-color: #242424;
-  color: #fff;
-}
-
-.CodeMirror div.CodeMirror-cursor {
-  border-left: 1px solid #f8f8f0;
-  z-index: 3;
-}
-
-.CodeMirror-selected {
-    background: #3d3d3d;
-    opacity: .23;
-}
-
-.cm-s-monokai-dark-soda .cm-keyword {color: #ff007f;}
-.cm-s-monokai-dark-soda .cm-atom {color: #c48cff;}
-.cm-s-monokai-dark-soda .cm-number {color: #c48cff;}
-.cm-s-monokai-dark-soda .cm-def {color: #fd963f;}
-.cm-s-monokai-dark-soda .cm-variable {color: #fff;}
-.cm-s-monokai-dark-soda .cm-variable-2 {color: #c48cff;}
-.cm-s-monokai-dark-soda .cm-property {color: #52e3f6;}
-.cm-s-monokai-dark-soda .cm-operator {color: #ff007f;}
-.cm-s-monokai-dark-soda .cm-comment {color: #8c8c8c;}
-.cm-s-monokai-dark-soda .cm-string {color: #ece47e;}
-.cm-s-monokai-dark-soda .cm-string-2 {color: #ece47e;}
-.cm-s-monokai-dark-soda .cm-meta {color: #a7ec21;}
-.cm-s-monokai-dark-soda .cm-qualifier {color: #a7ec21;}
-.cm-s-monokai-dark-soda .cm-bracket {color: #f9faf4;}
-.cm-s-monokai-dark-soda .cm-tag {color: #ff007f;}
-.cm-s-monokai-dark-soda .cm-attribute {color: #a7ec21;}
-
-.cm-s-monokai-dark-soda .cm-matchhighlight:not(.CodeMirror-selectedtext) {
-    background-color: #616161;
-    color: white;
-}
-
-.cm-s-monokai-dark-soda .cm-matchhighlight {
-  background-color: #00CCFF;
-  color: #242424;
-}
-
-.CodeMirror .CodeMirror-matchingbracket {
-    color: #a7ec21;
-    font-weight: bold;
-}
-
-.CodeMirror .CodeMirror-gutters {
-    background-color: #242424;
-}
-
-.CodeMirror .CodeMirror-searching {
-  color: #242424;
-  background-color: #ffe69d !important;
-}
diff --git a/src/themes/theme/nando.css b/src/themes/theme/nando.css
deleted file mode 100644
index 8e550ed7572..00000000000
--- a/src/themes/theme/nando.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @author  Héctor Fernando Hurtado
- * @version 2013-05-27
- */
-
-.cm-s-nando.CodeMirror {
-	background: rgb(30,30,30); /* Old browsers */
-background: -moz-linear-gradient(top, rgba(30,30,30,1) 0%, black 100%); /* FF3.6+ */
-background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(30,30,30,1)), color-stop(100%,black)); /* Chrome,Safari4+ */
-background: -webkit-linear-gradient(top, rgba(30,30,30,1) 0%,black 100%); /* Chrome10+,Safari5.1+ */
-background: -o-linear-gradient(top, rgba(30,30,30,1) 0%,black 100%); /* Opera 11.10+ */
-background: -ms-linear-gradient(top, rgba(30,30,30,1) 0%,black 100%); /* IE10+ */
-background: linear-gradient(to bottom, rgba(30,30,30,1) 0%,black 100%); /* W3C */
-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1e1e1e', endColorstr='#353535',GradientType=0 ); /* IE6-9 */
-
-    color: #fbffa0;
-}
-.cm-s-nando div.CodeMirror-selected {background: #075601 !important;}
-.cm-s-nando .CodeMirror-activeline-background { background: #222 !important; }
-
-.cm-s-nando .CodeMirror-gutters { background: rgb( 30, 30, 30 ); border-right:1px solid #f4f4f4; }
-
-.cm-s-nando span.cm-meta {color: #c1c1c1;}
-.cm-s-nando span.cm-keyword { line-height: 1em; font-weight: bold; color: #aaffb4; }
-.cm-s-nando span.cm-atom {color: #f4f4f4;}
-.cm-s-nando span.cm-number {color: #f4f4f4;}
-.cm-s-nando span.cm-def {color: #e7adff;}
-.cm-s-nando span.cm-variable {color: #f4f4f4;}
-.cm-s-nando span.cm-variable-2 {color: #f4f4f4;}
-.cm-s-nando span.cm-variable-3 {color: #f4f4f4;}
-.cm-s-nando span.cm-property {color: #c1c1c1;}
-.cm-s-nando span.cm-operator {color: #f4f4f4;}
-.cm-s-nando span.cm-comment {color: #c1c1c1;}
-.cm-s-nando span.cm-string {color: #c1c1c1;}
-.cm-s-nando span.cm-string-2 {color: #c1c1c1;}
-.cm-s-nando span.cm-error {color: #ff7a7a;}
-.cm-s-nando span.cm-qualifier {color: #adf6ff;}
-.cm-s-nando span.cm-builtin {color: #f4f4f4;}
-.cm-s-nando span.cm-bracket {color: #f4f4f4;}
-.cm-s-nando span.cm-tag {color: #aaffb4;}
-.cm-s-nando span.cm-attribute {color: #adf6ff;}
-.cm-s-nando span.cm-link {color: #a9d7f9;}
-
-.cm-s-nando .CodeMirror-cursor { border-left: 1px solid white !important; }
-
-.cm-s-nando .CodeMirror-linenumber { color: #f4f4f4; }
-div.CodeMirror span.CodeMirror-matchingbracket { color: #f4f4f4; }
-
-.cm-s-nando .CodeMirror-matchingbracket {
-	/* outline:1px solid grey; */
-    font-weight: bold;
-	color: #adf6ff !important;
-}
diff --git a/src/themes/theme/obsidian.css b/src/themes/theme/obsidian.css
deleted file mode 100644
index bc91bd1d2c5..00000000000
--- a/src/themes/theme/obsidian.css
+++ /dev/null
@@ -1,80 +0,0 @@
-.cm-s-obsidian.CodeMirror
-{
-    font-family: monaco;
-    background-color: #293134;
-    color: #E0E2E4;
-}
-
-.cm-s-obsidian.CodeMirror .CodeMirror-lines pre
-{
-    z-index: 3;
-}
-
-.cm-s-obsidian.CodeMirror .CodeMirror-gutters
-{
-	background-color: #293134;
-}
-
-.cm-s-obsidian.CodeMirror .CodeMirror-linenumber
-{
-	background-color: #293134;
-	color: #81969A;
-}
-
-.cm-s-obsidian.CodeMirror .CodeMirror-matchingbracket
-{
-    color: #dedede;
-	outline: 1px solid #dedede;
-}
-
-.cm-s-obsidian.CodeMirror .CodeMirror-linebackground,
-.cm-s-obsidian.CodeMirror .CodeMirror-activeline
-{
-    background-color: #2F393C;
-}
-
-
-.cm-s-obsidian.CodeMirror .cm-atom { color: #EC7600; }
-.cm-s-obsidian.CodeMirror .cm-qualifier { color: #678CB1; }
-
-/*CodeMirror does not add notation for css...  Which would be really nice. */
-/*.cm-s-obsidian.CodeMirror .cm-property { color: red; }*/
-
-.cm-s-obsidian.CodeMirror .cm-keyword { color: #93C763; }
-.cm-s-obsidian.CodeMirror .cm-comment { color: #7D8C93; }
-.cm-s-obsidian.CodeMirror .cm-string {color: #EC7600;}
-.cm-s-obsidian.CodeMirror .cm-string-2 {color: #EC7600;}
-.cm-s-obsidian.CodeMirror .cm-variable { color: #E0E2E4; }
-.cm-s-obsidian.CodeMirror .cm-variable-2 { color: #E0E2E4; }
-.cm-s-obsidian.CodeMirror .cm-tag { color: #678CB1; }
-.cm-s-obsidian.CodeMirror .cm-attribute { color: #678CB1; }
-.cm-s-obsidian.CodeMirror .cm-property { color: #E0E2E4; }
-.cm-s-obsidian.CodeMirror .cm-number { color: #FFCD22; }
-
-.cm-s-obsidian.CodeMirror .cm-matchhighlight:not(.CodeMirror-selectedtext)
-{
-  	background-color: #616161;
-    color: white;
-}
-
-.cm-s-obsidian.CodeMirror .CodeMirror-selectedtext
-{
-  	background-color: #804000;
-}
-
-.cm-s-obsidian.CodeMirror .CodeMirror-selected
-{
-  	background: transparent;
-}
-
-.cm-s-obsidian.CodeMirror-focused .CodeMirror-selected
-{
-  	background: transparent;
-}
-
-.cm-s-obsidian.CodeMirror .CodeMirror-cursor
-{
-    z-index: 5;
-    border-left: 1px solid white;
-}
-
diff --git a/src/themes/theme/pixie.css b/src/themes/theme/pixie.css
deleted file mode 100644
index 115f3cec6c8..00000000000
--- a/src/themes/theme/pixie.css
+++ /dev/null
@@ -1,265 +0,0 @@
-.panel {
-  background:#2b2b2b;
-}
-
-#main-toolbar,
-#status-bar,
-#status-indicators {
-  background:#242424;
-  color:#ccc;
-}
-
-/*#sidebar {
-  position: inherit !important;
-}
-#working-set-header {
-  display: none !important;
-}
-#open-files-container {
-  width: 100% !important;
-  position: absolute !important;
-  z-index: 10 !important;
-  max-height: auto !important;
-  height: auto !important;
-  overflow: hidden !important;
-}
-#open-files-container li {
-  float: left;
-}*/
-
-#status-info {
-  color:#ccc;
-}
-
-#open-files-container,
-#working-set-header {
-  color:#aaa;
-  background:#111;
-}
-#project-files-header {
-  color:#aaa;
-  background:#222;
-}
-.recent-folder,
-#open-folder-link {
-  color:#ddd;
-}
-#project-dropdown.dropdown-menu a.selected {
-  background: #0081c2;
-}
-.dropdown-menu {
-  background: #333;
-  color: #aaa;
-}
-.dropdown-menu .divider {
-  background: #222;
-  border-bottom: 1px solid #444;
-}
-.sidebar-selection {
-  background: #1a1a1a;
-}
-.sidebar-selection-triangle {
-  display: none !important;
-}
-
-.jstree-brackets li.jstree-closed > a,
-.jstree-brackets li.jstree-open > a {
-  color:#ccc;
-}
-
-#open-files-container .extension,
-.jstree-brackets li .extension {
-  color:#aaa;
-}
-
-.cm-s-pixie.CodeMirror {
-    background-color:#202020;
-    color:#fff;
-}
-
-.cm-s-pixie.CodeMirror div.CodeMirror-cursor {
-  border-left:1px solid #f8f8f0;
-  z-index:3;
-}
-
-.cm-s-pixie .CodeMirror-selected {
-  background:#3d3d3d;
-  opacity:.5;
-}
-
-.cm-s-pixie .cm-keyword    {color:#CC7833;}
-.cm-s-pixie .cm-atom       {color:#A5C261;}
-.cm-s-pixie .cm-number     {color:#A5C261;}
-.cm-s-pixie .cm-def        {color:#A0BD2D;}
-.cm-s-pixie .cm-variable   {color:#FFCC33;}
-.cm-s-pixie .cm-variable-2 {color:#DA4939;}
-.cm-s-pixie .cm-property   {color:#DAD6CD;}
-.cm-s-pixie .cm-operator   {color:#34A2D9;}
-.cm-s-pixie .cm-comment    {color:#BC9458;}
-.cm-s-pixie .cm-string     {color:#A0BD2D;}
-.cm-s-pixie .cm-string-2   {color:#A5C261;}
-.cm-s-pixie .cm-meta       {color:#CC7833;}
-.cm-s-pixie .cm-qualifier  {color:#FFCC33;}
-.cm-s-pixie .cm-bracket    {color:#FF3333;}
-.cm-s-pixie .cm-tag        {color:#E8BF6A;}
-.cm-s-pixie .cm-attribute  {color:#FFCC33;}
-.cm-s-pixie .cm-builtin  {color:#CC7833;}
-
-.cm-s-pixie .cm-matchhighlight {
-  background:#00CCFF;
-  box-shadow:0 0 5px #00CCFF;
-  color:#000;
-  border-radius:2px;
-}
-
-.cm-s-pixie.CodeMirror span.CodeMirror-nonmatchingbracket {
-  color:#FF3333;
-  text-shadow: none;
-  border-bottom: 1px solid #FF3333;
-}
-
-.cm-s-pixie.CodeMirror span.CodeMirror-matchingbracket {
-  color:#DAD6CD;
-  text-shadow: none;
-  border-bottom: 1px solid #DAD6CD;
-}
-
-.cm-s-pixie.CodeMirror span.cm-matchhighlight.CodeMirror-searching.CodeMirror-selectedtext {
-  background-color:#FFCC33;
-  color:#000;
-  border:0;
-  box-shadow:0 0 5px #FFCC33;
-  border-radius:2px;
-}
-
-.cm-s-pixie.CodeMirror span.CodeMirror-matchingtag {
-  color: #E8BF6A !important;
-  background-color: #222222 !important;
-}
-
-.cm-s-pixie.CodeMirror span.CodeMirror-searching {
-  background-color:#00CCFF;
-  box-shadow:0 0 5px #00CCFF;
-  color:#000;
-  border-radius:2px;
-}
-
-.cm-s-pixie .CodeMirror-activeline-background {
-  background:hsla(0,0%,0%,0.5)!important;
-  margin:-1px -10px;
-}
-
-.cm-s-pixie div.CodeMirror-gutter {
-  color:#ccc;
-}
-
-.cm-s-pixie div.CodeMirror-gutters {
-  background-color:#333435;
-  box-shadow:0 0 10px hsla(0,0%,0%,.8);
-  padding:0 15px 20px 10px;
-  border-right:0;
-}
-
-.cm-s-pixie span.CodeMirror-widget {
-  margin:-3px 0px;
-  display:inline-block;
-}
-.cm-s-pixie span.CodeMirror-foldmarker {
-  display:inline-table;
-  background:#ccc;
-  border:0;
-  color:#000;
-  border-radius:3px;
-  font-size:20px;
-  margin:3px;
-  padding:0px 5px;
-  height:15px;
-  line-height:15px;
-  overflow:hidden;
-  white-space:nowrap;
-}
-
-/* Let's get this party started */
-::-webkit-scrollbar {
-    -webkit-appearance: none;
-    width: 12px;
-}
-
-/* Track */
-::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-    -webkit-border-radius: 10px;
-    border-radius: 10px;
-    background-color: #1a1a1a;
-}
-
-/* Handle */
-::-webkit-scrollbar-thumb {
-    -webkit-border-radius: 10px;
-    border-radius: 10px;
-    background: rgba(100,100,100,1);
-    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
-}
-::-webkit-scrollbar-thumb:window-inactive {
-    background: rgba(55,55,55,0.9);
-}
-
-.extension-manager-dialog .modal-header,
-.extension-manager-dialog .modal-footer {
-  background: #222;
-}
-.extension-manager-dialog .modal-body {
-  background: #1a1a1a;
-}
-.extension-manager-dialog .modal-footer {
-  border-color: #1a1a1a;
-}
-.extension-manager-dialog .modal-header .nav-tabs > li > a {
-  color: #eee;
-}
-.extension-manager-dialog .modal-header .nav-tabs > .active > a,
-.extension-manager-dialog .modal-header .nav-tabs > .active > a:hover {
-  background: #333;
-  border-color: #1a1a1a #1a1a1a transparent #1a1a1a;
-}
-.table-striped tbody tr:nth-child(odd) td,
-.table-striped tbody tr:nth-child(odd) th {
-  background: #333;
-  color: #eee;
-}
-.table-striped tbody tr:nth-child(even) td,
-.table-striped tbody tr:nth-child(even) th {
-  background: #2a2a2a;
-  color: #eee;
-}
-body.platform-win .extension-manager-dialog .modal-body .extension-list .ext-name,
-body.platform-win .extension-manager-dialog .modal-body .extension-list .ext-desc {
-  color: #eee;
-}
-.extension-manager-dialog .modal-header .nav-tabs {
-  border-color: #1a1a1a;
-}
-.extension-manager-dialog .modal-body .info-message {
-  background: #1a1a1a;
-  color: #888;
-}
-#project-dropdown-toggle {
-  width: auto;
-}
-#devdocs-viewer-iframe ._header {
-  background-color: #222;
-}
-.toolbar .nav .dropdown-menu li a,
-.context-menu .dropdown-menu li a,
-.codehint-menu .dropdown-menu li a {
-  color: #bbb;
-}
-.toolbar .nav .dropdown-menu li a:hover,
-.context-menu .dropdown-menu li a:hover,
-.codehint-menu .dropdown-menu li a:hover,
-.toolbar .nav .dropdown-menu li a.highlight,
-.context-menu .dropdown-menu li a.highlight,
-.codehint-menu .dropdown-menu li a.highlight {
-  color: #eee;
-  background: #0081c2;
-}
diff --git a/src/themes/theme/railscasts.css b/src/themes/theme/railscasts.css
deleted file mode 100644
index a15c7cb14ce..00000000000
--- a/src/themes/theme/railscasts.css
+++ /dev/null
@@ -1,73 +0,0 @@
-.cm-s-railscasts.CodeMirror
-{
-    background-color: #232323;
-    color: #E0E2E4;
-}
-
-.cm-s-railscasts.CodeMirror .CodeMirror-lines pre
-{
-    z-index: 3;
-}
-
-.cm-s-railscasts.CodeMirror .CodeMirror-gutters
-{
-    background-color: #293134;
-}
-
-.cm-s-railscasts.CodeMirror .CodeMirror-linenumber
-{
-    background-color: #1F1F1F;
-    color: #81969A;
-}
-
-.cm-s-railscasts.CodeMirror .CodeMirror-matchingbracket
-{
-    color: #dedede;
-    outline: 1px solid #dedede;
-}
-
-.cm-s-railscasts.CodeMirror .CodeMirror-linebackground,
-.cm-s-railscasts.CodeMirror .CodeMirror-activeline
-{
-    background-color: #2F393C;
-}
-
-.cm-s-railscasts.CodeMirror .cm-atom { color: #678CB1; }
-.cm-s-railscasts.CodeMirror .cm-qualifier { color: #678CB1; }
-.cm-s-railscasts.CodeMirror .cm-keyword { color: #EC7600; }
-.cm-s-railscasts.CodeMirror .cm-comment { color: #BC9458 }
-.cm-s-railscasts.CodeMirror .cm-string {color: #93C763;}
-.cm-s-railscasts.CodeMirror .cm-string-2 {color: #93C763;}
-.cm-s-railscasts.CodeMirror .cm-variable { color: #E0E2E4; }
-.cm-s-railscasts.CodeMirror .cm-variable-2 { color: #E0E2E4; }
-.cm-s-railscasts.CodeMirror .cm-tag { color: #678CB1; }
-.cm-s-railscasts.CodeMirror .cm-attribute { color: #678CB1; }
-.cm-s-railscasts.CodeMirror .cm-property { color: #E0E2E4; }
-.cm-s-railscasts.CodeMirror .cm-number { color: #FFCD22; }
-
-.cm-s-railscasts.CodeMirror .cm-matchhighlight:not(.CodeMirror-selectedtext)
-{
-    background-color: #616161;
-    color: white;
-}
-
-.cm-s-railscasts.CodeMirror .CodeMirror-selectedtext
-{
-    background-color: #804000;
-}
-
-.cm-s-railscasts.CodeMirror .CodeMirror-selected
-{
-    background: transparent;
-}
-
-.cm-s-railscasts.CodeMirror-focused .CodeMirror-selected
-{
-    background: transparent;
-}
-
-.cm-s-railscasts.CodeMirror .CodeMirror-cursor
-{
-    z-index: 5;
-    border-left: 1px solid white;
-}
diff --git a/src/themes/theme/selenitic.css b/src/themes/theme/selenitic.css
deleted file mode 100644
index 08af1afada1..00000000000
--- a/src/themes/theme/selenitic.css
+++ /dev/null
@@ -1,179 +0,0 @@
-.cm-s-selenitic.CodeMirror {
-  background: #333333;
-  color: #dfdfbf;
-}
-.cm-s-selenitic .CodeMirror-gutters {
-  background-color: #333333;
-  border-right: 0;
-}
-.cm-s-selenitic .CodeMirror-hscrollbar {
-  bottom: 2px;
-  border-color: #202020;
-}
-.cm-s-selenitic .CodeMirror-vscrollbar {
-  right: 2px;
-  border-color: #202020;
-}
-.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar {
-  height: 10px;
-}
-.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar {
-  width: 10px;
-}
-.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar-track,
-.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar-track {
-  background: transparent;
-}
-.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar-thumb,
-.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar-thumb {
-  background: #3c3f41;
-}
-.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar-thumb:hover,
-.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar-thumb:hover {
-  background: #dd8440;
-}
-.cm-s-selenitic .CodeMirror-vscrollbar::-webkit-scrollbar-thumb:active,
-.cm-s-selenitic .CodeMirror-hscrollbar::-webkit-scrollbar-thumb:active {
-  background: #4bd278;
-}
-.cm-s-selenitic .CodeMirror-scrollbar-filler,
-.cm-s-selenitic .CodeMirror-gutter-filler {
-  background-color: transparent;
-}
-.cm-s-selenitic .cm-keyword {
-  color: #efc986;
-}
-.cm-s-selenitic .cm-number {
-  color: #6e96be;
-}
-.cm-s-selenitic .cm-variable {
-  color: #dfdfbf;
-}
-.cm-s-selenitic .cm-variable-2 {
-  color: #efc986;
-}
-.cm-s-selenitic .cm-variable-3 {
-  color: #dfdfbf;
-}
-.cm-s-selenitic .cm-property {
-  color: #8acccf;
-}
-.cm-s-selenitic .cm-operator {
-  color: #000000;
-}
-.cm-s-selenitic .cm-atom {
-  color: #efc986;
-}
-.cm-s-selenitic .cm-comment {
-  color: #7a987a;
-  background: #000000;
-}
-.cm-s-selenitic .cm-comment:hover {
-  color: #b3c5b3;
-  background: #000000;
-}
-.cm-s-selenitic .cm-string {
-  color: #dfaf8f;
-}
-.cm-s-selenitic .cm-string-2 {
-  color: #dfaf8f;
-}
-.cm-s-selenitic .cm-def {
-  color: #8acccf;
-}
-.cm-s-selenitic .cm-meta {
-  color: #000000;
-}
-.cm-s-selenitic .cm-qualifier {
-  color: #000000;
-}
-.cm-s-selenitic .cm-tag {
-  color: #efc986;
-}
-.cm-s-selenitic .cm-builtin {
-  color: #efc986;
-}
-.cm-s-selenitic .cm-attribute {
-  color: #dfdfbf;
-}
-.cm-s-selenitic .cm-link {
-  color: #dfaf8f;
-}
-.cm-s-selenitic .CodeMirror-selected {
-  background: #486a65 !important;
-  opacity: 0.3;
-}
-.cm-s-selenitic .cm-matchhighlight {
-  background: #505050;
-  color: #000000 !important;
-  border-radius: 0px;
-}
-.cm-s-selenitic .CodeMirror-matchingtag {
-  color: #a5a5a5 !important;
-  text-decoration: underline;
-}
-.cm-s-selenitic span.CodeMirror-searching {
-  background: #4bd278;
-  color: #2c2c2c !important;
-  border-radius: 0px;
-}
-.cm-s-selenitic .cm-matchhighlight.CodeMirror-searching.CodeMirror-selectedtext {
-  background: #dd8440;
-  color: #2c2c2c !important;
-  border-radius: 0px;
-}
-.cm-s-selenitic span.CodeMirror-matchingbracket {
-  color: #a5a5a5 !important;
-  background: transparent;
-  font-weight: bold;
-  backface-visibility: hidden;
-}
-.cm-s-selenitic span.CodeMirror-nonmatchingbracket {
-  color: #d7dde8 !important;
-  backface-visibility: hidden;
-}
-.cm-s-selenitic div.CodeMirror-cursor,
-.cm-s-selenitic div.CodeMirror-secondarycursor {
-  border-left: 2px solid #ff8833;
-  z-index: 5;
-}
-#status-bar {
-  border-top: 1px solid #484b4d;
-  background: #3c3f41;
-}
-#status-bar #status-info {
-  color: #f7c741;
-}
-#status-bar #status-indicators {
-  background: #3c3f41;
-}
-#status-bar #status-indicators #status-language {
-  color: #dd8440;
-}
-#status-bar #status-indicators #status-indent {
-  color: #41cf70;
-}
-#context-menu-bar .dropdown-menu a {
-  color: #3c3f41;
-}
-#context-menu-bar .dropdown-menu a:hover {
-  background: #f8cb4f;
-}
-.inline-widget .CodeMirror-gutter {
-  background: #242424 !important;
-}
-.inline-widget .CodeMirror-gutter .color-editor ul.swatches li span.value {
-  color: #525252;
-}
-.inline-editor-header {
-  box-shadow: inset 0 0 5px #1f1f1f;
-  background: #242424;
-  height: 30px;
-  width: 100%;
-}
-.inline-editor-header a.filename span.line-number {
-  color: #e0e0e0 !important;
-}
-.inline-editor-header a.filename {
-  color: #f8cb4f !important;
-}
diff --git a/src/themes/theme/visual-studio-2012.css b/src/themes/theme/visual-studio-2012.css
deleted file mode 100644
index 10a1f35f31a..00000000000
--- a/src/themes/theme/visual-studio-2012.css
+++ /dev/null
@@ -1,247 +0,0 @@
-/* Main UI */
-*:focus {
-    outline: none !important;
-	box-shadow: none !important;
-}
-
-#sidebar{
-    background:#D6DBE9;
-    text-shadow:none;
-}
-
-#working-set-header {
-	background:#D6DBE9;
-	border-bottom: 4px solid #293955;
-	color: #60728C;
-	text-shadow: none;
-	
-}
-#open-files-container{ /* Working files */
-    background: #293955;
-	color: #fff;
-}
-
-#project-files-header {/* "working files" header and folder header*/
-    color:#777!important;
-}
-
-#working-set-option-btn, #project-dropdown-toggle, #main-toolbar a, .btn {
-	color:#60728C;
-}
-.btn {
-	color:#000;
-	background: linear-gradient(to bottom, #f0f0f0 0%,#e5e5e5 100%);
-	border: 1px solid #ACACAC;
-	border-radius: 0px;
-	box-shadow: none;
-	text-shadow: none;
-}
-.btn.primary {
-	border-color: #E5C365;
-}
-.btn.active {
-	background: none;
-	background-color:#FFF0D0 !important;
-	border-color: #E5C365;
-	color: #E5C365 !important;
-}
-.btn:not([disabled]):hover {
-	background: none;
-}
-#working-set-option-btn:hover, #project-dropdown-toggle:hover, #main-toolbar a:hover, .btn:not([disabled]):hover { /* Open url when hover */
-    color:#000;
-	background-color:#FFF0D0 !important;
-	border: 1px solid #E5C365;
-	border-radius: 0px;
-}
-input {
-	border: 1px solid #ACACAC;
-	background-color: #f0f0f0;
-	border-radius: 0px;
-}
-input:focus {
-	border: 1px solid #E5C365;
-}
-
-#main-toolbar a {
-	margin-left: 2px;
-	margin-top: 6px;
-	margin-bottom: -1px;
-	border: 1px solid transparent;
-}
-
-#project-files-container {
-	padding-top: 5px;
-	background: #293955;
-}
-
-.jstree-brackets li a,
-.jstree-brackets li a .extension, /* Files, folder and extensions */
-#open-files-container li a,
-#open-files-container li a .extension,
-#open-files-container li a.jstree-clicked { /* Files, folder and extensions in "working fiels"*/
-    color:#fff;
-}
-.jstree-brackets li.selected a,
-.jstree-brackets li.selected a .extension,
-.jstree-brackets li a.jstree-clicked,
-.jstree-brackets li a.jstree-clicked .extension, /* Files, folder and extensions */
-#open-files-container li.selected a,
-#open-files-container li.selected a .extension,
-#open-files-container li.selected a.jstree-clicked { /* Files, folder and extensions in "working fiels"*/
-    color:#000;
-}
-
-.sidebar-selection{ /* Selected file or folder */
-    background:#FFF0D0;
-	margin-left:0px;
-}
-
-.sidebar-selection-triangle{ /* ^ the cool arrow */
-    background:transparent;
-}
-
-.sidebar-selection-triangle.triangle-visible::before{
-    border-left:12px solid #FFF0D0;
-	display:none;
-}
-
-#main-toolbar{ /* Toolbar to the right */
-    background:#D6DBE9;
-}
-
-#status-bar{ /* Bottom status bar */
-    background:#293955;
-}
-
-#status-indicators,
-#status-info{ /* Status bar text */
-    background:transparent;
-	color: #fff;
-}
-
-/* Context menu */
-.dropdown-menu {
-	background-color: red;
-	border: 1px solid #9ba7b7 !important;
-	border-radius: none !important;
-	background: linear-gradient(to bottom, #e9ecee 0%, #d0d7e2 100%) !important;
-}
-.dropdown-menu .divider {
-	border: none !important;
-	background-color: #bec3cb;
-}
-.dropdown-menu a {
-	color: #3f3f3f;
-	border: 1px solid transparent;
-	margin: 1px 4px !important;
-	padding-top: 2px !important;
-	padding-bottom: 2px !important;
-}
-.dropdown-menu a:hover, .dropdown-menu a.highlight {
-	color:#000;
-	background-color:#FFF0D0 !important;
-	border: 1px solid #E5C365;
-	margin: 1px 4px !important;
-	border-radius: 0px;
-}
-
-/* Code Editor */
-.cm-s-visual-studio-2012.CodeMirror
-{
-    border-left: 2px solid #FFF0D0;
-	background-color: #fefefe;
-    color:black;
-	font-family: consolas !important;
-}
-
-.cm-s-visual-studio-2012.CodeMirror .CodeMirror-gutters
-{
-    background-color: #fefefe;
-}
-
-.cm-s-visual-studio-2012.CodeMirror .CodeMirror-linenumber
-{
-    color: /*#0E97A1*/ #BAC1D6;
-    background-color: #fefefe;
-	font-family: consolas !important;
-}
-
-.cm-s-visual-studio-2012.CodeMirror .CodeMirror-matchingbracket
-{
-    color: black;
-    background-color: #dedede;
-}
-
-.cm-s-visual-studio-2012.CodeMirror .CodeMirror-linebackground
-{
-    outline: 2px solid #dddddd;
-    z-index: 3;
-}
-
-.cm-s-visual-studio-2012 .CodeMirror-activeline-background,
-.cm-s-visual-studio-2012 .CodeMirror-activeline .CodeMirror-gutter-elt
-{
-    background: transparent !important;
-}
-
-.cm-s-visual-studio-2012 .CodeMirror-activeline-background
-{
-    outline: 2px solid #dddddd;
-}
-
-.cm-s-visual-studio-2012 .CodeMirror-activeline .CodeMirror-gutter-elt
-{
-    outline: 0px;
-}
-
-
-.cm-s-visual-studio-2012.CodeMirror .cm-matchhighlight
-{
-    background-color: yellow;
-}
-
-.cm-s-visual-studio-2012.CodeMirror .CodeMirror-selectedtext
-{
-    background-color: #ADD6FF;
-}
-
-.cm-s-visual-studio-2012.CodeMirror .CodeMirror-selected,
-.cm-s-visual-studio-2012.CodeMirror-focused .CodeMirror-selected
-{
-    background: transparent;
-}
-
-
-.cm-s-visual-studio-2012.CodeMirror .cm-atom,
-.cm-s-visual-studio-2012.CodeMirror .cm-qualifier,
-.cm-s-visual-studio-2012.CodeMirror .cm-def,
-.cm-s-visual-studio-2012.CodeMirror .cm-keyword {
-	color: #0000FF;
-}
-
-/* css */
-/* css selectors */
-.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-qualifier /* .class */ { color: #800000; }
-.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-builtin /* #id */ { color: #ff0000; }
-.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-tag /* tag */ { color: #8063d4; }
-.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-variable-3 /* :pseudo */ { color: #af552b; }
-
-
-/* css values */
-.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-number { color: #2B91AF; }
-.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-keyword /* !important */ { color: #FF0000; }
-.doctype-css .cm-s-visual-studio-2012.CodeMirror .cm-variable /* other value, like font name */ { color: #3399ff; }
-
-/*CodeMirror does not add notation for css...  Which would be really nice. */
-/*.cm-s-visual-studio-2012.CodeMirror .cm-property { color: red; }*/
-
-.cm-s-visual-studio-2012.CodeMirror .cm-comment { color: green; }
-.cm-s-visual-studio-2012.CodeMirror .cm-string {color: #800000;}
-.cm-s-visual-studio-2012.CodeMirror .cm-string-2 {color: #800000;}
-.cm-s-visual-studio-2012.CodeMirror .cm-variable { color: black; }
-.cm-s-visual-studio-2012.CodeMirror .cm-variable-2 { color: #2B91AF; }
-.cm-s-visual-studio-2012.CodeMirror .cm-tag { color: #800000; }
-.cm-s-visual-studio-2012.CodeMirror .cm-attribute { color: red; }
-.cm-s-visual-studio-2012.CodeMirror .cm-property { color: black; }
-
diff --git a/src/themes/theme/visual-studio-ex.css b/src/themes/theme/visual-studio-ex.css
deleted file mode 100644
index c29ac520880..00000000000
--- a/src/themes/theme/visual-studio-ex.css
+++ /dev/null
@@ -1,113 +0,0 @@
-#sidebar{
-    background:#f6f6f6;
-    text-shadow:none;
-}
-
-#working-set-header,
-#open-files-container{ /* Working files */
-    background:#f0f0f0;
-}
-
-#project-files-header,
-#working-set-header{/* "working files" header and folder header*/
-    color:#777!important;
-}
-
-#project-dropdown-toggle:hover{ /* Open url when hover */
-    color:#555!important;
-    background:#e8e8e8;
-}
-
-.jstree-brackets li a,
-.jstree-brackets li .extension,
-.jstree-brackets li a.jstree-clicked, /* Files, folder and extensions */
-#open-files-container li a,
-#open-files-container li .extension,
-#open-files-container li a.jstree-clicked{ /* Files, folder and extensions in "working fiels"*/
-    color:#222!important;
-}
-
-.sidebar-selection{ /* Selected file or folder */
-    background:#cccedb;
-}
-
-.sidebar-selection-triangle{ /* ^ the cool arrow */
-    background:transparent;
-}
-
-.sidebar-selection-triangle.triangle-visible::before{
-    border-left:12px solid #cccedb;
-}
-
-#main-toolbar{ /* Toolbar to the right */
-    background:#f6f6f6;
-}
-
-#status-bar{ /* Bottom status bar */
-    background:#f6f6f6;
-    border-top:1px solid #d4d4d4;
-}
-
-#status-indicators,
-#status-info{ /* Status bar text */
-    background:transparent;
-}
-
-.CodeMirror-scroll{
-    background-color: #fefefe;
-    color:black;
-}
-
-.CodeMirror .CodeMirror-lines pre{
-    z-index: 3;
-}
-
-.CodeMirror .CodeMirror-gutters{
-    background-color: #fefefe;
-}
-
-.CodeMirror .CodeMirror-linenumber{
-    color: #0E97A1;
-    background-color: #fefefe;
-}
-
-.CodeMirror .CodeMirror-matchingbracket{
-    color: black;
-    background-color: #dedede;
-}
-
-.CodeMirror .CodeMirror-linebackground{
-    outline: 2px solid #dddddd;
-      z-index: 3;
-}
-
-
-.CodeMirror span.cm-atom { color: blue; }
-.CodeMirror span.cm-qualifier, .CodeMirror span.cm-builtin { color: #800000; }
-
-.CodeMirror span.cm-keyword { color: blue; }
-.CodeMirror span.cm-comment { color: green; }
-.CodeMirror span.cm-string {color: #800000;}
-.CodeMirror span.cm-string-2 {color: #800000;}
-.CodeMirror span.cm-variable { color: black; }
-.CodeMirror span.cm-variable-2 { color: black; }
-.CodeMirror span.cm-tag { color: #800000; }
-.CodeMirror span.cm-attribute { color: red; }
-.CodeMirror span.cm-property { color: black; }
-
-.CodeMirror span.cm-matchhighlight{
-      background-color: yellow;
-}
-
-.CodeMirror .CodeMirror-selectedtext{
-      background-color: #ADD6FF;
-}
-
-.CodeMirror .CodeMirror-selected{
-      background: transparent;
-}
-
-.CodeMirror-focused .CodeMirror-selected{
-      background: transparent;
-}
-
diff --git a/src/themes/theme/visual-studio.css b/src/themes/theme/visual-studio.css
deleted file mode 100644
index 35c90e1ae10..00000000000
--- a/src/themes/theme/visual-studio.css
+++ /dev/null
@@ -1,72 +0,0 @@
-.cm-s-visual-studio.CodeMirror
-{
-    background-color: #fefefe;
-    color:black;
-}
-
-.cm-s-visual-studio.CodeMirror .CodeMirror-gutters
-{
-    background-color: #fefefe;
-}
-
-.cm-s-visual-studio.CodeMirror .CodeMirror-linenumber
-{
-    color: #0E97A1;
-    background-color: #fefefe;
-}
-
-.cm-s-visual-studio.CodeMirror .CodeMirror-matchingbracket
-{
-    color: black;
-    background-color: #dedede;
-}
-
-.cm-s-visual-studio.CodeMirror .CodeMirror-linebackground
-{
-    outline: 2px solid #dddddd;
-}
-
-.cm-s-visual-studio .CodeMirror-activeline-background,
-.cm-s-visual-studio .CodeMirror-activeline .CodeMirror-gutter-elt
-{
-    background: transparent !important;
-}
-
-.cm-s-visual-studio .CodeMirror-activeline-background
-{
-    outline: 2px solid #dddddd;
-}
-
-.cm-s-visual-studio.CodeMirror .cm-matchhighlight
-{
-    background-color: yellow;
-}
-
-.cm-s-visual-studio.CodeMirror .CodeMirror-selectedtext
-{
-    background-color: #ADD6FF;
-}
-
-.cm-s-visual-studio.CodeMirror .CodeMirror-selected,
-.cm-s-visual-studio.CodeMirror-focused .CodeMirror-selected
-{
-    background: transparent;
-}
-
-
-.cm-s-visual-studio.CodeMirror .cm-atom { color: blue; }
-.cm-s-visual-studio.CodeMirror .cm-qualifier { color: #800000; }
-
-/*CodeMirror does not add notation for css...  Which would be really nice. */
-/*.cm-s-visual-studio.CodeMirror .cm-property { color: red; }*/
-
-.cm-s-visual-studio.CodeMirror .cm-keyword { color: blue; }
-.cm-s-visual-studio.CodeMirror .cm-comment { color: green; }
-.cm-s-visual-studio.CodeMirror .cm-string {color: #800000;}
-.cm-s-visual-studio.CodeMirror .cm-string-2 {color: #800000;}
-.cm-s-visual-studio.CodeMirror .cm-variable { color: black; }
-.cm-s-visual-studio.CodeMirror .cm-variable-2 { color: black; }
-.cm-s-visual-studio.CodeMirror .cm-tag { color: #800000; }
-.cm-s-visual-studio.CodeMirror .cm-attribute { color: red; }
-.cm-s-visual-studio.CodeMirror .cm-property { color: black; }
-
diff --git a/src/themes/theme/zamiere.css b/src/themes/theme/zamiere.css
deleted file mode 100644
index bfebf479331..00000000000
--- a/src/themes/theme/zamiere.css
+++ /dev/null
@@ -1,120 +0,0 @@
-.panel {
-  background:#3C3F41;
-}
-
-#status-bar,
-#status-indicators {
-  background:#242424;
-  color:#ccc;
-}
-
-#status-info {
-  color:#ccc;
-}
-
-#open-files-container,
-#working-set-header,
-#project-files-header {
-  color:#aaa;
-  background:#565A5D;
-}
-
-.jstree-brackets li.jstree-closed > a,
-.jstree-brackets li.jstree-open > a {
-  color:#ccc;
-}
-
-#open-files-container .extension,
-.jstree-brackets li .extension {
-  color:#aaa;
-}
-
-.cm-s-zamiere.CodeMirror {
-  background-color:#202020;
-  color:#fff;
-}
-
-.cm-s-zamiere.CodeMirror div.CodeMirror-cursor {
-  border-left:1px solid #f8f8f0;
-  z-index:3;
-}
-
-.cm-s-zamiere .CodeMirror-selected {
-  background:#3d3d3d;
-  opacity:.5;
-}
-
-.cm-s-zamiere .cm-keyword    {color:#FFCC33;}
-.cm-s-zamiere .cm-atom       {color:#99CC66;}
-.cm-s-zamiere .cm-number     {color:#99CC66;}
-.cm-s-zamiere .cm-def        {color:#A9D158;}
-.cm-s-zamiere .cm-variable   {color:#34A2D9;}
-.cm-s-zamiere .cm-variable-2 {color:#3399CC;}
-.cm-s-zamiere .cm-property   {color:#DAD6CD;}
-.cm-s-zamiere .cm-operator   {color:#FFCC33;}
-.cm-s-zamiere .cm-comment    {color:#747166;}
-.cm-s-zamiere .cm-string     {color:#A9D158;}
-.cm-s-zamiere .cm-string-2   {color:#A9D158;}
-.cm-s-zamiere .cm-meta       {color:#FFCC33;}
-.cm-s-zamiere .cm-qualifier  {color:#FFCC33;}
-.cm-s-zamiere .cm-bracket    {color:#FFFFFF;}
-.cm-s-zamiere .cm-tag        {color:#FFCC33;}
-.cm-s-zamiere .cm-attribute  {color:#FFCC33;}
-
-.cm-s-zamiere.CodeMirror span.CodeMirror-matchingbracket {
-  color:#00CCFF;
-  text-shadow:0 0 3px #00CCFF;
-}
-
-.cm-s-zamiere .cm-matchhighlight {
-  box-shadow:0 0 5px #00CCFF;
-  background-color: #00CCFF;
-  color: black;
-  border-radius:2px;
-}
-
-.cm-s-zamiere .CodeMirror-searching {
-  color:#000;
-}
-
-.cm-s-zamiere .cm-matchhighlight:not(.CodeMirror-selectedtext) {
-  background-color: rgba(0, 204, 255, 0.4);
-  box-shadow:0 0 5px #00CCFF;
-  color:#ccc;
-  border-radius:2px;
-}
-
-.cm-s-zamiere .CodeMirror-activeline-background {
-  background:hsla(0,0%,0%,0.5)!important;
-  margin:-1px -10px;
-}
-
-.cm-s-zamiere div.CodeMirror-gutter {
-  color:#ccc;
-}
-
-.cm-s-zamiere div.CodeMirror-gutters {
-  background-color:#101010;
-  box-shadow:0 0 10px hsla(0,0%,0%,.8);
-  padding:0 15px 20px 10px;
-  border-right:0;
-}
-
-.cm-s-zamiere span.CodeMirror-widget {
-  margin:-3px 0px;
-  display:inline-block;
-}
-.cm-s-zamiere span.CodeMirror-foldmarker {
-  display:inline-table;
-  background:#ccc;
-  border:0;
-  color:#000;
-  border-radius:3px;
-  font-size:20px;
-  margin:3px;
-  padding:0px 5px;
-  height:15px;
-  line-height:15px;
-  overflow:hidden;
-  white-space:nowrap;
-}

From a1dea7ea24a5126818237fa7926678f12bf04591 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 23 Apr 2014 21:59:33 -0400
Subject: [PATCH 06/96] Cleaned up extra white spaces

---
 src/themes/Settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/Settings.js b/src/themes/Settings.js
index 786ebd621a2..4763419f63c 100644
--- a/src/themes/Settings.js
+++ b/src/themes/Settings.js
@@ -10,7 +10,7 @@
 define(function (require) {
     "use strict";
 
-    var _                       = require("thirdparty/lodash"),
+    var _                   = require("thirdparty/lodash"),
         PreferencesManager  = require("preferences/PreferencesManager"),
         DefaultSettings     = require("themes/DefaultSettings"),
         SettingsDialog      = require("themes/views/settings"),

From 6f1df7a807e4cf97d0c5c26e3b6f4d7fea0d463a Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 23 Apr 2014 22:10:32 -0400
Subject: [PATCH 07/96] Adjusted comments to follow convention

---
 src/command/Commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/command/Commands.js b/src/command/Commands.js
index 05369553148..5a1fb6c3d6e 100644
--- a/src/command/Commands.js
+++ b/src/command/Commands.js
@@ -109,7 +109,7 @@ define(function (require, exports, module) {
     exports.SORT_WORKINGSET_BY_NAME     = "view.sortWorkingSetByName";  // WorkingSetSort.js            _handleSortWorkingSetByName()
     exports.SORT_WORKINGSET_BY_TYPE     = "view.sortWorkingSetByType";  // WorkingSetSort.js            _handleSortWorkingSetByType()
     exports.SORT_WORKINGSET_AUTO        = "view.sortWorkingSetAuto";    // WorkingSetSort.js            _handleAutomaticSort()
-    exports.THEMES                      = "view.themes";                // themes
+    exports.THEMES                      = "view.themes";                // MenuCommands.js              Settings.open()
     
     // NAVIGATE
     exports.NAVIGATE_NEXT_DOC           = "navigate.nextDoc";           // DocumentCommandHandlers.js   handleGoNextDoc()

From 361d715b92bf1e2de78c4de2fd20821d882ef254 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 23 Apr 2014 22:18:53 -0400
Subject: [PATCH 08/96] Adding CMD_THEMES to nls strings.js

---
 src/nls/root/strings.js    | 1 +
 src/themes/MenuCommands.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index 538a9d62735..1929040449d 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -330,6 +330,7 @@ define({
     "CMD_SORT_WORKINGSET_BY_NAME"         : "Sort by Name",
     "CMD_SORT_WORKINGSET_BY_TYPE"         : "Sort by Type",
     "CMD_SORT_WORKINGSET_AUTO"            : "Automatic Sort",
+    "CMD_THEMES"                          : "Themes",
 
     // Navigate menu Commands
     "NAVIGATE_MENU"                       : "Navigate",
diff --git a/src/themes/MenuCommands.js b/src/themes/MenuCommands.js
index aa96ea5894c..873f710849a 100644
--- a/src/themes/MenuCommands.js
+++ b/src/themes/MenuCommands.js
@@ -12,7 +12,8 @@ define(function(require) {
     "use strict";
     var Commands       = require("command/Commands"),
         CommandManager = require("command/CommandManager"),
+        Strings        = require("strings"),
         Settings       = require("themes/Settings");
 
-    CommandManager.register("Themes", Commands.THEMES, Settings.open);
+    CommandManager.register(Strings.CMD_THEMES, Commands.THEMES, Settings.open);
 });

From 7a8997f0dd8ed21f42a6da89d251b8500218ed9b Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 25 Apr 2014 22:24:25 -0400
Subject: [PATCH 09/96] Checking support to load themes as extensions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This works by checking if the “theme” field exists in the package.json
to determine if the extension ought to be treated as a theme or not.
---
 src/extensibility/ExtensionManager.js | 19 ++++++++++++++++++-
 src/themes/ThemeManager.js            | 14 +++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js
index 48def018d63..b41d2660e94 100644
--- a/src/extensibility/ExtensionManager.js
+++ b/src/extensibility/ExtensionManager.js
@@ -46,7 +46,8 @@ define(function (require, exports, module) {
         ExtensionLoader  = require("utils/ExtensionLoader"),
         FileSystem       = require("filesystem/FileSystem"),
         Strings          = require("strings"),
-        StringUtils      = require("utils/StringUtils");
+        StringUtils      = require("utils/StringUtils"),
+        ThemeManager     = require("themes/ThemeManager");
     
     // semver.browser is an AMD-compatible module
     var semver = require("extensibility/node/node_modules/semver/semver.browser");
@@ -132,6 +133,21 @@ define(function (require, exports, module) {
 
         $(exports).triggerHandler("registryUpdate", [id]);
     }
+    
+    
+    /**
+     * @private
+     * Verifies if an extension is a theme based on the presence of the field "theme"
+     * in the package.json.  If it is a theme, then the theme file is just loaded by the
+     * ThemeManager
+     */
+    function loadTheme(id) {
+        var extension = extensions[id];
+        if ( extension.installInfo && extension.installInfo.metadata && extension.installInfo.metadata.theme ) {
+            ThemeManager.loadFile(extension.installInfo.path + "/" + extension.installInfo.metadata.theme);
+        }    
+    }
+    
 
     /**
      * @private
@@ -245,6 +261,7 @@ define(function (require, exports, module) {
                 status: (e.type === "loadFailed" ? START_FAILED : ENABLED)
             };
             synchronizeEntry(id);
+            loadTheme(id);
             $(exports).triggerHandler("statusChange", [id]);
         }
         
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index c9d3b3e9402..9e72cdb1e4d 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -73,13 +73,6 @@ define(function (require, exports, module) {
     };
 
 
-    /**
-    * Loads a theme from a package
-    */
-    ThemeManager.loadPackage = function() {
-    };
-
-
     /**
     * Loads a theme from a file. fileName is the full path to the file
     */
@@ -91,6 +84,13 @@ define(function (require, exports, module) {
             if ( exists ) {
                 var theme = new Theme(file);
                 deferred.resolve((ThemeManager.themes[theme.name] = theme));
+
+                // For themes that are loaded after ThemeManager has been loaded,
+                // we should check if it the theme in the selected array so that
+                // we can determine if we need to trigger a refresh
+                if ( ThemeManager.selected.indexOf(theme.name) !== -1 ) {
+                    ThemeManager.refresh(true);
+                }
             }
             else if ( err ) {
                 deferred.reject(err);

From 285600616a9cfa2710dbef15c7d0b2ae343c5953 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sat, 26 Apr 2014 08:29:57 -0400
Subject: [PATCH 10/96] Refactored ExtensionLoader so that it can preload
 package.json

So that we can preemptively figure out if the extension is a theme or a
regular extension.
---
 src/extensibility/ExtensionManager.js | 27 ++------------
 src/utils/ExtensionLoader.js          | 51 +++++++++++++++++++++------
 src/utils/ExtensionUtils.js           | 29 ++++++++++++++-
 3 files changed, 70 insertions(+), 37 deletions(-)

diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js
index b41d2660e94..998f65b9f9f 100644
--- a/src/extensibility/ExtensionManager.js
+++ b/src/extensibility/ExtensionManager.js
@@ -44,6 +44,7 @@ define(function (require, exports, module) {
         Package          = require("extensibility/Package"),
         Async            = require("utils/Async"),
         ExtensionLoader  = require("utils/ExtensionLoader"),
+        ExtensionUtils   = require("utils/ExtensionUtils"),
         FileSystem       = require("filesystem/FileSystem"),
         Strings          = require("strings"),
         StringUtils      = require("utils/StringUtils"),
@@ -201,30 +202,6 @@ define(function (require, exports, module) {
         return result.promise();
     }
     
-    /**
-     * @private
-     * Loads the package.json file in the given extension folder.
-     * @param {string} folder The extension folder.
-     * @return {$.Promise} A promise object that is resolved with the parsed contents of the package.json file,
-     *     or rejected if there is no package.json or the contents are not valid JSON.
-     */
-    function _loadPackageJson(folder) {
-        var file = FileSystem.getFileForPath(folder + "/package.json"),
-            result = new $.Deferred();
-        FileUtils.readAsText(file)
-            .done(function (text) {
-                try {
-                    var json = JSON.parse(text);
-                    result.resolve(json);
-                } catch (e) {
-                    result.reject();
-                }
-            })
-            .fail(function () {
-                result.reject();
-            });
-        return result.promise();
-    }
     
     /**
      * @private
@@ -265,7 +242,7 @@ define(function (require, exports, module) {
             $(exports).triggerHandler("statusChange", [id]);
         }
         
-        _loadPackageJson(path)
+        ExtensionUtils.loadPackageJson(path)
             .done(function (metadata) {
                 setData(metadata.name, metadata);
             })
diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js
index 0d87c93be1d..9c6ee8a1c88 100644
--- a/src/utils/ExtensionLoader.js
+++ b/src/utils/ExtensionLoader.js
@@ -39,11 +39,12 @@ define(function (require, exports, module) {
 
     require("utils/Global");
 
-    var _           = require("thirdparty/lodash"),
-        FileSystem  = require("filesystem/FileSystem"),
-        FileUtils   = require("file/FileUtils"),
-        Async       = require("utils/Async"),
-        UrlParams   = require("utils/UrlParams").UrlParams;
+    var _              = require("thirdparty/lodash"),
+        FileSystem     = require("filesystem/FileSystem"),
+        FileUtils      = require("file/FileUtils"),
+        Async          = require("utils/Async"),
+        ExtensionUtils = require("utils/ExtensionUtils"),
+        UrlParams      = require("utils/UrlParams").UrlParams;
 
     // default async initExtension timeout
     var INIT_EXTENSION_TIMEOUT = 10000;
@@ -142,7 +143,7 @@ define(function (require, exports, module) {
     }
     
     /**
-     * Loads the extension that lives at baseUrl into its own Require.js context
+     * Loads the extension that lives at baseUrl
      *
      * @param {!string} name, used to identify the extension
      * @param {!{baseUrl: string}} config object with baseUrl property containing absolute path of extension
@@ -152,6 +153,38 @@ define(function (require, exports, module) {
      *              (Note: if extension contains a JS syntax error, promise is resolved not rejected).
      */
     function loadExtension(name, config, entryPoint) {
+        var promise = new $.Deferred();
+
+        // Try to load the package.json to figure out if we are loading a theme.
+        ExtensionUtils.loadPackageJson(config.baseUrl).always(promise.resolve);
+
+        return promise
+            .then(function(metadata) {
+                // No special handling for themes... Let the promise propagate into the ExtensionManager
+                if (metadata && "theme" in metadata) {
+                    return;
+                }
+
+                return loadExtensionModule(name, config, entryPoint);
+            })
+            .then(function () {
+                $(exports).triggerHandler("load", config.baseUrl);
+            }, function (err) {
+                $(exports).triggerHandler("loadFailed", config.baseUrl);
+            });
+    }
+    
+    /**
+     * Loads the extension module that lives at baseUrl into its own Require.js context
+     *
+     * @param {!string} name, used to identify the extension
+     * @param {!{baseUrl: string}} config object with baseUrl property containing absolute path of extension
+     * @param {!string} entryPoint, name of the main js file to load
+     * @return {!$.Promise} A promise object that is resolved when the extension is loaded, or rejected
+     *              if the extension fails to load or throws an exception immediately when loaded.
+     *              (Note: if extension contains a JS syntax error, promise is resolved not rejected).
+     */
+    function loadExtensionModule(name, config, entryPoint) {
         var extensionConfig = {
             context: name,
             baseUrl: config.baseUrl,
@@ -211,12 +244,8 @@ define(function (require, exports, module) {
                 // This type has a useful stack (exception thrown by ext code or info on bad getModule() call)
                 console.log(err.stack);
             }
-        }).then(function () {
-            $(exports).triggerHandler("load", config.baseUrl);
-        }, function (err) {
-            $(exports).triggerHandler("loadFailed", config.baseUrl);
         });
-        
+
         return promise;
     }
 
diff --git a/src/utils/ExtensionUtils.js b/src/utils/ExtensionUtils.js
index c3f7eb02c24..015bba99088 100644
--- a/src/utils/ExtensionUtils.js
+++ b/src/utils/ExtensionUtils.js
@@ -31,7 +31,8 @@
 define(function (require, exports, module) {
     "use strict";
     
-    var FileSystem = require("filesystem/FileSystem");
+    var FileSystem = require("filesystem/FileSystem"),
+        FileUtils  = require("file/FileUtils");
 
     /**
      * Appends a <style> tag to the document's head.
@@ -217,6 +218,31 @@ define(function (require, exports, module) {
         return result.promise();
     }
     
+    /**
+     * Loads the package.json file in the given extension folder.
+     *
+     * @param {string} folder The extension folder.
+     * @return {$.Promise} A promise object that is resolved with the parsed contents of the package.json file,
+     *     or rejected if there is no package.json or the contents are not valid JSON.
+     */
+    function loadPackageJson(folder) {
+        var file = FileSystem.getFileForPath(folder + "/package.json"),
+            result = new $.Deferred();
+        FileUtils.readAsText(file)
+            .done(function (text) {
+                try {
+                    var json = JSON.parse(text);
+                    result.resolve(json);
+                } catch (e) {
+                    result.reject();
+                }
+            })
+            .fail(function () {
+                result.reject();
+            });
+        return result.promise();
+    }
+    
     exports.addEmbeddedStyleSheet = addEmbeddedStyleSheet;
     exports.addLinkedStyleSheet   = addLinkedStyleSheet;
     exports.parseLessCode         = parseLessCode;
@@ -224,4 +250,5 @@ define(function (require, exports, module) {
     exports.getModuleUrl          = getModuleUrl;
     exports.loadFile              = loadFile;
     exports.loadStyleSheet        = loadStyleSheet;
+    exports.loadPackageJson       = loadPackageJson;
 });

From b0df2fcec924625ca78b28b7673a79862c0e4500 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sat, 26 Apr 2014 08:45:27 -0400
Subject: [PATCH 11/96] Removed logic to load CodeMirror themes automatically

---
 src/themes/ThemeManager.js | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index 9e72cdb1e4d..24c952cf755 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -193,31 +193,21 @@ define(function (require, exports, module) {
 
 
     function init() {
-        if ( init._ready ) {
-            return init._ready;
-        }
-
-        init._ready = $.when(Settings.ready, CodeMirrorAddons.ready).done(function() {
+        return $.when(Settings.ready, CodeMirrorAddons.ready).done(function() {
             // Very first thing is the font settings need to be setup
             fontSettings(Settings);
             fontCommandsManager.init();
 
-            ThemeManager.selected = Settings.getValue("theme");
             ThemeManager.docMode = "";
             ThemeManager.themes = {};
+            ThemeManager.selected = Settings.getValue("theme");
+            ThemeManager.refresh(true);
+            themeSettings.themes(ThemeManager.themes);
 
-            // Load files in the configured directories
-            $.when.apply((void 0), _.map(Settings.getValue("paths"), function(path) {
-                return ThemeManager.loadDirectory(path.path);
-            }))
-            .done(function() {
-                ThemeManager.refresh(true);
-                themeSettings.themes(ThemeManager.themes);
-
-                $(EditorManager).on("activeEditorChange", function() {
+            $(EditorManager)
+                .on("activeEditorChange", function() {
                     ThemeManager.refresh();
                 });
-            });
 
             $(Settings)
                 .on("change:theme", function(evt, theme) {
@@ -237,8 +227,6 @@ define(function (require, exports, module) {
                 }
             });
         });
-
-        return init._ready;
     }
 
 

From 1c64c1aa4da26dcb3c694e28a02b507f3764a6bd Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 27 Apr 2014 17:33:44 -0400
Subject: [PATCH 12/96] themes settings css and html files to their styles and
 htmlContent corresponding folders.

---
 .../views/general.html => htmlContent/themes-general.html}    | 0
 .../views/settings.html => htmlContent/themes-settings.html}  | 0
 .../views/settings.css => styles/brackets_theme_settings.css} | 0
 src/themes/ThemeManager.js                                    | 4 ++--
 src/themes/views/settings.js                                  | 4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/{themes/views/general.html => htmlContent/themes-general.html} (100%)
 rename src/{themes/views/settings.html => htmlContent/themes-settings.html} (100%)
 rename src/{themes/views/settings.css => styles/brackets_theme_settings.css} (100%)

diff --git a/src/themes/views/general.html b/src/htmlContent/themes-general.html
similarity index 100%
rename from src/themes/views/general.html
rename to src/htmlContent/themes-general.html
diff --git a/src/themes/views/settings.html b/src/htmlContent/themes-settings.html
similarity index 100%
rename from src/themes/views/settings.html
rename to src/htmlContent/themes-settings.html
diff --git a/src/themes/views/settings.css b/src/styles/brackets_theme_settings.css
similarity index 100%
rename from src/themes/views/settings.css
rename to src/styles/brackets_theme_settings.css
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index 24c952cf755..4d7f8aa073c 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -30,8 +30,8 @@ define(function (require, exports, module) {
 
     // Load up reset.css to override brackground settings from brackets because
     // they make the themes look really bad.
-    ExtensionUtils.loadStyleSheet(module, "reset.css");
-    ExtensionUtils.loadStyleSheet(module, "views/settings.css");
+    ExtensionUtils.addLinkedStyleSheet("themes/reset.css");
+    ExtensionUtils.addLinkedStyleSheet("styles/brackets_theme_settings.css");
 
 
     /**
diff --git a/src/themes/views/settings.js b/src/themes/views/settings.js
index c16a340f5af..c25558fba27 100644
--- a/src/themes/views/settings.js
+++ b/src/themes/views/settings.js
@@ -14,8 +14,8 @@ define(function(require) {
         Dialogs = require("widgets/Dialogs"),
 
         tmpl = {
-            "settings": require("text!themes/views/settings.html"),
-            "general": require("text!themes/views/general.html")
+            "settings": require("text!htmlContent/themes-settings.html"),
+            "general": require("text!htmlContent/themes-general.html")
         };
 
     var _themes;

From a572d22faa30d43e2842054061dc9ad241d6f425 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 27 Apr 2014 17:35:59 -0400
Subject: [PATCH 13/96] Renames settings.js to settingsmanager.js

---
 src/themes/FontCommandsManager.js              | 2 +-
 src/themes/MenuCommands.js                     | 2 +-
 src/themes/ScrollbarsApply.js                  | 2 +-
 src/themes/{Settings.js => SettingsManager.js} | 0
 src/themes/ThemeManager.js                     | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/themes/{Settings.js => SettingsManager.js} (100%)

diff --git a/src/themes/FontCommandsManager.js b/src/themes/FontCommandsManager.js
index ad1f2f0417e..869dc4dc6ee 100644
--- a/src/themes/FontCommandsManager.js
+++ b/src/themes/FontCommandsManager.js
@@ -11,7 +11,7 @@
 define(function (require) {
     "use strict";
 
-    var Settings            = require("themes/Settings"),
+    var Settings            = require("themes/SettingsManager"),
         DefaultSettings     = require("themes/DefaultSettings"),
         ViewCommandHandlers = require("view/ViewCommandHandlers"),
         PreferencesManager  = require("preferences/PreferencesManager");
diff --git a/src/themes/MenuCommands.js b/src/themes/MenuCommands.js
index 873f710849a..dd7f97a5833 100644
--- a/src/themes/MenuCommands.js
+++ b/src/themes/MenuCommands.js
@@ -13,7 +13,7 @@ define(function(require) {
     var Commands       = require("command/Commands"),
         CommandManager = require("command/CommandManager"),
         Strings        = require("strings"),
-        Settings       = require("themes/Settings");
+        Settings       = require("themes/SettingsManager");
 
     CommandManager.register(Strings.CMD_THEMES, Commands.THEMES, Settings.open);
 });
diff --git a/src/themes/ScrollbarsApply.js b/src/themes/ScrollbarsApply.js
index fc9ed38e97a..365e8a3bd21 100644
--- a/src/themes/ScrollbarsApply.js
+++ b/src/themes/ScrollbarsApply.js
@@ -10,7 +10,7 @@
 define(function (require) {
     "use strict";
 
-    var Settings = require("themes/Settings");
+    var Settings = require("themes/SettingsManager");
     var $scrollbars = $("<style id='scrollbars'>").appendTo("head");
     var theme;
 
diff --git a/src/themes/Settings.js b/src/themes/SettingsManager.js
similarity index 100%
rename from src/themes/Settings.js
rename to src/themes/SettingsManager.js
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index 4d7f8aa073c..1c638104e90 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -17,7 +17,7 @@ define(function (require, exports, module) {
         EditorManager       = require("editor/EditorManager"),
         FileSystem          = require("filesystem/FileSystem"),
         ExtensionUtils      = require("utils/ExtensionUtils"),
-        Settings            = require("themes/Settings"),
+        Settings            = require("themes/SettingsManager"),
         Theme               = require("themes/Theme"),
         themeSettings       = require("themes/views/settings"),
         themeFiles          = require("themes/ThemeFiles"),

From e68c3ec173a3c03c0775b090b16eebbf2dc4751a Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 27 Apr 2014 17:37:53 -0400
Subject: [PATCH 14/96] Moved views/settings to ThemeSettingsDialog

---
 src/themes/SettingsManager.js                            | 2 +-
 src/themes/ThemeManager.js                               | 2 +-
 src/themes/{views/settings.js => ThemeSettingsDialog.js} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/themes/{views/settings.js => ThemeSettingsDialog.js} (100%)

diff --git a/src/themes/SettingsManager.js b/src/themes/SettingsManager.js
index 4763419f63c..07534d92646 100644
--- a/src/themes/SettingsManager.js
+++ b/src/themes/SettingsManager.js
@@ -13,7 +13,7 @@ define(function (require) {
     var _                   = require("thirdparty/lodash"),
         PreferencesManager  = require("preferences/PreferencesManager"),
         DefaultSettings     = require("themes/DefaultSettings"),
-        SettingsDialog      = require("themes/views/settings"),
+        SettingsDialog      = require("themes/ThemeSettingsDialog"),
         PREFERENCES_KEY     = "brackets-themes",
         _settings           = PreferencesManager.getExtensionPrefs(PREFERENCES_KEY);
 
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index 1c638104e90..ff9bdf7c11a 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -19,7 +19,7 @@ define(function (require, exports, module) {
         ExtensionUtils      = require("utils/ExtensionUtils"),
         Settings            = require("themes/SettingsManager"),
         Theme               = require("themes/Theme"),
-        themeSettings       = require("themes/views/settings"),
+        themeSettings       = require("themes/ThemeSettingsDialog"),
         themeFiles          = require("themes/ThemeFiles"),
         themeApply          = require("themes/ThemeApply"),
         scrollbarsApply     = require("themes/ScrollbarsApply"),
diff --git a/src/themes/views/settings.js b/src/themes/ThemeSettingsDialog.js
similarity index 100%
rename from src/themes/views/settings.js
rename to src/themes/ThemeSettingsDialog.js

From 43b5abb1131069543dd5cd248b06d2b12eec11e5 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 27 Apr 2014 17:41:09 -0400
Subject: [PATCH 15/96] Removed paths from settings.  That's ole stuff from
 themes extension

---
 src/themes/DefaultSettings.js | 8 +-------
 src/themes/SettingsManager.js | 5 -----
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/themes/DefaultSettings.js b/src/themes/DefaultSettings.js
index 4c12bbd3809..9f1ce099a22 100644
--- a/src/themes/DefaultSettings.js
+++ b/src/themes/DefaultSettings.js
@@ -12,18 +12,12 @@ define(function(require) {
     "use strict";
 
     var FileUtils = require("file/FileUtils");
-    var cm_path   = FileUtils.getNativeBracketsDirectoryPath() + "/thirdparty/CodeMirror2";
 
     return {
         "fontSize": 12,
         "lineHeight": '1.3em',
         "fontType": "'SourceCodePro-Medium', ＭＳ ゴシック, 'MS Gothic', monospace",
         "customScrollbars": true,
-        "theme": ["default"],
-        "paths": [
-            {path:require.toUrl("./") + "../../themes"},
-            {path:require.toUrl("./theme/")},
-            {path:cm_path + "/theme"}
-        ]
+        "theme": ["default"]
     };
 });
diff --git a/src/themes/SettingsManager.js b/src/themes/SettingsManager.js
index 07534d92646..b7b1cb8f88e 100644
--- a/src/themes/SettingsManager.js
+++ b/src/themes/SettingsManager.js
@@ -51,7 +51,6 @@ define(function (require) {
     };
 
     Settings.reset = function() {
-        Settings.setValue("paths", DefaultSettings.paths);
         Settings.setValue("theme",  DefaultSettings.theme);
         Settings.setValue("fontSize", DefaultSettings.fontSize + "px");
         Settings.setValue("lineHeight", DefaultSettings.lineHeight);
@@ -62,10 +61,6 @@ define(function (require) {
 
     function init() {
         return PreferencesManager.ready.then(function() {
-            if ( Settings.getValue("paths") === (void 0) ) {
-                Settings.setValue("paths", DefaultSettings.paths);
-            }
-
             if ( Settings.getValue("theme") === (void 0) ) {
                 Settings.setValue("theme",  DefaultSettings.theme);
             }

From 92ac3592080a66140afa4fb0d2921a35ff2ddc31 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 27 Apr 2014 17:46:28 -0400
Subject: [PATCH 16/96] Changed (void 0) checks to undefined.

---
 src/themes/SettingsManager.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/themes/SettingsManager.js b/src/themes/SettingsManager.js
index b7b1cb8f88e..c52b5e4899e 100644
--- a/src/themes/SettingsManager.js
+++ b/src/themes/SettingsManager.js
@@ -61,23 +61,23 @@ define(function (require) {
 
     function init() {
         return PreferencesManager.ready.then(function() {
-            if ( Settings.getValue("theme") === (void 0) ) {
+            if ( Settings.getValue("theme") === undefined ) {
                 Settings.setValue("theme",  DefaultSettings.theme);
             }
 
-            if ( Settings.getValue("fontSize") === (void 0) ) {
+            if ( Settings.getValue("fontSize") === undefined ) {
                 Settings.setValue("fontSize", DefaultSettings.fontSize + "px");
             }
 
-            if ( Settings.getValue("lineHeight") === (void 0) ) {
+            if ( Settings.getValue("lineHeight") === undefined ) {
                 Settings.setValue("lineHeight", DefaultSettings.lineHeight);
             }
 
-            if ( Settings.getValue("fontType") === (void 0) ) {
+            if ( Settings.getValue("fontType") === undefined ) {
                 Settings.setValue("fontType", DefaultSettings.fontType);
             }
 
-            if ( Settings.getValue("customScrollbars") === (void 0) ) {
+            if ( Settings.getValue("customScrollbars") === undefined ) {
                 Settings.setValue("customScrollbars", DefaultSettings.customScrollbars);
             }
 

From bc7054fc4ebd2d9a1c557d1d47165d45c1b50a09 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 27 Apr 2014 17:59:49 -0400
Subject: [PATCH 17/96] Removed obsolete files

---
 src/themes/README.md    | 87 -----------------------------------------
 src/themes/package.json | 16 --------
 2 files changed, 103 deletions(-)
 delete mode 100644 src/themes/README.md
 delete mode 100644 src/themes/package.json

diff --git a/src/themes/README.md b/src/themes/README.md
deleted file mode 100644
index 7153822d32e..00000000000
--- a/src/themes/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-Brackets-Themes
-===============
-
-Set CodeMirror and Custom themes in Brackets.
-
-
-Features
-===============
-
-* Automatic loading of CodeMirror's themes shipped with Brackets.
-* Enjoy a variety of <i>custom</i> themes created by other users like yourself! For <i>custom</i> themes 101 primer, please read below.
-* Configure font size and font type.
-* Disable scrollbars defined in themes.  Good if you just want to use the default scrollbars.
-* Support for LESS files!
-* Auto reload themes upon saving changes made to theme files.
-* Configure custom folders to load themes from.  This is good if you want to have a folder to hold your custom themes that you want to persist after Brackets/Themes updates.
-
-
-Screenshot
-===============
-<b>Visual Studio theme</b>
-![Visual Studio theme](https://raw.github.com/wiki/MiguelCastillo/Brackets-Themes/images/VisualStudio.png)
-
-<b>Monokai Dark Soda custom theme by @simpleshadow.</b>
-![Monokai Dark Soda theme](https://raw.github.com/wiki/MiguelCastillo/Brackets-Themes/images/MonokaiDarkSoda.png)
-
-Custom themes 101 guide
-===============
-
-Custom themes are codemirror's themes, so you will need to be familiar with codemirror's theme guidelines.  I provide a set of steps to get you started below, but for more details please navigate to http://codemirror.net/doc/manual.html and search for "theme".
-<br><br>
-Codemirror's themes are css files.  Important requirement is that the file name has to match your css class definition.  E.g. If your theme file is called "default", then your primary css class name needs to be "default".  Codemirror's guidelines require that the actual css class name starts with ".cm-s-", so your fully qualified css class name will be ".cm-s-default".
-<br><br>
-To get you started, you could use the already existing custom theme "default.css".  Let's do the following.
-<br>
-- Open the custom theme directory.  Navigate to your themes manager directory (extensions directory/themes) and you will find custom themes in the "theme" directory.  Brackets provides a quick way of accessing your extensions directory... Help > Show Extensions Folder.
-- Copy and paste the file "default.css" and rename it to "my-theme.css".
-- Open "my-theme.css" and replace "default" with "my-theme", which should end up looking like ".cm-s-my-theme".  You will also have a second class ".CodeMirror", just leave it there and the net result will look like ".cm-s-my-theme.CodeMirror".
-- In "my-theme.css", change "background-color: #F8F8F8;" to "backgound-color: red;".
-- Relaunch brackets, open a JavaScript file and you should see the document with a red background.
-<br><br>
-For details on what can be customized, please navigate to http://codemirror.net/doc/manual.html and search for "Customized Styling".  As you will notice, the documentation isn't exhautive but they suggest you use "codemirror.css" as a reference.  Give it a try, it is pretty straight forward.
-<br><br>
-If you have a cool theme you created and want to share, please send it my way and I will gladly add it to the custom themes.
-
-
-FAQ
-===============
-
-* Why disabling/enabling the scrollbars don't always take effect?
-  - This due to the fact that CodeMirror builds "fake" scrollbars that only get created when the document is loaded.  So toggling the scrollbars with the document open might not take effect as expected.  To get around this behavior, reopen the document or restart Brackets.
-
-
-How to
-===============
-
-* Install... Open Brackets then copy and paste https://github.com/MiguelCastillo/Brackets-Themes into File->Install Extension.  You don't need to restart Brackets.
-* Set a theme?  Find the Themes menu and make a selection.
-![Themes Menu](https://raw.github.com/wiki/MiguelCastillo/Brackets-Themes/images/SetTheme.png)
-
-Credit
-==============
-Corey Gwin: Monokai Dark Soda<br>
-Kulcsár Kázmér: Zamiere<br>
-Diego Alvarez: Aquaman<br>
-Felipe K. de Mello: Dracula<br>
-Fernando Hurtado: Nando<br>
-Jordan Hess: Pixie<br>
-John Hamm: Hammsidian<br>
-Christopher Kelly (scriptmunkee) for additions to reset.cs<br>
-
-
-Links
-===============
-Brackets? Right here... http://brackets.io/ <br>
-Brackets github? Right here... https://github.com/adobe/brackets
-
-
-Contact me
-===============
-
-If you have any issues or want to just drop in a line, you can use my personal email at manchagnu@gmail.com
-
-License
-===============
-
-Licensed under MIT
diff --git a/src/themes/package.json b/src/themes/package.json
deleted file mode 100644
index 906677c8fe9..00000000000
--- a/src/themes/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "title": "Themes",
-    "name": "themes",
-    "description": "CodeMirror and custom themes in Brackets",
-    "version": "0.7.7",
-    "author": "Miguel Castillo",
-    "email": "mahchagnu@gmail.com",
-    "homepage": "https://github.com/MiguelCastillo/Brackets-Themes",
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/MiguelCastillo/Brackets-Themes.git"
-    },
-    "engines": {
-    "brackets": ">=0.38.0"
-  }
-}

From 767c9e53164476b1aff2104f30886cb45b5986f7 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 27 Apr 2014 18:09:01 -0400
Subject: [PATCH 18/96] Change exports.THEMES to
 exports.CMD_THEMES_SETTINGS_OPEN

---
 src/command/Commands.js     | 2 +-
 src/command/DefaultMenus.js | 2 +-
 src/themes/MenuCommands.js  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/command/Commands.js b/src/command/Commands.js
index 40913537550..c310ec6f1c1 100644
--- a/src/command/Commands.js
+++ b/src/command/Commands.js
@@ -118,6 +118,7 @@ define(function (require, exports, module) {
     exports.CMD_REPLACE                 = "cmd.replace";                // FindReplace.js               _replace()
     
     // VIEW
+    exports.CMD_THEMES_SETTINGS_OPEN    = "view.themesSettingOpen";     // MenuCommands.js              Settings.open()
     exports.VIEW_HIDE_SIDEBAR           = "view.hideSidebar";           // SidebarView.js               toggle()
     exports.VIEW_INCREASE_FONT_SIZE     = "view.increaseFontSize";      // ViewCommandHandlers.js       _handleIncreaseFontSize()
     exports.VIEW_DECREASE_FONT_SIZE     = "view.decreaseFontSize";      // ViewCommandHandlers.js       _handleDecreaseFontSize()
@@ -132,7 +133,6 @@ define(function (require, exports, module) {
     exports.SORT_WORKINGSET_BY_NAME     = "view.sortWorkingSetByName";  // WorkingSetSort.js            _handleSortWorkingSetByName()
     exports.SORT_WORKINGSET_BY_TYPE     = "view.sortWorkingSetByType";  // WorkingSetSort.js            _handleSortWorkingSetByType()
     exports.SORT_WORKINGSET_AUTO        = "view.sortWorkingSetAuto";    // WorkingSetSort.js            _handleAutomaticSort()
-    exports.THEMES                      = "view.themes";                // MenuCommands.js              Settings.open()
     
     // NAVIGATE
     exports.NAVIGATE_NEXT_DOC           = "navigate.nextDoc";           // DocumentCommandHandlers.js   handleGoNextDoc()
diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js
index d2d123b8953..0d3872114d3 100644
--- a/src/command/DefaultMenus.js
+++ b/src/command/DefaultMenus.js
@@ -116,7 +116,7 @@ define(function (require, exports, module) {
          * View menu
          */
         menu = Menus.addMenu(Strings.VIEW_MENU, Menus.AppMenuBar.VIEW_MENU);
-        menu.addMenuItem(Commands.THEMES);
+        menu.addMenuItem(Commands.CMD_THEMES_SETTINGS_OPEN);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.VIEW_HIDE_SIDEBAR);
         menu.addMenuDivider();
diff --git a/src/themes/MenuCommands.js b/src/themes/MenuCommands.js
index dd7f97a5833..58157bff414 100644
--- a/src/themes/MenuCommands.js
+++ b/src/themes/MenuCommands.js
@@ -15,5 +15,5 @@ define(function(require) {
         Strings        = require("strings"),
         Settings       = require("themes/SettingsManager");
 
-    CommandManager.register(Strings.CMD_THEMES, Commands.THEMES, Settings.open);
+    CommandManager.register(Strings.CMD_THEMES, Commands.CMD_THEMES_SETTINGS_OPEN, Settings.open);
 });

From 5c6f83bfa948e8770c9dbb08dd424ef6fd61365e Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 27 Apr 2014 18:14:43 -0400
Subject: [PATCH 19/96] Renamed view export from CMD_THEMES_SETTINGS_OPEN to
 CMD_THEMES_OPEN_SETTINGS

---
 src/command/Commands.js     | 2 +-
 src/command/DefaultMenus.js | 2 +-
 src/themes/MenuCommands.js  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/command/Commands.js b/src/command/Commands.js
index c310ec6f1c1..8952623433b 100644
--- a/src/command/Commands.js
+++ b/src/command/Commands.js
@@ -118,7 +118,7 @@ define(function (require, exports, module) {
     exports.CMD_REPLACE                 = "cmd.replace";                // FindReplace.js               _replace()
     
     // VIEW
-    exports.CMD_THEMES_SETTINGS_OPEN    = "view.themesSettingOpen";     // MenuCommands.js              Settings.open()
+    exports.CMD_THEMES_OPEN_SETTINGS    = "view.themesOpenSetting";     // MenuCommands.js              Settings.open()
     exports.VIEW_HIDE_SIDEBAR           = "view.hideSidebar";           // SidebarView.js               toggle()
     exports.VIEW_INCREASE_FONT_SIZE     = "view.increaseFontSize";      // ViewCommandHandlers.js       _handleIncreaseFontSize()
     exports.VIEW_DECREASE_FONT_SIZE     = "view.decreaseFontSize";      // ViewCommandHandlers.js       _handleDecreaseFontSize()
diff --git a/src/command/DefaultMenus.js b/src/command/DefaultMenus.js
index 0d3872114d3..81e5ae58c05 100644
--- a/src/command/DefaultMenus.js
+++ b/src/command/DefaultMenus.js
@@ -116,7 +116,7 @@ define(function (require, exports, module) {
          * View menu
          */
         menu = Menus.addMenu(Strings.VIEW_MENU, Menus.AppMenuBar.VIEW_MENU);
-        menu.addMenuItem(Commands.CMD_THEMES_SETTINGS_OPEN);
+        menu.addMenuItem(Commands.CMD_THEMES_OPEN_SETTINGS);
         menu.addMenuDivider();
         menu.addMenuItem(Commands.VIEW_HIDE_SIDEBAR);
         menu.addMenuDivider();
diff --git a/src/themes/MenuCommands.js b/src/themes/MenuCommands.js
index 58157bff414..68de212b8f8 100644
--- a/src/themes/MenuCommands.js
+++ b/src/themes/MenuCommands.js
@@ -15,5 +15,5 @@ define(function(require) {
         Strings        = require("strings"),
         Settings       = require("themes/SettingsManager");
 
-    CommandManager.register(Strings.CMD_THEMES, Commands.CMD_THEMES_SETTINGS_OPEN, Settings.open);
+    CommandManager.register(Strings.CMD_THEMES, Commands.CMD_THEMES_OPEN_SETTINGS, Settings.open);
 });

From d83bf29571fbfd74bd2e3ad3af19f21732c06666 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Tue, 6 May 2014 19:53:17 -0400
Subject: [PATCH 20/96] Removing license file as its no longer needed due to
 CLA

---
 src/themes/LICENSE | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 src/themes/LICENSE

diff --git a/src/themes/LICENSE b/src/themes/LICENSE
deleted file mode 100644
index d84ea80dbf0..00000000000
--- a/src/themes/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
- Copyright (c) 2014 Miguel Castillo.
-
- Licensed under MIT
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.

From 0854441ef202daf3101ac86409fac5ffa599e566 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 17:38:02 -0400
Subject: [PATCH 21/96] Enabling the use of the package title to be the primary
 source of the theme name

---
 src/extensibility/ExtensionManager.js | 2 +-
 src/themes/Theme.js                   | 4 ++--
 src/themes/ThemeManager.js            | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js
index 998f65b9f9f..89a6ec9c078 100644
--- a/src/extensibility/ExtensionManager.js
+++ b/src/extensibility/ExtensionManager.js
@@ -145,7 +145,7 @@ define(function (require, exports, module) {
     function loadTheme(id) {
         var extension = extensions[id];
         if ( extension.installInfo && extension.installInfo.metadata && extension.installInfo.metadata.theme ) {
-            ThemeManager.loadFile(extension.installInfo.path + "/" + extension.installInfo.metadata.theme);
+            ThemeManager.loadPackage(extension.installInfo);
         }    
     }
     
diff --git a/src/themes/Theme.js b/src/themes/Theme.js
index 3174dc41d92..bd78a27c690 100644
--- a/src/themes/Theme.js
+++ b/src/themes/Theme.js
@@ -24,12 +24,12 @@ define(function () {
     *
     * @constructor
     */
-    function Theme(file) {
+    function Theme(file, displayName) {
         var _self     = this,
             fileName  = file.name;
 
         _self.file        = file;
-        _self.displayName = toDisplayName(fileName);
+        _self.displayName = displayName || toDisplayName(fileName);
         _self.name        = fileName.substring(0, fileName.lastIndexOf('.'));
         _self.className   = "theme-" + _self.name;
     }
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index ff9bdf7c11a..e892d9fc0e5 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -101,6 +101,15 @@ define(function (require, exports, module) {
     };
 
 
+    /**
+    * Loads a theme from a file. fileName is the full path to the file
+    */
+    ThemeManager.loadPackage = function(themePackage) {
+        var fileName = themePackage.path + "/" + themePackage.metadata.theme;
+        return ThemeManager.loadFile(fileName, themePackage.metadata.title);
+    };
+
+
     /**
     * Load css/less files from a directory to be treated as themes
     */

From f9d29dbd8d39838ec3dcafc9189f592a4d342f86 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 19:54:43 -0400
Subject: [PATCH 22/96] Big refactor to make use of definePreference and rely
 on its change events

---
 src/htmlContent/themes-general.html |  6 +-
 src/themes/DefaultSettings.js       |  2 +-
 src/themes/FontCommandsManager.js   | 14 ++---
 src/themes/FontSettings.js          | 21 +++----
 src/themes/MenuCommands.js          |  2 +-
 src/themes/ScrollbarsApply.js       |  2 +-
 src/themes/SettingsManager.js       | 86 +++++++++++++++--------------
 src/themes/ThemeManager.js          | 74 +++++++++++--------------
 src/themes/ThemeSettingsDialog.js   | 28 +++++-----
 9 files changed, 113 insertions(+), 122 deletions(-)

diff --git a/src/htmlContent/themes-general.html b/src/htmlContent/themes-general.html
index 6e46d17ff19..655cd7a6b55 100644
--- a/src/htmlContent/themes-general.html
+++ b/src/htmlContent/themes-general.html
@@ -3,9 +3,9 @@
         <label class="control-label">Current theme:</label>
         <div class="controls">
             <select>
-            {{#themes}}
-                <option style="text-align:left;" value="{{displayName}}" data-target="theme" theme-id="{{name}}">{{displayName}}</option>
-            {{/themes}}
+                {{#themes}}
+                <option style="text-align:left;" value="{{name}}" data-target="themes">{{displayName}}</option>
+                {{/themes}}
             </select>
         </div>
     </div>
diff --git a/src/themes/DefaultSettings.js b/src/themes/DefaultSettings.js
index 9f1ce099a22..2637c692140 100644
--- a/src/themes/DefaultSettings.js
+++ b/src/themes/DefaultSettings.js
@@ -18,6 +18,6 @@ define(function(require) {
         "lineHeight": '1.3em',
         "fontType": "'SourceCodePro-Medium', ＭＳ ゴシック, 'MS Gothic', monospace",
         "customScrollbars": true,
-        "theme": ["default"]
+        "themes": ["default"]
     };
 });
diff --git a/src/themes/FontCommandsManager.js b/src/themes/FontCommandsManager.js
index 869dc4dc6ee..b8272fc23e5 100644
--- a/src/themes/FontCommandsManager.js
+++ b/src/themes/FontCommandsManager.js
@@ -16,16 +16,12 @@ define(function (require) {
         ViewCommandHandlers = require("view/ViewCommandHandlers"),
         PreferencesManager  = require("preferences/PreferencesManager");
 
-    function ViewCommandsManager () {
-        $(ViewCommandHandlers).on("fontSizeChange", updateThemeFontSize);
-        $(Settings).on("change:fontSize", updateBracketsFontSize);
-        updateBracketsFontSize();
-    }
 
     function updateThemeFontSize (evt, adjustment, fontSize /*, lineHeight*/) {
         Settings.setValue("fontSize", fontSize);
     }
 
+
     function updateBracketsFontSize() {
         var fontSize = Settings.getValue("fontSize"),
             fontSizeNumeric = Number(fontSize.replace(/px|em/, "")),
@@ -37,8 +33,8 @@ define(function (require) {
         }
     }
 
-    // Let's make sure we use Themes fonts by default
-    return {
-        init: ViewCommandsManager
-    };
+
+    $(ViewCommandHandlers).on("fontSizeChange", updateThemeFontSize);
+    $(Settings).on("change:fontSize", updateBracketsFontSize);
+    updateBracketsFontSize();
 });
diff --git a/src/themes/FontSettings.js b/src/themes/FontSettings.js
index 17c023f7f17..3ad3233146e 100644
--- a/src/themes/FontSettings.js
+++ b/src/themes/FontSettings.js
@@ -8,23 +8,18 @@
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
 /*global $, define, require */
 
-define(function () {
+define(function (require) {
     "use strict";
 
+    var Settings = require("themes/SettingsManager");
+
+
     var $lineHeight = $("<style type='text/css' id='lineHeight'>").appendTo("head"),
         $fontSize = $("<style type='text/css' id='fontSize'>").appendTo("head"),
         $fontType = $("<style type='text/css' id='fontType'>").appendTo("head");
 
-    var Settings = null;
-
 
-    function FontSettings(_settings) {
-        Settings = _settings;
-        $(Settings).on("change:lineHeight", FontSettings.updateLineHeight);
-        $(Settings).on("change:fontSize", FontSettings.updateFontSize);
-        $(Settings).on("change:fontType", FontSettings.updateFontType);
-        FontSettings.update();
-    }
+    var FontSettings = {};
 
 
     FontSettings.updateLineHeight = function () {
@@ -61,5 +56,11 @@ define(function () {
         $("#codemirror-dynamic-fonts").remove();
     }
 
+
+    $(Settings).on("change:lineHeight", FontSettings.updateLineHeight);
+    $(Settings).on("change:fontSize", FontSettings.updateFontSize);
+    $(Settings).on("change:fontType", FontSettings.updateFontType);
+    FontSettings.update();
+
     return FontSettings;
 });
diff --git a/src/themes/MenuCommands.js b/src/themes/MenuCommands.js
index 68de212b8f8..bdb8bf3b2bb 100644
--- a/src/themes/MenuCommands.js
+++ b/src/themes/MenuCommands.js
@@ -15,5 +15,5 @@ define(function(require) {
         Strings        = require("strings"),
         Settings       = require("themes/SettingsManager");
 
-    CommandManager.register(Strings.CMD_THEMES, Commands.CMD_THEMES_OPEN_SETTINGS, Settings.open);
+    CommandManager.register(Strings.CMD_THEMES, Commands.CMD_THEMES_OPEN_SETTINGS, Settings.showDialog);
 });
diff --git a/src/themes/ScrollbarsApply.js b/src/themes/ScrollbarsApply.js
index 365e8a3bd21..5bc5d145955 100644
--- a/src/themes/ScrollbarsApply.js
+++ b/src/themes/ScrollbarsApply.js
@@ -21,7 +21,7 @@ define(function (require) {
 
 
     scrollbarsApply.update = function(themeManager) {
-        theme = themeManager ? themeManager.getThemes()[0] : (theme || {});
+        theme = (themeManager && themeManager.getThemes()[0]) || theme || {};
         if ( Settings.getValue("customScrollbars") ) {
             var scrollbar = (theme.scrollbar || []).join(" ");
             $scrollbars.text(scrollbar || "");
diff --git a/src/themes/SettingsManager.js b/src/themes/SettingsManager.js
index c52b5e4899e..36759dea777 100644
--- a/src/themes/SettingsManager.js
+++ b/src/themes/SettingsManager.js
@@ -12,46 +12,40 @@ define(function (require) {
 
     var _                   = require("thirdparty/lodash"),
         PreferencesManager  = require("preferences/PreferencesManager"),
+        PreferencesImpl     = require("preferences/PreferencesImpl"),
         DefaultSettings     = require("themes/DefaultSettings"),
         SettingsDialog      = require("themes/ThemeSettingsDialog"),
-        PREFERENCES_KEY     = "brackets-themes",
-        _settings           = PreferencesManager.getExtensionPrefs(PREFERENCES_KEY);
+        prefs               = PreferencesManager.getExtensionPrefs("brackets-themes");
 
+    var Settings = {};
 
-    function Settings() {
-    }
 
-    Settings.open = function() {
-        SettingsDialog.open(Settings);
+    Settings.showDialog = function() {
+        SettingsDialog.show(Settings);
     };
 
-    Settings.close = function() {
-        SettingsDialog.close();
-    };
 
     Settings.getValue = function() {
-        return _settings.get.apply(_settings, arguments);
+        return prefs.get.apply(prefs, arguments);
     };
 
+
     Settings.setValue = function() {
-        _settings.set.apply(_settings, arguments);
-        $(Settings).trigger("change", arguments);
-        $(Settings).trigger("change:" + arguments[0], [arguments[1]]);
+        prefs.set.apply(prefs, arguments);
+        prefs.save();
+        _triggerEvent(arguments[0]);
     };
 
-    Settings.getAll = function() {
-        var pathLength = _settings.prefix.length;
-        var prefix = _settings.prefix;
 
-        return _.transform(_settings.base._scopes.user.data, function(result, value, key) {
-            if ( key.indexOf(prefix) === 0 ) {
-                result[key.substr(pathLength)] = value;
-            }
+    Settings.getAll = function() {
+        return _.transform(arguments, function(result, value, key) {
+            result[value] = prefs.get(value);
         });
     };
 
+
     Settings.reset = function() {
-        Settings.setValue("theme",  DefaultSettings.theme);
+        Settings.setValue("themes",  DefaultSettings.themes);
         Settings.setValue("fontSize", DefaultSettings.fontSize + "px");
         Settings.setValue("lineHeight", DefaultSettings.lineHeight);
         Settings.setValue("fontType", DefaultSettings.fontType);
@@ -59,33 +53,41 @@ define(function (require) {
     };
 
 
-    function init() {
-        return PreferencesManager.ready.then(function() {
-            if ( Settings.getValue("theme") === undefined ) {
-                Settings.setValue("theme",  DefaultSettings.theme);
-            }
+    function _triggerEvent(item) {
+        var data = prefs.get(item);
+        $(Settings).trigger("change", data);
+        $(Settings).trigger("change:" + item, [data]);
+    }
+    
+
+    // Expose it so that other settings manager can trigger events as well
+    Settings._triggerEvent = _triggerEvent;
 
-            if ( Settings.getValue("fontSize") === undefined ) {
-                Settings.setValue("fontSize", DefaultSettings.fontSize + "px");
-            }
 
-            if ( Settings.getValue("lineHeight") === undefined ) {
-                Settings.setValue("lineHeight", DefaultSettings.lineHeight);
-            }
+    prefs.definePreference("themes", "array", DefaultSettings.themes)
+        .on("change", function() {
+            _triggerEvent("themes");
+        });
 
-            if ( Settings.getValue("fontType") === undefined ) {
-                Settings.setValue("fontType", DefaultSettings.fontType);
-            }
+    prefs.definePreference("fontSize", "string", DefaultSettings.fontSize + "px")
+        .on("change", function() {
+            _triggerEvent("fontSize");
+        });
 
-            if ( Settings.getValue("customScrollbars") === undefined ) {
-                Settings.setValue("customScrollbars", DefaultSettings.customScrollbars);
-            }
+    prefs.definePreference("lineHeight", "string", DefaultSettings.lineHeight)
+        .on("change", function() {
+            _triggerEvent("lineHeight");
+        });
 
-            return Settings;
-        }).promise();
-    }
+    prefs.definePreference("fontType", "string", DefaultSettings.fontType)
+        .on("change", function() {
+            _triggerEvent("fontType");
+        });
 
+    prefs.definePreference("customScrollbars", "boolean", DefaultSettings.customScrollbars)
+        .on("change", function() {
+            _triggerEvent("customScrollbars");
+        });
 
-    Settings.ready = init();
     return Settings;
 });
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index e892d9fc0e5..ee98881f120 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -12,6 +12,8 @@ define(function (require, exports, module) {
     "use strict";
 
     require("themes/MenuCommands");
+    require("themes/FontSettings");
+    require("themes/FontCommandsManager");
 
     var _                   = require("thirdparty/lodash"),
         EditorManager       = require("editor/EditorManager"),
@@ -22,10 +24,7 @@ define(function (require, exports, module) {
         themeSettings       = require("themes/ThemeSettingsDialog"),
         themeFiles          = require("themes/ThemeFiles"),
         themeApply          = require("themes/ThemeApply"),
-        scrollbarsApply     = require("themes/ScrollbarsApply"),
-        fontSettings        = require("themes/FontSettings"),
-        fontCommandsManager = require("themes/FontCommandsManager"),
-        CodeMirrorAddons    = require("themes/CodeMirrorAddons");
+        scrollbarsApply     = require("themes/ScrollbarsApply");
 
 
     // Load up reset.css to override brackground settings from brackets because
@@ -52,7 +51,7 @@ define(function (require, exports, module) {
 
         if ( force === true ) {
             loadThemes(ThemeManager.getThemes(), force === true).done(function() {
-                setDocumentTheme(Settings.getValue("theme"));
+                setDocumentTheme(Settings.getValue("themes"));
                 scrollbarsApply(ThemeManager);
 
                 if ( cm ) {
@@ -67,7 +66,7 @@ define(function (require, exports, module) {
     * Returns all current theme objects
     */
     ThemeManager.getThemes = function() {
-        return _.map(Settings.getValue("theme").slice(0), function (item) {
+        return _.map(Settings.getValue("themes").slice(0), function (item) {
             return ThemeManager.themes[item];
         });
     };
@@ -76,14 +75,16 @@ define(function (require, exports, module) {
     /**
     * Loads a theme from a file. fileName is the full path to the file
     */
-    ThemeManager.loadFile = function(fileName) {
+    ThemeManager.loadFile = function(fileName, displayName) {
         var deferred = new $.Deferred();
         var file = FileSystem.getFileForPath (fileName);
 
         file.exists(function( err, exists ) {
             if ( exists ) {
-                var theme = new Theme(file);
+                var theme = new Theme(file, displayName);
                 deferred.resolve((ThemeManager.themes[theme.name] = theme));
+                themeSettings.setThemes(ThemeManager.themes);
+
 
                 // For themes that are loaded after ThemeManager has been loaded,
                 // we should check if it the theme in the selected array so that
@@ -131,7 +132,7 @@ define(function (require, exports, module) {
             return ThemeManager.loadFile(themes.path + "/" + themeFile);
         });
 
-        return $.when.apply((void 0), deferred);
+        return $.when.apply(undefined, deferred);
     }
 
 
@@ -173,7 +174,7 @@ define(function (require, exports, module) {
             }
         });
 
-        return $.when.apply((void 0), pending);
+        return $.when.apply(undefined, pending);
     }
 
 
@@ -201,49 +202,40 @@ define(function (require, exports, module) {
     }
 
 
-    function init() {
-        return $.when(Settings.ready, CodeMirrorAddons.ready).done(function() {
-            // Very first thing is the font settings need to be setup
-            fontSettings(Settings);
-            fontCommandsManager.init();
+    ThemeManager.docMode = "";
+    ThemeManager.themes = {};
+    ThemeManager.selected = Settings.getValue("themes");
 
-            ThemeManager.docMode = "";
-            ThemeManager.themes = {};
-            ThemeManager.selected = Settings.getValue("theme");
-            ThemeManager.refresh(true);
-            themeSettings.themes(ThemeManager.themes);
 
-            $(EditorManager)
-                .on("activeEditorChange", function() {
-                    ThemeManager.refresh();
-                });
+    $(EditorManager)
+        .on("activeEditorChange", function() {
+            ThemeManager.refresh(true);
+        });
 
-            $(Settings)
-                .on("change:theme", function(evt, theme) {
-                    setDocumentTheme(theme);
-                    ThemeManager.refresh(true);
-                })
-                .on("change:fontSize", function() {
-                    ThemeManager.refresh();
-                });
+    $(Settings)
+        .on("change:themes", function(evt, themes) {
+            setDocumentTheme(themes);
+            ThemeManager.refresh(true);
+        })
+        .on("change:fontSize", function() {
+            ThemeManager.refresh();
+        });
 
-            FileSystem.on("change", function(evt, file) {
-                var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
-                    theme = ThemeManager.themes[name];
+    FileSystem
+        .on("change", function(evt, file) {
+            var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
+                theme = ThemeManager.themes[name];
 
-                if ( theme && theme.getFile().parentPath === file.parentPath ) {
-                    ThemeManager.refresh(true);
-                }
-            });
+            if ( theme && theme.getFile().parentPath === file.parentPath ) {
+                ThemeManager.refresh(true);
+            }
         });
-    }
 
 
     //
     // Exposed API
     //
     return {
-        ready: init(),
         refresh: ThemeManager.refresh,
         loadFile: ThemeManager.loadFile,
         loadPackage: ThemeManager.loadPackage,
diff --git a/src/themes/ThemeSettingsDialog.js b/src/themes/ThemeSettingsDialog.js
index c25558fba27..4c8d4982322 100644
--- a/src/themes/ThemeSettingsDialog.js
+++ b/src/themes/ThemeSettingsDialog.js
@@ -25,20 +25,21 @@ define(function(require) {
     $("#generalSettings", $settings).html(tmpl.general);
 
 
-    function open(settings) {
-        var themes = _.map(_themes, function(theme) {return theme;});
-        var currentSettings = settings.getAll();
+    function show(settings) {
+        var currentSettings = settings.getAll("themes", "fontSize", "fontType", "lineHeight", "customScrollbars");
         var newSettings     = {};
-        var template = $("<div>").append($settings).html();
-        var $template = $(Mustache.render(template, {"settings": currentSettings, "themes": themes}));
+        var themes          = _.map(_themes, function(theme) {return theme;});
+        var template        = $("<div>").append($settings).html();
+        var $template       = $(Mustache.render(template, {"settings": currentSettings, "themes": themes}));
 
         $template
             .find("[data-toggle=tab].default")
             .tab("show");
 
         // Select the correct theme by default.
-        $template.find("[theme-id='" + currentSettings.theme[0] + "']").attr("selected", "selected");
-
+        $template
+            .find("[theme-id='" + currentSettings.themes[0] + "']")
+            .attr("selected", "selected");
 
         $template
             .on("change", "[data-target]:checkbox", function() {
@@ -51,11 +52,11 @@ define(function(require) {
                 var attr = $target.attr("data-target");
                 newSettings[attr] = $target.val();
             })
-            .change("select", function() {
+            .on("change", function() {
                 var $target = $(":selected", this);
                 var attr = $target.attr("data-target");
                 if ( attr ) {
-                    settings.setValue( "theme", [$target.attr("theme-id")] );
+                    settings.setValue( attr, [$target.val()] );
                 }
             });
 
@@ -69,16 +70,15 @@ define(function(require) {
             }
         });
     }
-
-
+    
+    
     function setThemes(themes) {
         _themes = themes;
     }
 
 
     return {
-        open: open,
-        themes: setThemes
+        setThemes: setThemes,
+        show: show
     };
 });
-

From d55254fdd55bf3b04e10bec57103a9aa7e3d8091 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 20:21:52 -0400
Subject: [PATCH 23/96] Reading text files with FileUtils.readAsText

---
 src/themes/Theme.js | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/themes/Theme.js b/src/themes/Theme.js
index bd78a27c690..5985a8c0dcb 100644
--- a/src/themes/Theme.js
+++ b/src/themes/Theme.js
@@ -11,6 +11,7 @@ define(function () {
     "use strict";
 
     var FileSystem     = require("filesystem/FileSystem"),
+        FileUtils      = require("file/FileUtils"),
         ExtensionUtils = require("utils/ExtensionUtils");
 
     var commentRegex = /\/\*([\s\S]*?)\*\//mg,
@@ -51,7 +52,7 @@ define(function () {
             $(theme.css).remove();
         }
 
-        return readFile(this.getFile())
+        return FileUtils.readAsText(this.getFile())
             .then(function(content) {
                 var result = extractScrollbars(content);
                 theme.scrollbar = result.scrollbar;
@@ -87,27 +88,6 @@ define(function () {
     }
 
 
-    function readFile(file) {
-        var deferred = $.Deferred();
-
-        try {
-            file.read(function( err, content /*, stat*/ ) {
-                if ( err ) {
-                    deferred.reject(err);
-                    return;
-                }
-
-                deferred.resolve(content);
-            });
-        }
-        catch(ex) {
-            deferred.reject(false);
-        }
-
-        return deferred.promise();
-    }
-
-
     function extractScrollbars(content) {
         var scrollbar = [];
 

From f68692635c5b7c772ceb4a0e8875d0f159fb7bf9 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 20:22:15 -0400
Subject: [PATCH 24/96] Change to use FileUtils.getFileExtension

---
 src/themes/ThemeFiles.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/themes/ThemeFiles.js b/src/themes/ThemeFiles.js
index 8158ed6cee5..43c41c4867f 100644
--- a/src/themes/ThemeFiles.js
+++ b/src/themes/ThemeFiles.js
@@ -10,8 +10,8 @@
 define(function(require) {
     "use strict";
 
-
-    var FileSystem  = require("filesystem/FileSystem");
+    var FileSystem = require("filesystem/FileSystem"),
+        FileUtils  = require("file/FileUtils");
 
     // Root directory for CodeMirror themes
     var validExtensions = ["css", "less"];
@@ -36,7 +36,7 @@ define(function(require) {
             entries = entries || [];
 
             for (i = 0; i < entries.length; i++) {
-                if (entries[i].isFile && validExtensions.indexOf(getExtension(entries[i].name)) !== -1) {
+                if (isValid(entries[i])) {
                     files.push(entries[i].name);
                 }
             }
@@ -74,13 +74,13 @@ define(function(require) {
             }
         }
 
-        return $.when.apply((void 0), directories).promise();
+        return $.when.apply(undefined, directories).promise();
     }
 
 
-    function getExtension(file) {
-        var lastIndexOf = file.lastIndexOf(".") + 1;
-        return file.substr(lastIndexOf);
+    function isValid(file) {
+        return file.isFile &&
+            validExtensions.indexOf(FileUtils.getFileExtension(file.name)) !== -1;
     }
 
 

From 02515b1145cc07e30a6774fc92aebf8e83082b59 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 21:07:04 -0400
Subject: [PATCH 25/96] Exposing theme change event and loadDirectory interface

---
 src/themes/ThemeApply.js   | 1 -
 src/themes/ThemeManager.js | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/themes/ThemeApply.js b/src/themes/ThemeApply.js
index b44466cb965..eb16f11ec62 100644
--- a/src/themes/ThemeApply.js
+++ b/src/themes/ThemeApply.js
@@ -28,7 +28,6 @@ define(function(require) {
         // Setup current and further documents to get the new theme...
         CodeMirror.defaults.theme = newThemes;
         cm.setOption("theme", newThemes);
-        $(ExtensionUtils).trigger("Themes.themeChanged", themeManager.getThemes());
     }
 
     return ThemeApply;
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index ee98881f120..1b7e9ca4015 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -216,6 +216,9 @@ define(function (require, exports, module) {
         .on("change:themes", function(evt, themes) {
             setDocumentTheme(themes);
             ThemeManager.refresh(true);
+
+            // Expose event for theme changes
+            $(ThemeManager).trigger("change:themes", themeManager.getThemes());
         })
         .on("change:fontSize", function() {
             ThemeManager.refresh();
@@ -239,6 +242,7 @@ define(function (require, exports, module) {
         refresh: ThemeManager.refresh,
         loadFile: ThemeManager.loadFile,
         loadPackage: ThemeManager.loadPackage,
+        loadDirectory: ThemeManager.loadDirectory,
         getThemes: ThemeManager.getThemes
     };
 

From e037fc05628a64997ead4460fa4bc94846efdbdb Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 21:31:05 -0400
Subject: [PATCH 26/96] Moved CodeMirrorAddons from themes to a global module
 that brackets uses

---
 src/brackets.js                | 14 ++--------
 src/themes/CodeMirrorAddons.js | 40 ---------------------------
 src/utils/CodeMirrorAddons.js  | 50 ++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 src/themes/CodeMirrorAddons.js
 create mode 100644 src/utils/CodeMirrorAddons.js

diff --git a/src/brackets.js b/src/brackets.js
index a9eb72d6de3..7170b7e26da 100644
--- a/src/brackets.js
+++ b/src/brackets.js
@@ -45,18 +45,8 @@ define(function (require, exports, module) {
     require("thirdparty/path-utils/path-utils.min");
     require("thirdparty/smart-auto-complete-local/jquery.smart_autocomplete");
 
-    // Load CodeMirror add-ons--these attach themselves to the CodeMirror module    
-    require("thirdparty/CodeMirror2/addon/fold/xml-fold");
-    require("thirdparty/CodeMirror2/addon/edit/matchtags");
-    require("thirdparty/CodeMirror2/addon/edit/matchbrackets");
-    require("thirdparty/CodeMirror2/addon/edit/closebrackets");
-    require("thirdparty/CodeMirror2/addon/edit/closetag");
-    require("thirdparty/CodeMirror2/addon/scroll/scrollpastend");
-    require("thirdparty/CodeMirror2/addon/selection/active-line");
-    require("thirdparty/CodeMirror2/addon/mode/multiplex");
-    require("thirdparty/CodeMirror2/addon/mode/overlay");
-    require("thirdparty/CodeMirror2/addon/search/searchcursor");
-    require("thirdparty/CodeMirror2/keymap/sublime");
+    // Load CodeMirror add-ons--these attach themselves to the CodeMirror module
+    require("utils/CodeMirrorAddons");
     
     // Load dependent modules
     var Global                  = require("utils/Global"),
diff --git a/src/themes/CodeMirrorAddons.js b/src/themes/CodeMirrorAddons.js
deleted file mode 100644
index 2a24102ec23..00000000000
--- a/src/themes/CodeMirrorAddons.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
-
-define(function () {
-    "use strict";
-
-    var CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror");
-
-    function initAddons() {
-        // Set some default value for codemirror...
-        CodeMirror.defaults.highlightSelectionMatches = true;
-        CodeMirror.defaults.styleSelectedText = true;
-    }
-
-    function init() {
-        var deferred = $.Deferred();
-
-        /**
-        *  This is where is all starts to load up...
-        */
-        require([
-            "thirdparty/CodeMirror2/addon/selection/mark-selection",
-            "thirdparty/CodeMirror2/addon/search/match-highlighter"
-        ], deferred.resolve);
-
-        return deferred.done(initAddons).promise();
-    }
-
-    return {
-        ready: init()
-    };
-});
-
diff --git a/src/utils/CodeMirrorAddons.js b/src/utils/CodeMirrorAddons.js
new file mode 100644
index 00000000000..9b33277decd
--- /dev/null
+++ b/src/utils/CodeMirrorAddons.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global define, CodeMirror */
+
+define(function(require) {
+    "use strict";
+
+    var CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror");
+
+    // Load CodeMirror add-ons--these attach themselves to the CodeMirror module
+    require("thirdparty/CodeMirror2/addon/fold/xml-fold");
+    require("thirdparty/CodeMirror2/addon/edit/matchtags");
+    require("thirdparty/CodeMirror2/addon/edit/matchbrackets");
+    require("thirdparty/CodeMirror2/addon/edit/closebrackets");
+    require("thirdparty/CodeMirror2/addon/edit/closetag");
+    require("thirdparty/CodeMirror2/addon/scroll/scrollpastend");
+    require("thirdparty/CodeMirror2/addon/selection/active-line");
+    require("thirdparty/CodeMirror2/addon/selection/mark-selection");
+    require("thirdparty/CodeMirror2/addon/mode/multiplex");
+    require("thirdparty/CodeMirror2/addon/mode/overlay");
+    require("thirdparty/CodeMirror2/addon/search/searchcursor");
+    require("thirdparty/CodeMirror2/addon/search/match-highlighter");
+    require("thirdparty/CodeMirror2/keymap/sublime");
+
+    CodeMirror.defaults.highlightSelectionMatches = true;
+    CodeMirror.defaults.styleSelectedText = true;
+});

From 8ee527b08d00bfe65430845d058480deee95f0c7 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 21:49:50 -0400
Subject: [PATCH 27/96] Removed loadList to clean up the code a bit.  Also
 renamed ThemeFiles.js to FileLoader.js

---
 src/themes/{ThemeFiles.js => FileLoader.js} | 46 ++++++---------------
 src/themes/ThemeManager.js                  | 33 +++++++++------
 2 files changed, 34 insertions(+), 45 deletions(-)
 rename src/themes/{ThemeFiles.js => FileLoader.js} (61%)

diff --git a/src/themes/ThemeFiles.js b/src/themes/FileLoader.js
similarity index 61%
rename from src/themes/ThemeFiles.js
rename to src/themes/FileLoader.js
index 43c41c4867f..3c78bef5268 100644
--- a/src/themes/ThemeFiles.js
+++ b/src/themes/FileLoader.js
@@ -24,8 +24,7 @@ define(function(require) {
         var result = $.Deferred();
 
         if ( !path ) {
-            return result.resolve({
-                files: [],
+            return result.reject({
                 path: path,
                 error: "Path not defined"
             });
@@ -41,40 +40,22 @@ define(function(require) {
                 }
             }
 
-            result.resolve({
-                files: files,
-                path: path,
-                error: err
-            });
-        }
-
-        try {
-            FileSystem.getDirectoryForPath(path).getContents(readContent);
-        }
-        catch (ex) {
-            result.resolve({
-                files: [],
-                path: path,
-                error: ex.toString()
-            });
-        }
-
-        return result.promise();
-    }
-
-
-    function loadList(paths) {
-        var i, length, directories = [];
-
-        for ( i = 0, length = paths.length; i < length; i++ ) {
-            try {
-                directories.push(loadDirectory( paths[i].path ));
+            if ( err ) {
+                result.reject({
+                    path: path,
+                    error: err
+                });
             }
-            catch(ex) {
+            else {
+                result.resolve({
+                    files: files,
+                    path: path
+                });
             }
         }
 
-        return $.when.apply(undefined, directories).promise();
+        FileSystem.getDirectoryForPath(path).getContents(readContent);
+        return result.promise();
     }
 
 
@@ -85,7 +66,6 @@ define(function(require) {
 
 
     return {
-        loadList: loadList,
         loadDirectory: loadDirectory
     };
 
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index 1b7e9ca4015..9df8b2677cd 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -15,16 +15,16 @@ define(function (require, exports, module) {
     require("themes/FontSettings");
     require("themes/FontCommandsManager");
 
-    var _                   = require("thirdparty/lodash"),
-        EditorManager       = require("editor/EditorManager"),
-        FileSystem          = require("filesystem/FileSystem"),
-        ExtensionUtils      = require("utils/ExtensionUtils"),
-        Settings            = require("themes/SettingsManager"),
-        Theme               = require("themes/Theme"),
-        themeSettings       = require("themes/ThemeSettingsDialog"),
-        themeFiles          = require("themes/ThemeFiles"),
-        themeApply          = require("themes/ThemeApply"),
-        scrollbarsApply     = require("themes/ScrollbarsApply");
+    var _                = require("thirdparty/lodash"),
+        EditorManager    = require("editor/EditorManager"),
+        FileSystem       = require("filesystem/FileSystem"),
+        ExtensionUtils   = require("utils/ExtensionUtils"),
+        Settings         = require("themes/SettingsManager"),
+        Theme            = require("themes/Theme"),
+        themeSettings    = require("themes/ThemeSettingsDialog"),
+        themeApply       = require("themes/ThemeApply"),
+        scrollbarsApply  = require("themes/ScrollbarsApply"),
+        fileLoader       = require("themes/FileLoader");
 
 
     // Load up reset.css to override brackground settings from brackets because
@@ -115,7 +115,7 @@ define(function (require, exports, module) {
     * Load css/less files from a directory to be treated as themes
     */
     ThemeManager.loadDirectory = function(path) {
-        return themeFiles.loadDirectory(path).then(loadThemesFiles);
+        return fileLoader.loadDirectory(path).then(loadThemesFiles);
     };
 
 
@@ -218,7 +218,7 @@ define(function (require, exports, module) {
             ThemeManager.refresh(true);
 
             // Expose event for theme changes
-            $(ThemeManager).trigger("change:themes", themeManager.getThemes());
+            $(ThemeManager).trigger("change:themes", ThemeManager.getThemes());
         })
         .on("change:fontSize", function() {
             ThemeManager.refresh();
@@ -235,6 +235,15 @@ define(function (require, exports, module) {
         });
 
 
+    /**
+    * TODO: remove temporary code to load all themes from CodeMirror.  This is just to test
+    * the whole workflow of loading an entire directory and also to show case themes in brackets :)
+    */
+    var FileUtils = require("file/FileUtils");
+    var cm_path = FileUtils.getNativeBracketsDirectoryPath() + "/thirdparty/CodeMirror2";
+    ThemeManager.loadDirectory( cm_path + "/theme" );
+
+
     //
     // Exposed API
     //

From fe05d092e566ad17d395db21a6ad70a5f2c14292 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 21:52:12 -0400
Subject: [PATCH 28/96] Fixed issue with selected theme not properly getting
 select in the settings dialog

---
 src/themes/ThemeSettingsDialog.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/themes/ThemeSettingsDialog.js b/src/themes/ThemeSettingsDialog.js
index 4c8d4982322..9e5f421f24a 100644
--- a/src/themes/ThemeSettingsDialog.js
+++ b/src/themes/ThemeSettingsDialog.js
@@ -38,7 +38,7 @@ define(function(require) {
 
         // Select the correct theme by default.
         $template
-            .find("[theme-id='" + currentSettings.themes[0] + "']")
+            .find("[value='" + currentSettings.themes[0] + "']")
             .attr("selected", "selected");
 
         $template
@@ -70,8 +70,8 @@ define(function(require) {
             }
         });
     }
-    
-    
+
+
     function setThemes(themes) {
         _themes = themes;
     }

From f8eac8308f226ad261a0211354fe21bcddd5d1aa Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 22:41:03 -0400
Subject: [PATCH 29/96] Setting themes up so that it can support mixing themes
 if we were to enable multi select

---
 src/themes/ThemeManager.js        | 2 +-
 src/themes/ThemeSettingsDialog.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
index 9df8b2677cd..a08cdf0fc33 100644
--- a/src/themes/ThemeManager.js
+++ b/src/themes/ThemeManager.js
@@ -149,7 +149,7 @@ define(function (require, exports, module) {
         // will not render correctly.  Class names that start with a number are invalid
         newThemes = _.map(newThemes, function(theme){ return "theme-" + theme; }).join(" ");
         oldThemes = _.map(oldThemes, function(theme){ return "theme-" + theme; }).join(" ");
-        $("html").removeClass(oldThemes.replace(' ', ',')).addClass(newThemes.replace(' ', ','));
+        $("html").removeClass(oldThemes).addClass(newThemes);
     }
 
 
diff --git a/src/themes/ThemeSettingsDialog.js b/src/themes/ThemeSettingsDialog.js
index 9e5f421f24a..aa367fd6060 100644
--- a/src/themes/ThemeSettingsDialog.js
+++ b/src/themes/ThemeSettingsDialog.js
@@ -56,7 +56,8 @@ define(function(require) {
                 var $target = $(":selected", this);
                 var attr = $target.attr("data-target");
                 if ( attr ) {
-                    settings.setValue( attr, [$target.val()] );
+                    var items = $target.map(function(i, item) {return $(item).val();}).toArray();
+                    settings.setValue( attr, items );
                 }
             });
 

From 1ba4ac0e77ac6b529a733fab7e3cd21c538ad35b Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 7 May 2014 22:50:07 -0400
Subject: [PATCH 30/96] Added logic to handle correctly setting selected state
 when selecting multiple themes

---
 src/themes/ThemeSettingsDialog.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/themes/ThemeSettingsDialog.js b/src/themes/ThemeSettingsDialog.js
index aa367fd6060..a370c8ade62 100644
--- a/src/themes/ThemeSettingsDialog.js
+++ b/src/themes/ThemeSettingsDialog.js
@@ -32,15 +32,17 @@ define(function(require) {
         var template        = $("<div>").append($settings).html();
         var $template       = $(Mustache.render(template, {"settings": currentSettings, "themes": themes}));
 
+        // Select the correct theme.
+        _.each(currentSettings.themes, function(item) {
+            $template
+                .find("[value='" + item + "']")
+                .attr("selected", "selected");
+        });
+
         $template
             .find("[data-toggle=tab].default")
             .tab("show");
 
-        // Select the correct theme by default.
-        $template
-            .find("[value='" + currentSettings.themes[0] + "']")
-            .attr("selected", "selected");
-
         $template
             .on("change", "[data-target]:checkbox", function() {
                 var $target = $(this);

From 5bd2d89cf4b21aa4de93cc516063a9e2dc05555d Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 9 May 2014 15:51:55 -0400
Subject: [PATCH 31/96] Removed mark-selection add-on.  Will add this in a
 different PR.  Also removed default settings from CodeMirrorAddon.js

---
 src/utils/CodeMirrorAddons.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/utils/CodeMirrorAddons.js b/src/utils/CodeMirrorAddons.js
index 9b33277decd..f3422e73002 100644
--- a/src/utils/CodeMirrorAddons.js
+++ b/src/utils/CodeMirrorAddons.js
@@ -38,13 +38,10 @@ define(function(require) {
     require("thirdparty/CodeMirror2/addon/edit/closetag");
     require("thirdparty/CodeMirror2/addon/scroll/scrollpastend");
     require("thirdparty/CodeMirror2/addon/selection/active-line");
-    require("thirdparty/CodeMirror2/addon/selection/mark-selection");
     require("thirdparty/CodeMirror2/addon/mode/multiplex");
     require("thirdparty/CodeMirror2/addon/mode/overlay");
-    require("thirdparty/CodeMirror2/addon/search/searchcursor");
     require("thirdparty/CodeMirror2/addon/search/match-highlighter");
+    require("thirdparty/CodeMirror2/addon/search/searchcursor");
     require("thirdparty/CodeMirror2/keymap/sublime");
 
-    CodeMirror.defaults.highlightSelectionMatches = true;
-    CodeMirror.defaults.styleSelectedText = true;
 });

From e46a93d827ad17c84e54b25c8d5a307d6119a583 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 9 May 2014 15:53:14 -0400
Subject: [PATCH 32/96] Removed require CodeMirror as its no longer needed

---
 src/utils/CodeMirrorAddons.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/utils/CodeMirrorAddons.js b/src/utils/CodeMirrorAddons.js
index f3422e73002..4810d003596 100644
--- a/src/utils/CodeMirrorAddons.js
+++ b/src/utils/CodeMirrorAddons.js
@@ -28,8 +28,6 @@
 define(function(require) {
     "use strict";
 
-    var CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror");
-
     // Load CodeMirror add-ons--these attach themselves to the CodeMirror module
     require("thirdparty/CodeMirror2/addon/fold/xml-fold");
     require("thirdparty/CodeMirror2/addon/edit/matchtags");

From 768d2f040560d288c91f35265f83f423279e23df Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 9 May 2014 16:44:31 -0400
Subject: [PATCH 33/96] Added I18 string support to the dialog

---
 src/htmlContent/themes-general.html  | 10 ++---
 src/htmlContent/themes-settings.html |  6 +--
 src/nls/root/strings.js              | 61 ++++++++++++++++------------
 src/themes/ThemeSettingsDialog.js    |  3 +-
 4 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/src/htmlContent/themes-general.html b/src/htmlContent/themes-general.html
index 655cd7a6b55..adc4991573a 100644
--- a/src/htmlContent/themes-general.html
+++ b/src/htmlContent/themes-general.html
@@ -1,6 +1,6 @@
 <form class="form-horizontal">
     <div class="control-group">
-        <label class="control-label">Current theme:</label>
+        <label class="control-label">{{Strings.CURRENT_THEME}}</label>
         <div class="controls">
             <select>
                 {{#themes}}
@@ -11,7 +11,7 @@
     </div>
 
     <div class="control-group">
-        <label class="control-label">Custom Scrollbars:</label>
+        <label class="control-label">{{Strings.CUSTOM_SCROLLBARS}}</label>
         <div class="controls">
             {{#settings.customScrollbars}}
                 <input type="checkbox" data-target="customScrollbars" checked>
@@ -23,21 +23,21 @@
     </div>
 
     <div class="control-group">
-        <label class="control-label">Font size:</label>
+        <label class="control-label">{{Strings.FONT_SIZE}}</label>
         <div class="controls">
             <input type="text" data-target="fontSize" value="{{settings.fontSize}}">
         </div>
     </div>
 
     <div class="control-group">
-        <label class="control-label">Font type:</label>
+        <label class="control-label">{{Strings.FONT_FAMILY}}</label>
         <div class="controls">
             <input type="text" data-target="fontType" value="{{settings.fontType}}">
         </div>
     </div>
 
     <div class="control-group">
-        <label class="control-label">Line height:</label>
+        <label class="control-label">{{Strings.LINE_HEIGHT}}</label>
         <div class="controls">
             <input type="text" data-target="lineHeight" value="{{settings.lineHeight}}">
         </div>
diff --git a/src/htmlContent/themes-settings.html b/src/htmlContent/themes-settings.html
index 1ac4b8e1db0..b4251422eed 100644
--- a/src/htmlContent/themes-settings.html
+++ b/src/htmlContent/themes-settings.html
@@ -5,7 +5,7 @@ <h1 class="dialog-title">Themes Settings</h1>
     <div class="modal-body">
         <div class="row">
             <ul class="nav nav-pills nav-stacked span2" style="max-width: 100px;">
-                <li><a class="default" data-target="#generalSettings" data-toggle="tab">General</a></li>
+                <li><a class="default" data-target="#generalSettings" data-toggle="tab">{{Strings.GENERAL}}</a></li>
             </ul>
 
             <div class="tab-content span6">
@@ -14,7 +14,7 @@ <h1 class="dialog-title">Themes Settings</h1>
         </div>
     </div>
     <div class="modal-footer">
-        <a class="dialog-button btn cancel" data-button-id="cancel">Cancel</a>
-        <a class="dialog-button btn primary save" data-button-id="save">Save</a>
+        <a class="dialog-button btn cancel" data-button-id="cancel">{{Strings.CANCEL}}</a>
+        <a class="dialog-button btn primary save" data-button-id="save">{{Strings.DONE}}</a>
     </div>
 </div>
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index ca300ed50f9..e305384749b 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -25,7 +25,7 @@
 /*global define */
 
 define({
-    
+
     /**
      * Errors
      */
@@ -73,7 +73,7 @@ define({
     // Application error strings
     "ERROR_IN_BROWSER_TITLE"            : "Oops! {APP_NAME} doesn't run in browsers yet.",
     "ERROR_IN_BROWSER"                  : "{APP_NAME} is built in HTML, but right now it runs as a desktop app so you can use it to edit local files. Please use the application shell in the <b>github.com/adobe/brackets-shell</b> repo to run {APP_NAME}.",
-    
+
     // ProjectManager max files error string
     "ERROR_MAX_FILES_TITLE"             : "Error Indexing Files",
     "ERROR_MAX_FILES"                   : "The maximum number of files have been indexed. Actions that look up files in the index may function incorrectly.",
@@ -82,7 +82,7 @@ define({
     "ERROR_LAUNCHING_BROWSER_TITLE"     : "Error launching browser",
     "ERROR_CANT_FIND_CHROME"            : "The Google Chrome browser could not be found. Please make sure it is installed.",
     "ERROR_LAUNCHING_BROWSER"           : "An error occurred when launching the browser. (error {0})",
-    
+
     "LIVE_DEVELOPMENT_ERROR_TITLE"      : "Live Preview Error",
     "LIVE_DEVELOPMENT_RELAUNCH_TITLE"   : "Connecting to Browser",
     "LIVE_DEVELOPMENT_ERROR_MESSAGE"    : "In order for Live Preview to connect, Chrome needs to be relaunched with remote debugging enabled.<br /><br />Would you like to relaunch Chrome and enable remote debugging?",
@@ -93,7 +93,7 @@ define({
     "LIVE_DEVELOPMENT_INFO_TITLE"       : "Welcome to Live Preview!",
     "LIVE_DEVELOPMENT_INFO_MESSAGE"     : "Live Preview connects {APP_NAME} to your browser. It launches a preview of your HTML file in the browser, then updates the preview instantly as you edit your code.<br /><br />In this early version of {APP_NAME}, Live Preview only works with <strong>Google Chrome</strong> and updates live as you edit <strong>CSS or HTML files</strong>. Changes to JavaScript files are automatically reloaded when you save.<br /><br />(You'll only see this message once.)",
     "LIVE_DEVELOPMENT_TROUBLESHOOTING"  : "For more information, see <a href='{0}' title='{0}'>Troubleshooting Live Preview connection errors</a>.",
-    
+
     "LIVE_DEV_STATUS_TIP_NOT_CONNECTED" : "Live Preview",
     "LIVE_DEV_STATUS_TIP_PROGRESS1"     : "Live Preview: Connecting\u2026",
     "LIVE_DEV_STATUS_TIP_PROGRESS2"     : "Live Preview: Initializing\u2026",
@@ -105,7 +105,7 @@ define({
     "LIVE_DEV_DETACHED_TARGET_CLOSED"          : "Live Preview was cancelled because the page was closed in the browser",
     "LIVE_DEV_NAVIGATED_AWAY"                  : "Live Preview was cancelled because the browser navigated to a page that is not part of the current project",
     "LIVE_DEV_CLOSED_UNKNOWN_REASON"           : "Live Preview was cancelled for an unknown reason ({0})",
-    
+
     "SAVE_CLOSE_TITLE"                  : "Save Changes",
     "SAVE_CLOSE_MESSAGE"                : "Do you want to save the changes you made in the document <span class='dialog-filename'>{0}</span>?",
     "SAVE_CLOSE_MULTI_MESSAGE"          : "Do you want to save your changes to the following files?",
@@ -116,8 +116,9 @@ define({
     "EXT_MODIFIED_WARNING"              : "<span class='dialog-filename'>{0}</span> has been modified on disk.<br /><br />Do you want to save the file and overwrite those changes?",
     "EXT_MODIFIED_MESSAGE"              : "<span class='dialog-filename'>{0}</span> has been modified on disk, but also has unsaved changes in {APP_NAME}.<br /><br />Which version do you want to keep?",
     "EXT_DELETED_MESSAGE"               : "<span class='dialog-filename'>{0}</span> has been deleted on disk, but has unsaved changes in {APP_NAME}.<br /><br />Do you want to keep your changes?",
-    
+
     // Generic dialog/button labels
+    "DONE"                              : "Done",
     "OK"                                : "OK",
     "CANCEL"                            : "Cancel",
     "DONT_SAVE"                         : "Don't Save",
@@ -127,7 +128,7 @@ define({
     "DELETE"                            : "Delete",
     "BUTTON_YES"                        : "Yes",
     "BUTTON_NO"                         : "No",
-        
+
     // Find, Replace, Find in Files
     "FIND_RESULT_COUNT"                 : "{0} results",
     "FIND_RESULT_COUNT_SINGLE"          : "1 result",
@@ -172,7 +173,7 @@ define({
     "FIND_IN_FILES_EXPAND_COLLAPSE"     : "Ctrl/Cmd click to expand/collapse all",
     "ERROR_FETCHING_UPDATE_INFO_TITLE"  : "Error getting update info",
     "ERROR_FETCHING_UPDATE_INFO_MSG"    : "There was a problem getting the latest update information from the server. Please make sure you are connected to the internet and try again.",
-    
+
     // File exclusion filters
     "NO_FILE_FILTER"                    : "Exclude files\u2026",
     "EDIT_FILE_FILTER"                  : "Edit\u2026",
@@ -209,7 +210,7 @@ define({
     "KEYBOARD_CTRL"   : "Ctrl",
     "KEYBOARD_SHIFT"  : "Shift",
     "KEYBOARD_SPACE"  : "Space",
-    
+
     /**
      * StatusBar strings
      */
@@ -242,8 +243,8 @@ define({
     "NOTHING_TO_LINT"                       : "Nothing to lint",
     "LINTER_TIMED_OUT"                      : "{0} has timed out after waiting for {1} ms",
     "LINTER_FAILED"                         : "{0} terminated with error: {1}",
-    
-    
+
+
     /**
      * Command Name Constants
      */
@@ -301,7 +302,7 @@ define({
     "CMD_OPEN_LINE_BELOW"                 : "Open Line Below",
     "CMD_TOGGLE_CLOSE_BRACKETS"           : "Auto Close Braces",
     "CMD_SHOW_CODE_HINTS"                 : "Show Code Hints",
-    
+
     // Search menu commands
     "FIND_MENU"                           : "Find",
     "CMD_FIND"                            : "Find",
@@ -315,7 +316,7 @@ define({
     "CMD_FIND_IN_SELECTED"                : "Find in Selected File/Folder",
     "CMD_FIND_IN_SUBTREE"                 : "Find in\u2026",
     "CMD_REPLACE"                         : "Replace",
-    
+
     // View menu commands
     "VIEW_MENU"                           : "View",
     "CMD_HIDE_SIDEBAR"                    : "Hide Sidebar",
@@ -353,7 +354,7 @@ define({
     "CMD_SHOW_IN_EXPLORER"                : "Show in Explorer",
     "CMD_SHOW_IN_FINDER"                  : "Show in Finder",
     "CMD_SHOW_IN_OS"                      : "Show in OS",
-    
+
     // Help menu commands
     "HELP_MENU"                           : "Help",
     "CMD_CHECK_FOR_UPDATE"                : "Check for Updates",
@@ -394,10 +395,18 @@ define({
     "BASEURL_ERROR_HASH_DISALLOWED"        : "The base URL can't contain hashes like \"{0}\".",
     "BASEURL_ERROR_INVALID_CHAR"           : "Special characters like '{0}' must be %-encoded.",
     "BASEURL_ERROR_UNKNOWN_ERROR"          : "Unknown error parsing Base URL",
-    
+
+    // String for themes-settings.html and themes-general.html
+    "CURRENT_THEME": "Current Theme",
+    "CUSTOM_SCROLLBARS": "Custom Scrollbars",
+    "FONT_SIZE": "Font Size",
+    "FONT_FAMILY": "Font Family",
+    "LINE_HEIGHT": "Line Height",
+    "GENERAL": "General",
+
     // CSS Quick Edit
     "BUTTON_NEW_RULE"                      : "New Rule",
-    
+
     // Extension Management strings
     "INSTALL"                              : "Install",
     "UPDATE"                               : "Update",
@@ -478,14 +487,14 @@ define({
     "EXTENSIONS_INSTALLED_TITLE"           : "Installed",
     "EXTENSIONS_AVAILABLE_TITLE"           : "Available",
     "EXTENSIONS_UPDATES_TITLE"             : "Updates",
-    
+
     "INLINE_EDITOR_NO_MATCHES"             : "No matches available.",
     "CSS_QUICK_EDIT_NO_MATCHES"            : "There are no existing CSS rules that match your selection.<br> Click \"New Rule\" to create one.",
     "CSS_QUICK_EDIT_NO_STYLESHEETS"        : "There are no stylesheets in your project.<br>Create one to add CSS rules.",
 
     // Custom Viewers
     "IMAGE_VIEWER_LARGEST_ICON"            : "largest",
-    
+
     /**
      * Unit names
      */
@@ -506,20 +515,20 @@ define({
     "CMD_LOG_NODE_STATE"                        : "Log Node State to Console",
     "CMD_RESTART_NODE"                          : "Restart Node",
     "CMD_SHOW_ERRORS_IN_STATUS_BAR"             : "Show Errors in Status Bar",
-    
+
     "LANGUAGE_TITLE"                            : "Switch Language",
     "LANGUAGE_MESSAGE"                          : "Language:",
     "LANGUAGE_SUBMIT"                           : "Reload {APP_NAME}",
     "LANGUAGE_CANCEL"                           : "Cancel",
     "LANGUAGE_SYSTEM_DEFAULT"                   : "System Default",
-    
+
     // extensions/default/InlineTimingFunctionEditor
     "INLINE_TIMING_EDITOR_TIME"                 : "Time",
     "INLINE_TIMING_EDITOR_PROGRESSION"          : "Progression",
     "BEZIER_EDITOR_INFO"                        : "<kbd>↑</kbd><kbd>↓</kbd><kbd>←</kbd><kbd>→</kbd> Move selected point<br><kbd class='text'>Shift</kbd> Move by ten units<br><kbd class='text'>Tab</kbd> Switch points",
     "STEPS_EDITOR_INFO"                         : "<kbd>↑</kbd><kbd>↓</kbd> Increase or decrease steps<br><kbd>←</kbd><kbd>→</kbd> 'Start' or 'End'",
     "INLINE_TIMING_EDITOR_INVALID"              : "The old value <code>{0}</code> is not valid, so the displayed function was changed to <code>{1}</code>. The document will be updated with the first edit.",
-    
+
     // extensions/default/InlineColorEditor
     "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP"     : "Current Color",
     "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP"    : "Original Color",
@@ -528,21 +537,21 @@ define({
     "COLOR_EDITOR_HSLA_BUTTON_TIP"              : "HSLa Format",
     "COLOR_EDITOR_USED_COLOR_TIP_SINGULAR"      : "{0} (Used {1} time)",
     "COLOR_EDITOR_USED_COLOR_TIP_PLURAL"        : "{0} (Used {1} times)",
-    
+
     // extensions/default/JavaScriptCodeHints
     "CMD_JUMPTO_DEFINITION"                     : "Jump to Definition",
     "CMD_SHOW_PARAMETER_HINT"                   : "Show Parameter Hint",
     "NO_ARGUMENTS"                              : "<no parameters>",
-    
+
     // extensions/default/JSLint
     "JSLINT_NAME"                               : "JSLint",
-    
+
     // extensions/default/QuickView
     "CMD_ENABLE_QUICK_VIEW"                     : "Quick View on Hover",
-    
+
     // extensions/default/RecentProjects
     "CMD_TOGGLE_RECENT_PROJECTS"                : "Recent Projects",
-    
+
     // extensions/default/WebPlatformDocs
     "DOCS_MORE_LINK"                            : "Read more"
 });
diff --git a/src/themes/ThemeSettingsDialog.js b/src/themes/ThemeSettingsDialog.js
index a370c8ade62..6301eee2b15 100644
--- a/src/themes/ThemeSettingsDialog.js
+++ b/src/themes/ThemeSettingsDialog.js
@@ -12,6 +12,7 @@ define(function(require) {
 
     var _       = require("thirdparty/lodash"),
         Dialogs = require("widgets/Dialogs"),
+        Strings = require("strings"),
 
         tmpl = {
             "settings": require("text!htmlContent/themes-settings.html"),
@@ -30,7 +31,7 @@ define(function(require) {
         var newSettings     = {};
         var themes          = _.map(_themes, function(theme) {return theme;});
         var template        = $("<div>").append($settings).html();
-        var $template       = $(Mustache.render(template, {"settings": currentSettings, "themes": themes}));
+        var $template       = $(Mustache.render(template, {"settings": currentSettings, "themes": themes, "Strings": Strings}));
 
         // Select the correct theme.
         _.each(currentSettings.themes, function(item) {

From 2c742476daacfc91491c22ea72e8977c5eb6ecf6 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 9 May 2014 16:54:52 -0400
Subject: [PATCH 34/96] Corrected comment and some formatting in string.js

---
 src/nls/root/strings.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index e305384749b..73910d9661d 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -396,13 +396,13 @@ define({
     "BASEURL_ERROR_INVALID_CHAR"           : "Special characters like '{0}' must be %-encoded.",
     "BASEURL_ERROR_UNKNOWN_ERROR"          : "Unknown error parsing Base URL",
 
-    // String for themes-settings.html and themes-general.html
-    "CURRENT_THEME": "Current Theme",
-    "CUSTOM_SCROLLBARS": "Custom Scrollbars",
-    "FONT_SIZE": "Font Size",
-    "FONT_FAMILY": "Font Family",
-    "LINE_HEIGHT": "Line Height",
-    "GENERAL": "General",
+    // Strings for themes-settings.html and themes-general.html
+    "CURRENT_THEME"                        : "Current Theme",
+    "CUSTOM_SCROLLBARS"                    : "Custom Scrollbars",
+    "FONT_SIZE"                            : "Font Size",
+    "FONT_FAMILY"                          : "Font Family",
+    "LINE_HEIGHT"                          : "Line Height",
+    "GENERAL"                              : "General",
 
     // CSS Quick Edit
     "BUTTON_NEW_RULE"                      : "New Rule",

From 9832add0479743eda4612b51597307e742c0f1c2 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 29 May 2014 14:31:14 -0400
Subject: [PATCH 35/96] Major rewrite to move code around to be more inline
 with Brackets core code

---
 src/brackets.js                               |   2 +-
 src/extensibility/ExtensionManager.js         | 110 +++----
 src/themes/DefaultSettings.js                 |  23 --
 src/themes/FileLoader.js                      |  73 -----
 src/themes/FontCommandsManager.js             |  19 +-
 src/themes/FontSettings.js                    |  66 ----
 src/themes/MenuCommands.js                    |  19 --
 src/themes/ScrollbarsApply.js                 |  54 ----
 src/themes/SettingsManager.js                 |  93 ------
 src/themes/ThemeApply.js                      |  34 ---
 src/themes/ThemeManager.js                    | 258 ----------------
 src/utils/CodeMirrorAddons.js                 |   7 +
 src/{themes => view}/Theme.js                 |   0
 src/view/ThemeManager.js                      | 289 ++++++++++++++++++
 .../ThemeSettings.js}                         |  72 +++--
 src/view/ThemeView.js                         | 138 +++++++++
 src/view/ViewCommandHandlers.js               | 133 ++++----
 17 files changed, 622 insertions(+), 768 deletions(-)
 delete mode 100644 src/themes/DefaultSettings.js
 delete mode 100644 src/themes/FileLoader.js
 delete mode 100644 src/themes/FontSettings.js
 delete mode 100644 src/themes/MenuCommands.js
 delete mode 100644 src/themes/ScrollbarsApply.js
 delete mode 100644 src/themes/SettingsManager.js
 delete mode 100644 src/themes/ThemeApply.js
 delete mode 100644 src/themes/ThemeManager.js
 rename src/{themes => view}/Theme.js (100%)
 create mode 100644 src/view/ThemeManager.js
 rename src/{themes/ThemeSettingsDialog.js => view/ThemeSettings.js} (51%)
 create mode 100644 src/view/ThemeView.js

diff --git a/src/brackets.js b/src/brackets.js
index 270168dfbc1..88dedd915f2 100644
--- a/src/brackets.js
+++ b/src/brackets.js
@@ -92,7 +92,7 @@ define(function (require, exports, module) {
         NativeApp               = require("utils/NativeApp"),
         DeprecationWarning      = require("utils/DeprecationWarning"),
         ViewCommandHandlers     = require("view/ViewCommandHandlers"),
-        ThemeManager            = require("themes/ThemeManager"),
+        ThemeManager            = require("view/ThemeManager"),
         _                       = require("thirdparty/lodash");
 
     // DEPRECATED: In future we want to remove the global CodeMirror, but for now we
diff --git a/src/extensibility/ExtensionManager.js b/src/extensibility/ExtensionManager.js
index 89a6ec9c078..8eacee77c3e 100644
--- a/src/extensibility/ExtensionManager.js
+++ b/src/extensibility/ExtensionManager.js
@@ -1,24 +1,24 @@
 /*
  * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
@@ -27,7 +27,7 @@
 
 /**
  * The ExtensionManager fetches/caches the extension registry and provides
- * information about the status of installed extensions. ExtensionManager raises the 
+ * information about the status of installed extensions. ExtensionManager raises the
  * following events:
  *     statusChange - indicates that an extension has been installed/uninstalled or
  *         its status has otherwise changed. Second parameter is the id of the
@@ -38,7 +38,7 @@
 
 define(function (require, exports, module) {
     "use strict";
-    
+
     var _                = require("thirdparty/lodash"),
         FileUtils        = require("file/FileUtils"),
         Package          = require("extensibility/Package"),
@@ -48,17 +48,17 @@ define(function (require, exports, module) {
         FileSystem       = require("filesystem/FileSystem"),
         Strings          = require("strings"),
         StringUtils      = require("utils/StringUtils"),
-        ThemeManager     = require("themes/ThemeManager");
-    
+        ThemeManager     = require("view/ThemeManager");
+
     // semver.browser is an AMD-compatible module
     var semver = require("extensibility/node/node_modules/semver/semver.browser");
-    
+
     /**
      * Extension status constants.
      */
     var ENABLED      = "enabled",
         START_FAILED = "startFailed";
-    
+
     /**
      * Extension location constants.
      */
@@ -66,13 +66,13 @@ define(function (require, exports, module) {
         LOCATION_DEV     = "dev",
         LOCATION_USER    = "user",
         LOCATION_UNKNOWN = "unknown";
-    
+
     /**
      * @private
      * @type {Object.<string, {metadata: Object, path: string, status: string}>}
-     * The set of all known extensions, both from the registry and locally installed. 
-     * The keys are either "name" from package.json (for extensions that have package metadata) 
-     * or the last segment of local file paths (for installed legacy extensions 
+     * The set of all known extensions, both from the registry and locally installed.
+     * The keys are either "name" from package.json (for extensions that have package metadata)
+     * or the last segment of local file paths (for installed legacy extensions
      * with no package metadata). The fields of each record are:
      *     registryInfo: object containing the info for this id from the main registry (containing metadata, owner,
      *         and versions). This will be null for legacy extensions.
@@ -84,13 +84,13 @@ define(function (require, exports, module) {
      *         status: the current status, one of the status constants above
      */
     var extensions = {};
-    
+
     /**
      * Requested changes to the installed extensions.
      */
     var _idsToRemove = [],
         _idsToUpdate = [];
-        
+
     /**
      * @private
      * Synchronizes the information between the public registry and the installed
@@ -101,12 +101,12 @@ define(function (require, exports, module) {
      */
     function synchronizeEntry(id) {
         var entry = extensions[id];
-        
+
         // Do nothing if we only have one set of data
         if (!entry || !entry.installInfo || !entry.registryInfo) {
             return;
         }
-        
+
         entry.installInfo.owner = entry.registryInfo.owner;
 
         // Assume false
@@ -134,8 +134,8 @@ define(function (require, exports, module) {
 
         $(exports).triggerHandler("registryUpdate", [id]);
     }
-    
-    
+
+
     /**
      * @private
      * Verifies if an extension is a theme based on the presence of the field "theme"
@@ -146,9 +146,9 @@ define(function (require, exports, module) {
         var extension = extensions[id];
         if ( extension.installInfo && extension.installInfo.metadata && extension.installInfo.metadata.theme ) {
             ThemeManager.loadPackage(extension.installInfo);
-        }    
+        }
     }
-    
+
 
     /**
      * @private
@@ -170,7 +170,7 @@ define(function (require, exports, module) {
         _idsToRemove = [];
         _idsToUpdate = [];
     }
-    
+
     /**
      * Downloads the registry of Brackets extensions and stores the information in our
      * extension info.
@@ -201,8 +201,8 @@ define(function (require, exports, module) {
             });
         return result.promise();
     }
-    
-    
+
+
     /**
      * @private
      * When an extension is loaded, fetches the package.json and stores the extension in our map.
@@ -241,7 +241,7 @@ define(function (require, exports, module) {
             loadTheme(id);
             $(exports).triggerHandler("statusChange", [id]);
         }
-        
+
         ExtensionUtils.loadPackageJson(path)
             .done(function (metadata) {
                 setData(metadata.name, metadata);
@@ -249,7 +249,7 @@ define(function (require, exports, module) {
             .fail(function () {
                 // If there's no package.json, this is a legacy extension. It was successfully loaded,
                 // but we don't have an official ID or metadata for it, so we just create an id and
-                // "title" for it (which is the last segment of its pathname) 
+                // "title" for it (which is the last segment of its pathname)
                 // and record that it's enabled.
                 var match = path.match(/\/([^\/]+)$/),
                     name = (match && match[1]) || path,
@@ -257,7 +257,7 @@ define(function (require, exports, module) {
                 setData(name, metadata);
             });
     }
-        
+
     /**
      * Determines if the given versions[] entry is compatible with the given Brackets API version, and if not
      * specifies why.
@@ -291,7 +291,7 @@ define(function (require, exports, module) {
         }
         return result;
     }
-    
+
     /**
      * Finds the newest version of the entry that is compatible with the given Brackets API version, if any.
      * @param {Object} entry The registry entry to check.
@@ -310,10 +310,10 @@ define(function (require, exports, module) {
             }
             return fallback;
         }
-        
+
         var i = entry.versions.length - 1,
             latestInfo = getCompatibilityInfoForVersion(entry.versions[i], apiVersion);
-        
+
         if (latestInfo.isCompatible) {
             latestInfo.isLatestVersion = true;
             return latestInfo;
@@ -327,12 +327,12 @@ define(function (require, exports, module) {
                     return compatInfo;
                 }
             }
-            
+
             // No version is compatible, so just return info for the latest version
             return latestInfo;
         }
     }
-    
+
     /**
      * Given an extension id and version number, returns the URL for downloading that extension from
      * the repository. Does not guarantee that the extension exists at that URL.
@@ -343,7 +343,7 @@ define(function (require, exports, module) {
     function getExtensionURL(id, version) {
         return StringUtils.format(brackets.config.extension_url, id, version);
     }
-    
+
     /**
      * Removes the installed extension with the given id.
      * @param {string} id The id of the extension to remove.
@@ -367,7 +367,7 @@ define(function (require, exports, module) {
         }
         return result.promise();
     }
-    
+
     /**
      * Updates an installed extension with the given package file.
      * @param {string} id of the extension
@@ -392,7 +392,7 @@ define(function (require, exports, module) {
         });
         _idsToUpdate = {};
     }
-    
+
     /**
      * Unmarks all extensions marked for removal.
      */
@@ -413,7 +413,7 @@ define(function (require, exports, module) {
         }
         $(exports).triggerHandler("statusChange", [id]);
     }
-    
+
     /**
      * Returns true if an extension is marked for removal.
      * @param {string} id The id of the extension to check.
@@ -422,7 +422,7 @@ define(function (require, exports, module) {
     function isMarkedForRemoval(id) {
         return !!(_idsToRemove[id]);
     }
-    
+
     /**
      * Returns true if there are any extensions marked for removal.
      * @return {boolean} true if there are extensions to remove
@@ -430,7 +430,7 @@ define(function (require, exports, module) {
     function hasExtensionsToRemove() {
         return Object.keys(_idsToRemove).length > 0;
     }
-    
+
     /**
      * If a downloaded package appears to be an update, mark the extension for update.
      * If an extension was previously marked for removal, marking for update will
@@ -449,7 +449,7 @@ define(function (require, exports, module) {
             $(exports).triggerHandler("statusChange", [id]);
         }
     }
-    
+
     /**
      * Removes the mark for an extension to be updated on restart. Also deletes the
      * downloaded package file.
@@ -466,7 +466,7 @@ define(function (require, exports, module) {
         delete _idsToUpdate[id];
         $(exports).triggerHandler("statusChange", [id]);
     }
-    
+
     /**
      * Returns true if an extension is marked for update.
      * @param {string} id The id of the extension to check.
@@ -475,7 +475,7 @@ define(function (require, exports, module) {
     function isMarkedForUpdate(id) {
         return !!(_idsToUpdate[id]);
     }
-    
+
     /**
      * Returns true if there are any extensions marked for update.
      * @return {boolean} true if there are extensions to update
@@ -483,7 +483,7 @@ define(function (require, exports, module) {
     function hasExtensionsToUpdate() {
         return Object.keys(_idsToUpdate).length > 0;
     }
-    
+
     /**
      * Removes extensions previously marked for removal.
      * @return {$.Promise} A promise that's resolved when all extensions are removed, or rejected
@@ -499,7 +499,7 @@ define(function (require, exports, module) {
             }
         );
     }
-    
+
     /**
      * Updates extensions previously marked for update.
      * @return {$.Promise} A promise that's resolved when all extensions are updated, or rejected
@@ -516,7 +516,7 @@ define(function (require, exports, module) {
             }
         );
     }
-    
+
     /**
      * Gets an array of extensions that are currently installed and can be updated to a new version
      * @return {Array.<{id: string, installVersion: string, registryVersion: string}>}
@@ -595,10 +595,10 @@ define(function (require, exports, module) {
     exports.updateExtensions        = updateExtensions;
     exports.getAvailableUpdates     = getAvailableUpdates;
     exports.cleanAvailableUpdates   = cleanAvailableUpdates;
-    
+
     exports.ENABLED       = ENABLED;
     exports.START_FAILED  = START_FAILED;
-    
+
     exports.LOCATION_DEFAULT  = LOCATION_DEFAULT;
     exports.LOCATION_DEV      = LOCATION_DEV;
     exports.LOCATION_USER     = LOCATION_USER;
diff --git a/src/themes/DefaultSettings.js b/src/themes/DefaultSettings.js
deleted file mode 100644
index 2637c692140..00000000000
--- a/src/themes/DefaultSettings.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
-
-define(function(require) {
-    "use strict";
-
-    var FileUtils = require("file/FileUtils");
-
-    return {
-        "fontSize": 12,
-        "lineHeight": '1.3em',
-        "fontType": "'SourceCodePro-Medium', ＭＳ ゴシック, 'MS Gothic', monospace",
-        "customScrollbars": true,
-        "themes": ["default"]
-    };
-});
diff --git a/src/themes/FileLoader.js b/src/themes/FileLoader.js
deleted file mode 100644
index 3c78bef5268..00000000000
--- a/src/themes/FileLoader.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
-
-define(function(require) {
-    "use strict";
-
-    var FileSystem = require("filesystem/FileSystem"),
-        FileUtils  = require("file/FileUtils");
-
-    // Root directory for CodeMirror themes
-    var validExtensions = ["css", "less"];
-
-
-    /**
-    *  Return all the files in the specified path
-    */
-    function loadDirectory (path) {
-        var result = $.Deferred();
-
-        if ( !path ) {
-            return result.reject({
-                path: path,
-                error: "Path not defined"
-            });
-        }
-
-        function readContent(err, entries) {
-            var i, files = [];
-            entries = entries || [];
-
-            for (i = 0; i < entries.length; i++) {
-                if (isValid(entries[i])) {
-                    files.push(entries[i].name);
-                }
-            }
-
-            if ( err ) {
-                result.reject({
-                    path: path,
-                    error: err
-                });
-            }
-            else {
-                result.resolve({
-                    files: files,
-                    path: path
-                });
-            }
-        }
-
-        FileSystem.getDirectoryForPath(path).getContents(readContent);
-        return result.promise();
-    }
-
-
-    function isValid(file) {
-        return file.isFile &&
-            validExtensions.indexOf(FileUtils.getFileExtension(file.name)) !== -1;
-    }
-
-
-    return {
-        loadDirectory: loadDirectory
-    };
-
-});
-
diff --git a/src/themes/FontCommandsManager.js b/src/themes/FontCommandsManager.js
index b8272fc23e5..7dbbd84569d 100644
--- a/src/themes/FontCommandsManager.js
+++ b/src/themes/FontCommandsManager.js
@@ -8,24 +8,22 @@
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
 /*global $, define, require */
 
-define(function (require) {
+define(function (require, exports, module) {
     "use strict";
 
-    var Settings            = require("themes/SettingsManager"),
-        DefaultSettings     = require("themes/DefaultSettings"),
+    var ThemeSettings       = require("view/ThemeSettings"),
         ViewCommandHandlers = require("view/ViewCommandHandlers"),
-        PreferencesManager  = require("preferences/PreferencesManager");
-
+        PreferencesManager  = require("preferences/PreferencesManager"),
+        prefs               = PreferencesManager.getExtensionPrefs("brackets-themes");
 
     function updateThemeFontSize (evt, adjustment, fontSize /*, lineHeight*/) {
-        Settings.setValue("fontSize", fontSize);
+        prefs.set("fontSize", fontSize);
     }
 
-
     function updateBracketsFontSize() {
-        var fontSize = Settings.getValue("fontSize"),
+        var fontSize        = prefs.get("fontSize"),
             fontSizeNumeric = Number(fontSize.replace(/px|em/, "")),
-            fontSizeOffset = fontSizeNumeric - DefaultSettings.fontSize;
+            fontSizeOffset  = fontSizeNumeric - ThemeSettings.defaults.fontSize;
 
         if(!isNaN(fontSizeOffset)) {
             PreferencesManager.setViewState("fontSizeAdjustment", fontSizeOffset);
@@ -33,8 +31,7 @@ define(function (require) {
         }
     }
 
-
     $(ViewCommandHandlers).on("fontSizeChange", updateThemeFontSize);
-    $(Settings).on("change:fontSize", updateBracketsFontSize);
+    prefs.on("change", "fontSize", updateBracketsFontSize);
     updateBracketsFontSize();
 });
diff --git a/src/themes/FontSettings.js b/src/themes/FontSettings.js
deleted file mode 100644
index 3ad3233146e..00000000000
--- a/src/themes/FontSettings.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
-
-define(function (require) {
-    "use strict";
-
-    var Settings = require("themes/SettingsManager");
-
-
-    var $lineHeight = $("<style type='text/css' id='lineHeight'>").appendTo("head"),
-        $fontSize = $("<style type='text/css' id='fontSize'>").appendTo("head"),
-        $fontType = $("<style type='text/css' id='fontType'>").appendTo("head");
-
-
-    var FontSettings = {};
-
-
-    FontSettings.updateLineHeight = function () {
-        clearFonts();
-        var value = Settings.getValue("lineHeight");
-        $lineHeight.text(".CodeMirror{" + "line-height: " + value + "; }");
-    };
-
-
-    FontSettings.updateFontSize = function () {
-        clearFonts();
-        var value = Settings.getValue("fontSize");
-        $fontSize.text(".CodeMirror{" + "font-size: " + value + " !important; }");
-    };
-
-
-    FontSettings.updateFontType = function () {
-        clearFonts();
-        var value = Settings.getValue("fontType");
-        $fontType.text(".CodeMirror{" + "font-family: " + value + " !important; }");
-    };
-
-
-    FontSettings.update = function () {
-        clearFonts();
-        FontSettings.updateLineHeight();
-        FontSettings.updateFontSize();
-        FontSettings.updateFontType();
-    };
-
-
-    function clearFonts() {
-        // Remove this tag that is intefering with font settings set in this module
-        $("#codemirror-dynamic-fonts").remove();
-    }
-
-
-    $(Settings).on("change:lineHeight", FontSettings.updateLineHeight);
-    $(Settings).on("change:fontSize", FontSettings.updateFontSize);
-    $(Settings).on("change:fontType", FontSettings.updateFontType);
-    FontSettings.update();
-
-    return FontSettings;
-});
diff --git a/src/themes/MenuCommands.js b/src/themes/MenuCommands.js
deleted file mode 100644
index bdb8bf3b2bb..00000000000
--- a/src/themes/MenuCommands.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
-
-define(function(require) {
-    "use strict";
-    var Commands       = require("command/Commands"),
-        CommandManager = require("command/CommandManager"),
-        Strings        = require("strings"),
-        Settings       = require("themes/SettingsManager");
-
-    CommandManager.register(Strings.CMD_THEMES, Commands.CMD_THEMES_OPEN_SETTINGS, Settings.showDialog);
-});
diff --git a/src/themes/ScrollbarsApply.js b/src/themes/ScrollbarsApply.js
deleted file mode 100644
index 5bc5d145955..00000000000
--- a/src/themes/ScrollbarsApply.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
-
-define(function (require) {
-    "use strict";
-
-    var Settings = require("themes/SettingsManager");
-    var $scrollbars = $("<style id='scrollbars'>").appendTo("head");
-    var theme;
-
-
-    function scrollbarsApply(themeManager) {
-        scrollbarsApply.update(themeManager);
-    }
-
-
-    scrollbarsApply.update = function(themeManager) {
-        theme = (themeManager && themeManager.getThemes()[0]) || theme || {};
-        if ( Settings.getValue("customScrollbars") ) {
-            var scrollbar = (theme.scrollbar || []).join(" ");
-            $scrollbars.text(scrollbar || "");
-        }
-        else {
-            $scrollbars.text("");
-        }
-    };
-
-
-    scrollbarsApply.enable = function(themeManager) {
-        Settings.setValue("customScrollbars", true);
-        scrollbarsApply.update(themeManager);
-    };
-
-
-    scrollbarsApply.disable = function(themeManager) {
-        Settings.setValue("customScrollbars", true);
-        scrollbarsApply.update(themeManager);
-    };
-
-
-    $(Settings).on("change:customScrollbars", function() {
-        scrollbarsApply.update();
-    });
-
-
-    return scrollbarsApply;
-});
-
diff --git a/src/themes/SettingsManager.js b/src/themes/SettingsManager.js
deleted file mode 100644
index 36759dea777..00000000000
--- a/src/themes/SettingsManager.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
-
-define(function (require) {
-    "use strict";
-
-    var _                   = require("thirdparty/lodash"),
-        PreferencesManager  = require("preferences/PreferencesManager"),
-        PreferencesImpl     = require("preferences/PreferencesImpl"),
-        DefaultSettings     = require("themes/DefaultSettings"),
-        SettingsDialog      = require("themes/ThemeSettingsDialog"),
-        prefs               = PreferencesManager.getExtensionPrefs("brackets-themes");
-
-    var Settings = {};
-
-
-    Settings.showDialog = function() {
-        SettingsDialog.show(Settings);
-    };
-
-
-    Settings.getValue = function() {
-        return prefs.get.apply(prefs, arguments);
-    };
-
-
-    Settings.setValue = function() {
-        prefs.set.apply(prefs, arguments);
-        prefs.save();
-        _triggerEvent(arguments[0]);
-    };
-
-
-    Settings.getAll = function() {
-        return _.transform(arguments, function(result, value, key) {
-            result[value] = prefs.get(value);
-        });
-    };
-
-
-    Settings.reset = function() {
-        Settings.setValue("themes",  DefaultSettings.themes);
-        Settings.setValue("fontSize", DefaultSettings.fontSize + "px");
-        Settings.setValue("lineHeight", DefaultSettings.lineHeight);
-        Settings.setValue("fontType", DefaultSettings.fontType);
-        Settings.setValue("customScrollbars", DefaultSettings.customScrollbars);
-    };
-
-
-    function _triggerEvent(item) {
-        var data = prefs.get(item);
-        $(Settings).trigger("change", data);
-        $(Settings).trigger("change:" + item, [data]);
-    }
-    
-
-    // Expose it so that other settings manager can trigger events as well
-    Settings._triggerEvent = _triggerEvent;
-
-
-    prefs.definePreference("themes", "array", DefaultSettings.themes)
-        .on("change", function() {
-            _triggerEvent("themes");
-        });
-
-    prefs.definePreference("fontSize", "string", DefaultSettings.fontSize + "px")
-        .on("change", function() {
-            _triggerEvent("fontSize");
-        });
-
-    prefs.definePreference("lineHeight", "string", DefaultSettings.lineHeight)
-        .on("change", function() {
-            _triggerEvent("lineHeight");
-        });
-
-    prefs.definePreference("fontType", "string", DefaultSettings.fontType)
-        .on("change", function() {
-            _triggerEvent("fontType");
-        });
-
-    prefs.definePreference("customScrollbars", "boolean", DefaultSettings.customScrollbars)
-        .on("change", function() {
-            _triggerEvent("customScrollbars");
-        });
-
-    return Settings;
-});
diff --git a/src/themes/ThemeApply.js b/src/themes/ThemeApply.js
deleted file mode 100644
index eb16f11ec62..00000000000
--- a/src/themes/ThemeApply.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require, CodeMirror */
-
-define(function(require) {
-    "use strict";
-
-    var ExtensionUtils = require("utils/ExtensionUtils");
-
-    /**
-    *  Handles updating codemirror with the current selection of themes.
-    */
-    function ThemeApply (themeManager, cm) {
-        var newThemes     = themeManager.selected.join(" "),
-            currentThemes = cm.getOption("theme");
-
-        // Check if the editor already has the theme applied...
-        if (currentThemes === newThemes) {
-            return;
-        }
-
-        // Setup current and further documents to get the new theme...
-        CodeMirror.defaults.theme = newThemes;
-        cm.setOption("theme", newThemes);
-    }
-
-    return ThemeApply;
-});
diff --git a/src/themes/ThemeManager.js b/src/themes/ThemeManager.js
deleted file mode 100644
index a08cdf0fc33..00000000000
--- a/src/themes/ThemeManager.js
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
-
-define(function (require, exports, module) {
-    "use strict";
-
-    require("themes/MenuCommands");
-    require("themes/FontSettings");
-    require("themes/FontCommandsManager");
-
-    var _                = require("thirdparty/lodash"),
-        EditorManager    = require("editor/EditorManager"),
-        FileSystem       = require("filesystem/FileSystem"),
-        ExtensionUtils   = require("utils/ExtensionUtils"),
-        Settings         = require("themes/SettingsManager"),
-        Theme            = require("themes/Theme"),
-        themeSettings    = require("themes/ThemeSettingsDialog"),
-        themeApply       = require("themes/ThemeApply"),
-        scrollbarsApply  = require("themes/ScrollbarsApply"),
-        fileLoader       = require("themes/FileLoader");
-
-
-    // Load up reset.css to override brackground settings from brackets because
-    // they make the themes look really bad.
-    ExtensionUtils.addLinkedStyleSheet("themes/reset.css");
-    ExtensionUtils.addLinkedStyleSheet("styles/brackets_theme_settings.css");
-
-
-    /**
-    */
-    var ThemeManager = {};
-
-
-    /**
-    * Refresh currently load theme
-    */
-    ThemeManager.refresh = function(force) {
-        var cm = getCM();
-        if ( cm ) {
-            setDocumentMode(cm);
-            themeApply(ThemeManager, cm);
-            refreshEditor(cm);
-        }
-
-        if ( force === true ) {
-            loadThemes(ThemeManager.getThemes(), force === true).done(function() {
-                setDocumentTheme(Settings.getValue("themes"));
-                scrollbarsApply(ThemeManager);
-
-                if ( cm ) {
-                    refreshEditor(cm);
-                }
-            });
-        }
-    };
-
-
-    /**
-    * Returns all current theme objects
-    */
-    ThemeManager.getThemes = function() {
-        return _.map(Settings.getValue("themes").slice(0), function (item) {
-            return ThemeManager.themes[item];
-        });
-    };
-
-
-    /**
-    * Loads a theme from a file. fileName is the full path to the file
-    */
-    ThemeManager.loadFile = function(fileName, displayName) {
-        var deferred = new $.Deferred();
-        var file = FileSystem.getFileForPath (fileName);
-
-        file.exists(function( err, exists ) {
-            if ( exists ) {
-                var theme = new Theme(file, displayName);
-                deferred.resolve((ThemeManager.themes[theme.name] = theme));
-                themeSettings.setThemes(ThemeManager.themes);
-
-
-                // For themes that are loaded after ThemeManager has been loaded,
-                // we should check if it the theme in the selected array so that
-                // we can determine if we need to trigger a refresh
-                if ( ThemeManager.selected.indexOf(theme.name) !== -1 ) {
-                    ThemeManager.refresh(true);
-                }
-            }
-            else if ( err ) {
-                deferred.reject(err);
-            }
-        });
-
-        return deferred.promise();
-    };
-
-
-    /**
-    * Loads a theme from a file. fileName is the full path to the file
-    */
-    ThemeManager.loadPackage = function(themePackage) {
-        var fileName = themePackage.path + "/" + themePackage.metadata.theme;
-        return ThemeManager.loadFile(fileName, themePackage.metadata.title);
-    };
-
-
-    /**
-    * Load css/less files from a directory to be treated as themes
-    */
-    ThemeManager.loadDirectory = function(path) {
-        return fileLoader.loadDirectory(path).then(loadThemesFiles);
-    };
-
-
-    /**
-    * Process theme meta deta to create theme instances
-    */
-    function loadThemesFiles(themes) {
-        if (themes.error) {
-            return;
-        }
-
-        // Iterate through each name in the themes and make them theme objects
-        var deferred = _.map(themes.files, function (themeFile) {
-            return ThemeManager.loadFile(themes.path + "/" + themeFile);
-        });
-
-        return $.when.apply(undefined, deferred);
-    }
-
-
-    /**
-    * Add theme class to the document to add proper theme styling scoping.
-    * New class is added, old class is removed.  This basically allows
-    * themeSettings to get nicely cleaned up from the DOM.
-    */
-    function setDocumentTheme(newThemes) {
-        var oldThemes = ThemeManager.selected;
-        ThemeManager.selected = (newThemes = newThemes || []);
-
-        // We gotta prefix theme names with "theme" because themes that start with a number
-        // will not render correctly.  Class names that start with a number are invalid
-        newThemes = _.map(newThemes, function(theme){ return "theme-" + theme; }).join(" ");
-        oldThemes = _.map(oldThemes, function(theme){ return "theme-" + theme; }).join(" ");
-        $("html").removeClass(oldThemes).addClass(newThemes);
-    }
-
-
-    /**
-    *
-    */
-    function setDocumentMode(cm) {
-        var mode = cm.getDoc().getMode();
-        var docMode = mode && (mode.helperType || mode.name);
-        $("html").removeClass("doctype-" + ThemeManager.docMode).addClass("doctype-" + docMode);
-        ThemeManager.docMode = docMode;
-    }
-
-
-    /**
-    * Loads theme style files
-    */
-    function loadThemes(themes, refresh) {
-        var pending = _.map(themes, function (theme) {
-            if ( theme ) {
-                return theme.load(refresh);
-            }
-        });
-
-        return $.when.apply(undefined, pending);
-    }
-
-
-    /**
-    * Will trigger a refresh of codemirror instance and editor resize so that
-    * inline widgets get properly
-    */
-    function refreshEditor(cm) {
-        // Really dislike timing issues with CodeMirror.  I have to refresh
-        // the editor after a little bit of time to make sure that themes
-        // are properly applied to quick edit widgets
-        setTimeout(function(){
-            cm.refresh();
-            EditorManager.resizeEditor();
-        }, 100);
-    }
-
-
-    function getCM() {
-        var editor = EditorManager.getActiveEditor();
-        if (!editor || !editor._codeMirror) {
-            return;
-        }
-        return editor._codeMirror;
-    }
-
-
-    ThemeManager.docMode = "";
-    ThemeManager.themes = {};
-    ThemeManager.selected = Settings.getValue("themes");
-
-
-    $(EditorManager)
-        .on("activeEditorChange", function() {
-            ThemeManager.refresh(true);
-        });
-
-    $(Settings)
-        .on("change:themes", function(evt, themes) {
-            setDocumentTheme(themes);
-            ThemeManager.refresh(true);
-
-            // Expose event for theme changes
-            $(ThemeManager).trigger("change:themes", ThemeManager.getThemes());
-        })
-        .on("change:fontSize", function() {
-            ThemeManager.refresh();
-        });
-
-    FileSystem
-        .on("change", function(evt, file) {
-            var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
-                theme = ThemeManager.themes[name];
-
-            if ( theme && theme.getFile().parentPath === file.parentPath ) {
-                ThemeManager.refresh(true);
-            }
-        });
-
-
-    /**
-    * TODO: remove temporary code to load all themes from CodeMirror.  This is just to test
-    * the whole workflow of loading an entire directory and also to show case themes in brackets :)
-    */
-    var FileUtils = require("file/FileUtils");
-    var cm_path = FileUtils.getNativeBracketsDirectoryPath() + "/thirdparty/CodeMirror2";
-    ThemeManager.loadDirectory( cm_path + "/theme" );
-
-
-    //
-    // Exposed API
-    //
-    return {
-        refresh: ThemeManager.refresh,
-        loadFile: ThemeManager.loadFile,
-        loadPackage: ThemeManager.loadPackage,
-        loadDirectory: ThemeManager.loadDirectory,
-        getThemes: ThemeManager.getThemes
-    };
-
-});
diff --git a/src/utils/CodeMirrorAddons.js b/src/utils/CodeMirrorAddons.js
index 4810d003596..4a7bc974668 100644
--- a/src/utils/CodeMirrorAddons.js
+++ b/src/utils/CodeMirrorAddons.js
@@ -28,6 +28,8 @@
 define(function(require) {
     "use strict";
 
+    var CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror");
+
     // Load CodeMirror add-ons--these attach themselves to the CodeMirror module
     require("thirdparty/CodeMirror2/addon/fold/xml-fold");
     require("thirdparty/CodeMirror2/addon/edit/matchtags");
@@ -36,10 +38,15 @@ define(function(require) {
     require("thirdparty/CodeMirror2/addon/edit/closetag");
     require("thirdparty/CodeMirror2/addon/scroll/scrollpastend");
     require("thirdparty/CodeMirror2/addon/selection/active-line");
+    require("thirdparty/CodeMirror2/addon/selection/mark-selection");
     require("thirdparty/CodeMirror2/addon/mode/multiplex");
     require("thirdparty/CodeMirror2/addon/mode/overlay");
     require("thirdparty/CodeMirror2/addon/search/match-highlighter");
     require("thirdparty/CodeMirror2/addon/search/searchcursor");
     require("thirdparty/CodeMirror2/keymap/sublime");
 
+
+    CodeMirror.defaults.highlightSelectionMatches = true;
+    CodeMirror.defaults.styleSelectedText = true;
+
 });
diff --git a/src/themes/Theme.js b/src/view/Theme.js
similarity index 100%
rename from src/themes/Theme.js
rename to src/view/Theme.js
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
new file mode 100644
index 00000000000..d74730024a8
--- /dev/null
+++ b/src/view/ThemeManager.js
@@ -0,0 +1,289 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
+
+define(function (require, exports, module) {
+    "use strict";
+
+    // FontsCommandsManager will be going away soon when we add font size management in Brackets.
+    require("themes/FontCommandsManager");
+
+    var _                  = require("thirdparty/lodash"),
+        FileSystem         = require("filesystem/FileSystem"),
+        FileUtils          = require("file/FileUtils"),
+        EditorManager      = require("editor/EditorManager"),
+        ExtensionUtils     = require("utils/ExtensionUtils"),
+        Theme              = require("view/Theme"),
+        ThemeSettings      = require("view/ThemeSettings"),
+        ThemeView          = require("view/ThemeView"),
+        AppInit            = require("utils/AppInit"),
+        PreferencesManager = require("preferences/PreferencesManager"),
+        prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
+
+    // Load up reset.css to override brackground settings from brackets because
+    // they make the themes look really bad.
+    ExtensionUtils.addLinkedStyleSheet("themes/reset.css");
+    ExtensionUtils.addLinkedStyleSheet("styles/brackets_theme_settings.css");
+
+    var appReady = false;
+
+    // Bucket with all fully resolved theme objects.
+    var _themes = {};
+
+    // Valid theme file extensions
+    var validExtensions = ["css", "less"];
+
+
+    /**
+    * Refresh currently load theme
+    */
+    function refresh(force) {
+        if (!appReady) {
+            return;
+        }
+
+        var cm = getCM();
+
+        if(cm) {
+            ThemeView.setDocumentMode(cm);
+
+            if(force === false) {
+                ThemeView.updateThemes(cm);
+                refreshEditor(cm);
+            }
+            else {
+                loadThemes(getThemes(), true).done(function() {
+                    ThemeView.updateThemes(cm);
+                    refreshEditor(cm);
+                });
+            }
+        }
+    }
+
+
+    /**
+    * Returns all current theme objects
+    */
+    function getThemes() {
+        return _.map(prefs.get("themes").slice(0), function (item) {
+            return _themes[item];
+        });
+    }
+
+
+    /**
+    * Loads a theme from a file. fileName is the full path to the file
+    */
+    function loadFile(fileName, displayName) {
+        var deferred      = new $.Deferred(),
+            file          = FileSystem.getFileForPath(fileName),
+            currentThemes = (prefs.get("themes") || []);
+
+        file.exists(function(err, exists) {
+            var theme;
+
+            if(exists) {
+                theme = new Theme(file, displayName);
+                _themes[theme.name] = theme;
+                ThemeSettings.setThemes(_themes);
+
+                // For themes that are loaded after ThemeManager has been loaded,
+                // we should check if it the theme in the selected array so that
+                // we can determine if we need to trigger a refresh
+                if(currentThemes.indexOf(theme.name) !== -1) {
+                    refresh(true);
+                }
+
+                deferred.resolve(theme);
+            }
+            else if(err) {
+                deferred.reject(err);
+            }
+        });
+
+        return deferred.promise();
+    }
+
+
+    /**
+    * Loads a theme from a file. fileName is the full path to the file
+    */
+    function loadPackage(themePackage) {
+        var fileName = themePackage.path + "/" + themePackage.metadata.theme;
+        return loadFile(fileName, themePackage.metadata.title);
+    }
+
+
+    /**
+    * Load css/less files from a directory to be treated as themes
+    */
+    function loadDirectory(path) {
+        var result = new $.Deferred();
+
+        if(!path) {
+            return result.reject({
+                path: path,
+                error: "Path not defined"
+            });
+        }
+
+        function readContent(err, entries) {
+            var i, files = [];
+            entries = entries || [];
+
+            for (i = 0; i < entries.length; i++) {
+                if (isFileTypeValid(entries[i])) {
+                    files.push(entries[i].name);
+                }
+            }
+
+            if ( err ) {
+                result.reject({
+                    path: path,
+                    error: err
+                });
+            }
+            else {
+                result.resolve({
+                    files: files,
+                    path: path
+                });
+            }
+        }
+
+
+        FileSystem.getDirectoryForPath(path).getContents(readContent);
+        return result.then(loadThemesFiles).promise();
+    }
+
+
+    function isFileTypeValid(file) {
+        return file.isFile &&
+            validExtensions.indexOf(FileUtils.getFileExtension(file.name)) !== -1;
+    }
+
+
+    /**
+    * Process theme meta deta to create theme instances
+    */
+    function loadThemesFiles(themes) {
+        // Iterate through each name in the themes and make them theme objects
+        var deferred = _.map(themes.files, function (themeFile) {
+            return loadFile(themes.path + "/" + themeFile);
+        });
+
+        return $.when.apply(undefined, deferred);
+    }
+
+
+    /**
+    * Loads theme style files
+    */
+    function loadThemes(themes, refresh) {
+        var pending = _.map(themes, function (theme) {
+            if ( theme ) {
+                return theme.load(refresh);
+            }
+        });
+
+        return $.when.apply(undefined, pending);
+    }
+
+
+    /**
+    * Will trigger a refresh of codemirror instance and editor resize so that
+    * inline widgets get properly
+    */
+    function refreshEditor(cm) {
+        // Really dislike timing issues with CodeMirror.  I have to refresh
+        // the editor after a little bit of time to make sure that themes
+        // are properly applied to quick edit widgets
+        setTimeout(function(){
+            cm.refresh();
+            EditorManager.resizeEditor();
+        }, 100);
+    }
+
+
+    function getCM() {
+        var editor = EditorManager.getActiveEditor();
+        if (!editor || !editor._codeMirror) {
+            return;
+        }
+        return editor._codeMirror;
+    }
+
+
+    prefs.on("change", "themes", function() {
+        refresh(true);
+        ThemeView.updateScrollbars(getThemes()[0]);
+
+        // Expose event for theme changes
+        $(exports).trigger("themeChange", getThemes());
+    });
+
+    prefs.on("change", "customScrollbars", function() {
+        refresh();
+        ThemeView.updateScrollbars(getThemes()[0]);
+    });
+
+    prefs.on("change", "fontSize", function() {
+        refresh();
+        ThemeView.updateFontSize();
+    });
+
+    prefs.on("change", "lineHeight", function() {
+        refresh();
+        ThemeView.updateLineHeight();
+    });
+
+    prefs.on("change", "fontType", function() {
+        refresh();
+        ThemeView.updateFontType();
+    });
+
+
+    $(EditorManager).on("activeEditorChange", function() {
+        refresh(true);
+    });
+
+
+    FileSystem.on("change", function(evt, file) {
+        var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
+            theme = _themes[name];
+
+        if ( theme && theme.getFile().parentPath === file.parentPath ) {
+            refresh(true);
+        }
+    });
+
+
+    AppInit.appReady(function() {
+        appReady = true;
+        refresh(true);
+    });
+
+
+    /**
+    * TODO: remove temporary code to load all themes from CodeMirror.  This is just to test
+    * the whole workflow of loading an entire directory and also to show case themes in brackets :)
+    */
+    var cm_path = FileUtils.getNativeBracketsDirectoryPath() + "/thirdparty/CodeMirror2";
+    loadDirectory( cm_path + "/theme" );
+
+
+    //
+    // Exposed API
+    //
+    exports.refresh       = refresh;
+    exports.loadFile      = loadFile;
+    exports.loadPackage   = loadPackage;
+    exports.loadDirectory = loadDirectory;
+    exports.getThemes     = getThemes;
+});
diff --git a/src/themes/ThemeSettingsDialog.js b/src/view/ThemeSettings.js
similarity index 51%
rename from src/themes/ThemeSettingsDialog.js
rename to src/view/ThemeSettings.js
index 6301eee2b15..3e2ede6e13d 100644
--- a/src/themes/ThemeSettingsDialog.js
+++ b/src/view/ThemeSettings.js
@@ -1,33 +1,46 @@
-/*
+/**
  * Brackets Themes Copyright (c) 2014 Miguel Castillo.
  *
  * Licensed under MIT
  */
 
+
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
 /*global $, define, require, Mustache */
 
-define(function(require) {
+define(function(require, exports, module) {
     "use strict";
 
-    var _       = require("thirdparty/lodash"),
-        Dialogs = require("widgets/Dialogs"),
-        Strings = require("strings"),
+    var _themes = {};
+
+    var defaults = {
+        "fontSize": 12,
+        "lineHeight": '1.3em',
+        "fontType": "'SourceCodePro-Medium', ＭＳ ゴシック, 'MS Gothic', monospace",
+        "customScrollbars": true,
+        "themes": ["default"]
+    };
+
+    var tmpl = {
+        "settings": require("text!htmlContent/themes-settings.html"),
+        "general": require("text!htmlContent/themes-general.html")
+    };
 
-        tmpl = {
-            "settings": require("text!htmlContent/themes-settings.html"),
-            "general": require("text!htmlContent/themes-general.html")
-        };
+    var _                  = require("thirdparty/lodash"),
+        FileUtils          = require("file/FileUtils"),
+        Dialogs            = require("widgets/Dialogs"),
+        Strings            = require("strings"),
+        PreferencesManager = require("preferences/PreferencesManager"),
+        prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
 
-    var _themes;
 
     // Setup all the templates so that we can easily render them with Mustache
     var $settings = $(tmpl.settings).addClass("themeSettings");
     $("#generalSettings", $settings).html(tmpl.general);
 
 
-    function show(settings) {
-        var currentSettings = settings.getAll("themes", "fontSize", "fontType", "lineHeight", "customScrollbars");
+    function showDialog() {
+        var currentSettings = getValues("themes", "fontSize", "fontType", "lineHeight", "customScrollbars");
         var newSettings     = {};
         var themes          = _.map(_themes, function(theme) {return theme;});
         var template        = $("<div>").append($settings).html();
@@ -60,7 +73,7 @@ define(function(require) {
                 var attr = $target.attr("data-target");
                 if ( attr ) {
                     var items = $target.map(function(i, item) {return $(item).val();}).toArray();
-                    settings.setValue( attr, items );
+                    prefs.set( attr, items );
                 }
             });
 
@@ -68,7 +81,7 @@ define(function(require) {
             if ( id === "save" ) {
                 for( var i in newSettings ) {
                     if ( currentSettings.hasOwnProperty(i) ) {
-                        settings.setValue( i, newSettings[i] );
+                        prefs.set( i, newSettings[i] );
                     }
                 }
             }
@@ -81,8 +94,31 @@ define(function(require) {
     }
 
 
-    return {
-        setThemes: setThemes,
-        show: show
-    };
+    function getValues () {
+        return _.transform(arguments, function(result, value, key) {
+            result[value] = prefs.get(value);
+        });
+    }
+
+
+    function reset() {
+        prefs.set("themes",           defaults.themes);
+        prefs.set("fontSize",         defaults.fontSize + "px");
+        prefs.set("lineHeight",       defaults.lineHeight);
+        prefs.set("fontType",         defaults.fontType);
+        prefs.set("customScrollbars", defaults.customScrollbars);
+    }
+
+
+    prefs.definePreference("themes", "array", defaults.themes);
+    prefs.definePreference("fontSize", "string", defaults.fontSize + "px");
+    prefs.definePreference("lineHeight", "string", defaults.lineHeight);
+    prefs.definePreference("fontType", "string", defaults.fontType);
+    prefs.definePreference("customScrollbars", "boolean", defaults.customScrollbars);
+
+
+    // Exposed API
+    exports.defaults   = defaults;
+    exports.setThemes  = setThemes;
+    exports.showDialog = showDialog;
 });
diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
new file mode 100644
index 00000000000..c773baf0d16
--- /dev/null
+++ b/src/view/ThemeView.js
@@ -0,0 +1,138 @@
+/**
+ * Brackets Themes Copyright (c) 2014 Miguel Castillo.
+ *
+ * Licensed under MIT
+ */
+
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global $, define, require */
+
+define(function (require, exports, module) {
+    "use strict";
+
+    var theme, currentThemes = [];
+
+    var _                  = require("thirdparty/lodash"),
+        CodeMirror         = require("thirdparty/CodeMirror2/lib/codemirror"),
+        ExtensionUtils     = require("utils/ExtensionUtils"),
+        PreferencesManager = require("preferences/PreferencesManager"),
+        prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
+
+
+    var templates = {
+        $lineHeight: $("<style type='text/css' id='lineHeight'>").appendTo("head"),
+        $fontSize: $("<style type='text/css' id='fontSize'>").appendTo("head"),
+        $fontType: $("<style type='text/css' id='fontType'>").appendTo("head"),
+        $scrollbars: $("<style id='scrollbars'>").appendTo("head")
+    };
+
+
+    function updateLineHeight() {
+        clearFonts();
+        var value = prefs.get("lineHeight");
+        templates.$lineHeight.text(".CodeMirror{" + "line-height: " + value + "; }");
+    }
+
+
+    function updateFontSize() {
+        clearFonts();
+        var value = prefs.get("fontSize");
+        templates.$fontSize.text(".CodeMirror{" + "font-size: " + value + " !important; }");
+    }
+
+
+    function updateFontType () {
+        clearFonts();
+        var value = prefs.get("fontType");
+        templates.$fontType.text(".CodeMirror{" + "font-family: " + value + " !important; }");
+    }
+
+
+    function clearFonts() {
+        // Remove this tag that is intefering with font settings set in this module
+        $("#codemirror-dynamic-fonts").remove();
+    }
+
+
+    function updateFonts () {
+        clearFonts();
+        updateLineHeight();
+        updateFontSize();
+        updateFontType();
+    }
+
+
+    function updateScrollbars(theme) {
+        theme = theme || {};
+        if ( prefs.get("customScrollbars") ) {
+            var scrollbar = (theme.scrollbar || []).join(" ");
+            templates.$scrollbars.text(scrollbar || "");
+        }
+        else {
+            templates.$scrollbars.text("");
+        }
+    }
+
+
+    /**
+    *  Handles updating codemirror with the current selection of themes.
+    */
+    function updateThemes (cm) {
+        var newThemes = (prefs.get("themes") || []).join(" "),
+            cmThemes  = cm.getOption("theme").replace(/[\s]*/, " "); // Normalize themes string
+
+        // Check if the editor already has the theme applied...
+        if (cmThemes === newThemes) {
+            return;
+        }
+
+        // Setup current and further documents to get the new theme...
+        CodeMirror.defaults.theme = newThemes;
+        cm.setOption("theme", newThemes);
+
+        // Make sure to update the document theme if a new theme is being set.
+        setDocumentTheme();
+    }
+
+
+    /**
+    * Add theme class to the document to add proper theme styling scoping.
+    * New class is added, old class is removed.  This basically allows
+    * themeSettings to get nicely cleaned up from the DOM.
+    */
+    function setDocumentTheme() {
+        var newThemes = (prefs.get("themes") || []);
+        var oldThemes = (currentThemes || []).slice(0);
+        currentThemes = newThemes.slice(0);
+
+        // We gotta prefix theme names with "theme" because themes that start with a number
+        // will not render correctly.  Class names that start with a number are invalid
+        newThemes = _.map(newThemes, function(theme){ return "theme-" + theme; }).join(" ");
+        oldThemes = _.map(oldThemes, function(theme){ return "theme-" + theme; }).join(" ");
+        $("html").removeClass(oldThemes).addClass(newThemes);
+    }
+
+
+    /**
+    *
+    */
+    function setDocumentMode(cm) {
+        var mode = cm.getDoc().getMode();
+        var docMode = mode && (mode.helperType || mode.name);
+        $("html").removeClass("doctype-" + docMode).addClass("doctype-" + docMode);
+        return docMode;
+    }
+
+
+    //
+    // Expose API
+    //
+    exports.updateFonts      = updateFonts;
+    exports.updateLineHeight = updateLineHeight;
+    exports.updateFontSize   = updateFontSize;
+    exports.updateFontType   = updateFontType;
+    exports.updateScrollbars = updateScrollbars;
+    exports.updateThemes     = updateThemes;
+    exports.setDocumentMode  = setDocumentMode;
+});
diff --git a/src/view/ViewCommandHandlers.js b/src/view/ViewCommandHandlers.js
index b2e65cfd798..0d7c3438cb4 100644
--- a/src/view/ViewCommandHandlers.js
+++ b/src/view/ViewCommandHandlers.js
@@ -1,24 +1,24 @@
 /*
  * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
@@ -34,7 +34,7 @@
 
 define(function (require, exports, module) {
     "use strict";
-    
+
     var Commands            = require("command/Commands"),
         CommandManager      = require("command/CommandManager"),
         KeyBindingManager   = require("command/KeyBindingManager"),
@@ -43,9 +43,10 @@ define(function (require, exports, module) {
         EditorManager       = require("editor/EditorManager"),
         PreferencesManager  = require("preferences/PreferencesManager"),
         DocumentManager     = require("document/DocumentManager"),
+        ThemeSettings       = require("view/ThemeSettings"),
         AppInit             = require("utils/AppInit");
-    
-    
+
+
     /**
      * @const
      * @type {string}
@@ -59,7 +60,7 @@ define(function (require, exports, module) {
      * @type {number}
      */
     var MIN_FONT_SIZE = 1;
-    
+
     /**
      * @const
      * @private
@@ -67,7 +68,7 @@ define(function (require, exports, module) {
      * @type {number}
      */
     var MAX_FONT_SIZE = 72;
-    
+
     /**
      * @const
      * @private
@@ -75,8 +76,8 @@ define(function (require, exports, module) {
      * @type {number}
      */
     var DEFAULT_FONT_SIZE = 12;
-    
-    
+
+
     /**
      * @private
      * Removes the styles used to update the font size
@@ -84,7 +85,7 @@ define(function (require, exports, module) {
     function _removeDynamicFontSize() {
         $("#" + DYNAMIC_FONT_STYLE_ID).remove();
     }
-    
+
     /**
      * @private
      * Add the styles used to update the font size
@@ -95,7 +96,7 @@ define(function (require, exports, module) {
         style.html(".CodeMirror { font-size: " + fontSizeStyle   + " !important; }");
         $("head").append(style);
     }
-    
+
     /**
      * @private
      * Sets the font size and restores the scroll position as best as possible.
@@ -110,45 +111,45 @@ define(function (require, exports, module) {
             adjustment  = 0,
             scrollPos   = editor.getScrollPos(),
             line        = editor._codeMirror.lineAtHeight(scrollPos.y, "local");
-        
+
         _removeDynamicFontSize();
         if (fontSizeStyle) {
             _addDynamicFontSize(fontSizeStyle);
         }
         editor.refreshAll();
-        
+
         delta = /em$/.test(oldFontSize) ? 10 : 1;
         newFontSize = $(".CodeMirror").css("font-size");
         adjustment = parseInt((parseFloat(newFontSize) - parseFloat(oldFontSize)) * delta, 10);
-        
+
         if (adjustment) {
             $(exports).triggerHandler("fontSizeChange", [adjustment, newFontSize]);
         }
-        
+
         // Calculate the new scroll based on the old font sizes and scroll position
         var newWidth   = editor._codeMirror.defaultCharWidth(),
             deltaX     = scrollPos.x / oldWidth,
             scrollPosX = scrollPos.x + Math.round(deltaX * (newWidth  - oldWidth)),
             scrollPosY = editor._codeMirror.heightAtLine(line, "local");
-        
+
         editor.setScrollPos(scrollPosX, scrollPosY);
     }
-    
+
     /**
      * @private
      * Increases or decreases the editor's font size.
      * @param {number} adjustment  Negative number to make the font smaller; positive number to make it bigger
-     * @return {boolean} true if adjustment occurred, false if it did not occur 
+     * @return {boolean} true if adjustment occurred, false if it did not occur
      */
     function _adjustFontSize(adjustment) {
         var fsStyle   = $(".CodeMirror").css("font-size"),
             validFont = /^[\d\.]+(px|em)$/;
-        
+
         // Make sure that the font size is expressed in terms we can handle (px or em). If not, simply bail.
         if (fsStyle.search(validFont) === -1) {
             return false;
         }
-        
+
         // Guaranteed to work by the validation above.
         var fsUnits = fsStyle.substring(fsStyle.length - 2, fsStyle.length),
             delta   = fsUnits === "px" ? 1 : 0.1,
@@ -161,30 +162,30 @@ define(function (require, exports, module) {
         if (fsNew < MIN_FONT_SIZE * delta || fsNew > MAX_FONT_SIZE * delta) {
             return false;
         }
-        
+
         _setSizeAndRestoreScroll(fsStr);
         PreferencesManager.setViewState("fontSizeStyle", fsStr);
-        
+
         return true;
     }
-    
+
     /** Increases the font size by 1 */
     function _handleIncreaseFontSize() {
         _adjustFontSize(1);
     }
-    
+
     /** Decreases the font size by 1 */
     function _handleDecreaseFontSize() {
         _adjustFontSize(-1);
     }
-    
+
     /** Restores the font size to the original size */
     function _handleRestoreFontSize() {
         _setSizeAndRestoreScroll();
         PreferencesManager.setViewState("fontSizeStyle");
     }
-    
-    
+
+
     /**
      * @private
      * Updates the user interface appropriately based on whether or not a document is
@@ -205,7 +206,7 @@ define(function (require, exports, module) {
             CommandManager.get(Commands.VIEW_RESTORE_FONT_SIZE).setEnabled(false);
         }
     }
-    
+
     /**
      * Restores the font size using the saved style and migrates the old fontSizeAdjustment
      * view state to the new fontSizeStyle, when required
@@ -230,9 +231,9 @@ define(function (require, exports, module) {
             _addDynamicFontSize(fsStyle);
         }
     }
-    
-    
-    
+
+
+
     /**
      * @private
      * Calculates the first and last visible lines of the focused editor
@@ -244,14 +245,14 @@ define(function (require, exports, module) {
     function _getLinesInView(textHeight, scrollTop, editorHeight) {
         var scrolledTop    = scrollTop / textHeight,
             scrolledBottom = (scrollTop + editorHeight) / textHeight;
-        
+
         // Adjust the last line to round inward to show a whole lines.
         var firstLine      = Math.ceil(scrolledTop),
             lastLine       = Math.floor(scrolledBottom) - 1;
-        
+
         return { first: firstLine, last: lastLine };
     }
-    
+
     /**
      * @private
      * Scroll the viewport one line up or down.
@@ -268,57 +269,62 @@ define(function (require, exports, module) {
             editorHeight  = scrollInfo.clientHeight,
             scrollTop     = scrollInfo.top - paddingTop,
             removedScroll = paddingTop;
-        
-        // Go through all the editors and reduce the scroll top and editor height to properly calculate the lines in view 
+
+        // Go through all the editors and reduce the scroll top and editor height to properly calculate the lines in view
         var line, coords;
         inlineEditors.forEach(function (inlineEditor) {
             line   = editor._getInlineWidgetLineNumber(inlineEditor);
             coords = editor._codeMirror.charCoords({line: line, ch: 0}, "local");
-            
+
             if (coords.top < scrollInfo.top) {
                 scrollTop     -= inlineEditor.info.height;
                 removedScroll += inlineEditor.info.height;
-            
+
             } else if (coords.top + inlineEditor.info.height < scrollInfo.top + editorHeight) {
                 editorHeight -= inlineEditor.info.height;
             }
         });
-        
+
         // Calculate the lines in view
         var linesInView = _getLinesInView(textHeight, scrollTop, editorHeight);
-        
+
         // If there is no selection move the cursor so that is always visible.
         if (!hasSelecction) {
             // Move the cursor to the first visible line.
             if (cursorPos.line < linesInView.first) {
                 editor.setCursorPos({line: linesInView.first + direction, ch: cursorPos.ch});
-            
+
             // Move the cursor to the last visible line.
             } else if (cursorPos.line > linesInView.last) {
                 editor.setCursorPos({line: linesInView.last + direction, ch: cursorPos.ch});
-            
+
             // Move the cursor up or down using moveV to keep the goal column intact, since setCursorPos deletes it.
             } else if ((direction > 0 && cursorPos.line === linesInView.first) ||
                     (direction < 0 && cursorPos.line === linesInView.last)) {
                 editor._codeMirror.moveV(direction, "line");
             }
         }
-        
+
         // Scroll and make it snap to lines
         var lines = linesInView.first + direction;
         editor.setScrollPos(scrollInfo.left, (textHeight * lines) + removedScroll);
     }
-    
+
     /** Scrolls one line up */
     function _handleScrollLineUp() {
         _scrollLine(-1);
     }
-    
+
     /** Scrolls one line down */
     function _handleScrollLineDown() {
         _scrollLine(1);
     }
-    
+
+    /** Open theme settings dialog */
+    function _handleThemeSettings() {
+        ThemeSettings.showDialog();
+    }
+
     /**
      * @private
      * Convert the old "fontSizeAdjustment" preference to the new view state.
@@ -332,13 +338,14 @@ define(function (require, exports, module) {
     function _convertToNewViewState(key, value) {
         return { "fontSizeStyle": (DEFAULT_FONT_SIZE + value) + "px" };
     }
-    
+
     // Register command handlers
-    CommandManager.register(Strings.CMD_INCREASE_FONT_SIZE, Commands.VIEW_INCREASE_FONT_SIZE, _handleIncreaseFontSize);
-    CommandManager.register(Strings.CMD_DECREASE_FONT_SIZE, Commands.VIEW_DECREASE_FONT_SIZE, _handleDecreaseFontSize);
-    CommandManager.register(Strings.CMD_RESTORE_FONT_SIZE,  Commands.VIEW_RESTORE_FONT_SIZE,  _handleRestoreFontSize);
-    CommandManager.register(Strings.CMD_SCROLL_LINE_UP,     Commands.VIEW_SCROLL_LINE_UP,     _handleScrollLineUp);
-    CommandManager.register(Strings.CMD_SCROLL_LINE_DOWN,   Commands.VIEW_SCROLL_LINE_DOWN,   _handleScrollLineDown);
+    CommandManager.register(Strings.CMD_INCREASE_FONT_SIZE, Commands.VIEW_INCREASE_FONT_SIZE,  _handleIncreaseFontSize);
+    CommandManager.register(Strings.CMD_DECREASE_FONT_SIZE, Commands.VIEW_DECREASE_FONT_SIZE,  _handleDecreaseFontSize);
+    CommandManager.register(Strings.CMD_RESTORE_FONT_SIZE,  Commands.VIEW_RESTORE_FONT_SIZE,   _handleRestoreFontSize);
+    CommandManager.register(Strings.CMD_SCROLL_LINE_UP,     Commands.VIEW_SCROLL_LINE_UP,      _handleScrollLineUp);
+    CommandManager.register(Strings.CMD_SCROLL_LINE_DOWN,   Commands.VIEW_SCROLL_LINE_DOWN,    _handleScrollLineDown);
+    CommandManager.register(Strings.CMD_THEMES,             Commands.CMD_THEMES_OPEN_SETTINGS, _handleThemeSettings);
 
     PreferencesManager.convertPreferences(module, {"fontSizeAdjustment": "user"}, true, _convertToNewViewState);
 
@@ -347,6 +354,6 @@ define(function (require, exports, module) {
 
     // Update UI when Brackets finishes loading
     AppInit.appReady(_updateUI);
-    
+
     exports.restoreFontSize = restoreFontSize;
 });

From 803c26f9c70b4081f2fb8830d0d2ba6c586d35a6 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 29 May 2014 14:42:25 -0400
Subject: [PATCH 36/96] Fixed issue with unnecessary reload of themes when
 opening a new document

---
 src/view/ThemeManager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index d74730024a8..47c7889fa6c 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -53,7 +53,7 @@ define(function (require, exports, module) {
         if(cm) {
             ThemeView.setDocumentMode(cm);
 
-            if(force === false) {
+            if(!force) {
                 ThemeView.updateThemes(cm);
                 refreshEditor(cm);
             }
@@ -250,7 +250,7 @@ define(function (require, exports, module) {
 
 
     $(EditorManager).on("activeEditorChange", function() {
-        refresh(true);
+        refresh();
     });
 
 

From fc498a87e364578f96bc5d286226334fbcbc1c90 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 29 May 2014 14:54:58 -0400
Subject: [PATCH 37/96] Chages to remove extra white spaces in expressions to
 follow Brackets coding style guidelines

---
 src/themes/FontCommandsManager.js |  2 +-
 src/view/ThemeManager.js          | 20 ++++++++++----------
 src/view/ThemeSettings.js         | 16 ++++++++--------
 src/view/ThemeView.js             |  8 ++++----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/themes/FontCommandsManager.js b/src/themes/FontCommandsManager.js
index 7dbbd84569d..e98d6ead4fe 100644
--- a/src/themes/FontCommandsManager.js
+++ b/src/themes/FontCommandsManager.js
@@ -16,7 +16,7 @@ define(function (require, exports, module) {
         PreferencesManager  = require("preferences/PreferencesManager"),
         prefs               = PreferencesManager.getExtensionPrefs("brackets-themes");
 
-    function updateThemeFontSize (evt, adjustment, fontSize /*, lineHeight*/) {
+    function updateThemeFontSize(evt, adjustment, fontSize /*, lineHeight*/) {
         prefs.set("fontSize", fontSize);
     }
 
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 47c7889fa6c..4e4432f0803 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -50,10 +50,10 @@ define(function (require, exports, module) {
 
         var cm = getCM();
 
-        if(cm) {
+        if (cm) {
             ThemeView.setDocumentMode(cm);
 
-            if(!force) {
+            if (!force) {
                 ThemeView.updateThemes(cm);
                 refreshEditor(cm);
             }
@@ -88,7 +88,7 @@ define(function (require, exports, module) {
         file.exists(function(err, exists) {
             var theme;
 
-            if(exists) {
+            if (exists) {
                 theme = new Theme(file, displayName);
                 _themes[theme.name] = theme;
                 ThemeSettings.setThemes(_themes);
@@ -96,13 +96,13 @@ define(function (require, exports, module) {
                 // For themes that are loaded after ThemeManager has been loaded,
                 // we should check if it the theme in the selected array so that
                 // we can determine if we need to trigger a refresh
-                if(currentThemes.indexOf(theme.name) !== -1) {
+                if (currentThemes.indexOf(theme.name) !== -1) {
                     refresh(true);
                 }
 
                 deferred.resolve(theme);
             }
-            else if(err) {
+            else if (err) {
                 deferred.reject(err);
             }
         });
@@ -126,7 +126,7 @@ define(function (require, exports, module) {
     function loadDirectory(path) {
         var result = new $.Deferred();
 
-        if(!path) {
+        if (!path) {
             return result.reject({
                 path: path,
                 error: "Path not defined"
@@ -143,7 +143,7 @@ define(function (require, exports, module) {
                 }
             }
 
-            if ( err ) {
+            if (err) {
                 result.reject({
                     path: path,
                     error: err
@@ -187,7 +187,7 @@ define(function (require, exports, module) {
     */
     function loadThemes(themes, refresh) {
         var pending = _.map(themes, function (theme) {
-            if ( theme ) {
+            if (theme) {
                 return theme.load(refresh);
             }
         });
@@ -258,7 +258,7 @@ define(function (require, exports, module) {
         var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
             theme = _themes[name];
 
-        if ( theme && theme.getFile().parentPath === file.parentPath ) {
+        if (theme && theme.getFile().parentPath === file.parentPath) {
             refresh(true);
         }
     });
@@ -275,7 +275,7 @@ define(function (require, exports, module) {
     * the whole workflow of loading an entire directory and also to show case themes in brackets :)
     */
     var cm_path = FileUtils.getNativeBracketsDirectoryPath() + "/thirdparty/CodeMirror2";
-    loadDirectory( cm_path + "/theme" );
+    loadDirectory(cm_path + "/theme");
 
 
     //
diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index 3e2ede6e13d..dbc65d241cc 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -71,17 +71,17 @@ define(function(require, exports, module) {
             .on("change", function() {
                 var $target = $(":selected", this);
                 var attr = $target.attr("data-target");
-                if ( attr ) {
+                if (attr) {
                     var items = $target.map(function(i, item) {return $(item).val();}).toArray();
-                    prefs.set( attr, items );
+                    prefs.set(attr, items);
                 }
             });
 
-        Dialogs.showModalDialogUsingTemplate($template).done(function( id ) {
-            if ( id === "save" ) {
-                for( var i in newSettings ) {
-                    if ( currentSettings.hasOwnProperty(i) ) {
-                        prefs.set( i, newSettings[i] );
+        Dialogs.showModalDialogUsingTemplate($template).done(function (id) {
+            if (id === "save") {
+                for (var i in newSettings) {
+                    if (currentSettings.hasOwnProperty(i)) {
+                        prefs.set(i, newSettings[i]);
                     }
                 }
             }
@@ -94,7 +94,7 @@ define(function(require, exports, module) {
     }
 
 
-    function getValues () {
+    function getValues() {
         return _.transform(arguments, function(result, value, key) {
             result[value] = prefs.get(value);
         });
diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
index c773baf0d16..7256c9f07cb 100644
--- a/src/view/ThemeView.js
+++ b/src/view/ThemeView.js
@@ -42,7 +42,7 @@ define(function (require, exports, module) {
     }
 
 
-    function updateFontType () {
+    function updateFontType() {
         clearFonts();
         var value = prefs.get("fontType");
         templates.$fontType.text(".CodeMirror{" + "font-family: " + value + " !important; }");
@@ -55,7 +55,7 @@ define(function (require, exports, module) {
     }
 
 
-    function updateFonts () {
+    function updateFonts() {
         clearFonts();
         updateLineHeight();
         updateFontSize();
@@ -65,7 +65,7 @@ define(function (require, exports, module) {
 
     function updateScrollbars(theme) {
         theme = theme || {};
-        if ( prefs.get("customScrollbars") ) {
+        if (prefs.get("customScrollbars")) {
             var scrollbar = (theme.scrollbar || []).join(" ");
             templates.$scrollbars.text(scrollbar || "");
         }
@@ -78,7 +78,7 @@ define(function (require, exports, module) {
     /**
     *  Handles updating codemirror with the current selection of themes.
     */
-    function updateThemes (cm) {
+    function updateThemes(cm) {
         var newThemes = (prefs.get("themes") || []).join(" "),
             cmThemes  = cm.getOption("theme").replace(/[\s]*/, " "); // Normalize themes string
 

From 796322a81dd8f7b6e4a51314dcdd2af065c84f2f Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 29 May 2014 15:39:20 -0400
Subject: [PATCH 38/96] Merge general settings and theme settings because there
 is only one tab in there.  No need for single tabbed views

---
 src/htmlContent/themes-settings.html   | 50 ++++++++++++++++++++++----
 src/styles/brackets_theme_settings.css |  5 ---
 src/view/ThemeSettings.js              |  9 ++---
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/src/htmlContent/themes-settings.html b/src/htmlContent/themes-settings.html
index b4251422eed..d6325b53d29 100644
--- a/src/htmlContent/themes-settings.html
+++ b/src/htmlContent/themes-settings.html
@@ -3,15 +3,51 @@
         <h1 class="dialog-title">Themes Settings</h1>
     </div>
     <div class="modal-body">
-        <div class="row">
-            <ul class="nav nav-pills nav-stacked span2" style="max-width: 100px;">
-                <li><a class="default" data-target="#generalSettings" data-toggle="tab">{{Strings.GENERAL}}</a></li>
-            </ul>
+        <form class="form-horizontal">
+            <div class="control-group">
+                <label class="control-label">{{Strings.CURRENT_THEME}}</label>
+                <div class="controls">
+                    <select>
+                        {{#themes}}
+                        <option style="text-align:left;" value="{{name}}" data-target="themes">{{displayName}}</option>
+                        {{/themes}}
+                    </select>
+                </div>
+            </div>
+
+            <div class="control-group">
+                <label class="control-label">{{Strings.CUSTOM_SCROLLBARS}}</label>
+                <div class="controls">
+                    {{#settings.customScrollbars}}
+                        <input type="checkbox" data-target="customScrollbars" checked>
+                    {{/settings.customScrollbars}}
+                    {{^settings.customScrollbars}}
+                        <input type="checkbox" data-target="customScrollbars">
+                    {{/settings.customScrollbars}}
+                </div>
+            </div>
+
+            <div class="control-group">
+                <label class="control-label">{{Strings.FONT_SIZE}}</label>
+                <div class="controls">
+                    <input type="text" data-target="fontSize" value="{{settings.fontSize}}">
+                </div>
+            </div>
+
+            <div class="control-group">
+                <label class="control-label">{{Strings.FONT_FAMILY}}</label>
+                <div class="controls">
+                    <input type="text" data-target="fontType" value="{{settings.fontType}}">
+                </div>
+            </div>
 
-            <div class="tab-content span6">
-                <div class="tab-pane active" id="generalSettings"></div>
+            <div class="control-group">
+                <label class="control-label">{{Strings.LINE_HEIGHT}}</label>
+                <div class="controls">
+                    <input type="text" data-target="lineHeight" value="{{settings.lineHeight}}">
+                </div>
             </div>
-        </div>
+        </form>
     </div>
     <div class="modal-footer">
         <a class="dialog-button btn cancel" data-button-id="cancel">{{Strings.CANCEL}}</a>
diff --git a/src/styles/brackets_theme_settings.css b/src/styles/brackets_theme_settings.css
index 74b498ca190..daeb0d93760 100644
--- a/src/styles/brackets_theme_settings.css
+++ b/src/styles/brackets_theme_settings.css
@@ -5,11 +5,6 @@
 .themeSettings .modal-body {
     min-height: 300px;
     max-height: 300px;
-    padding: 4px;
-}
-
-.themeSettings .row {
-    margin: 0px;
 }
 
 .themeSettings .label {
diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index dbc65d241cc..b9f8ba71899 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -21,9 +21,8 @@ define(function(require, exports, module) {
         "themes": ["default"]
     };
 
-    var tmpl = {
-        "settings": require("text!htmlContent/themes-settings.html"),
-        "general": require("text!htmlContent/themes-general.html")
+    var templates = {
+        "settings": require("text!htmlContent/themes-settings.html")
     };
 
     var _                  = require("thirdparty/lodash"),
@@ -35,9 +34,7 @@ define(function(require, exports, module) {
 
 
     // Setup all the templates so that we can easily render them with Mustache
-    var $settings = $(tmpl.settings).addClass("themeSettings");
-    $("#generalSettings", $settings).html(tmpl.general);
-
+    var $settings = $(templates.settings).addClass("themeSettings");
 
     function showDialog() {
         var currentSettings = getValues("themes", "fontSize", "fontType", "lineHeight", "customScrollbars");

From 2f944723db5cb8622789db716ea29d71ca75a17a Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 29 May 2014 15:39:41 -0400
Subject: [PATCH 39/96] Another style change

---
 src/themes/FontCommandsManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/FontCommandsManager.js b/src/themes/FontCommandsManager.js
index e98d6ead4fe..590a9bc7fa1 100644
--- a/src/themes/FontCommandsManager.js
+++ b/src/themes/FontCommandsManager.js
@@ -25,7 +25,7 @@ define(function (require, exports, module) {
             fontSizeNumeric = Number(fontSize.replace(/px|em/, "")),
             fontSizeOffset  = fontSizeNumeric - ThemeSettings.defaults.fontSize;
 
-        if(!isNaN(fontSizeOffset)) {
+        if (!isNaN(fontSizeOffset)) {
             PreferencesManager.setViewState("fontSizeAdjustment", fontSizeOffset);
             PreferencesManager.setViewState("fontSizeStyle", fontSize);
         }

From ff3c06583f7cbd6ed1d0381881481d7e2fb6870e Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 29 May 2014 16:44:51 -0400
Subject: [PATCH 40/96] Moving code mirror add ons back to brackets.js

---
 src/brackets.js               | 14 +++++++++-
 src/utils/CodeMirrorAddons.js | 52 -----------------------------------
 2 files changed, 13 insertions(+), 53 deletions(-)
 delete mode 100644 src/utils/CodeMirrorAddons.js

diff --git a/src/brackets.js b/src/brackets.js
index 88dedd915f2..d5a3712b31a 100644
--- a/src/brackets.js
+++ b/src/brackets.js
@@ -46,7 +46,19 @@ define(function (require, exports, module) {
     require("thirdparty/smart-auto-complete-local/jquery.smart_autocomplete");
 
     // Load CodeMirror add-ons--these attach themselves to the CodeMirror module
-    require("utils/CodeMirrorAddons");
+    require("thirdparty/CodeMirror2/addon/fold/xml-fold");
+    require("thirdparty/CodeMirror2/addon/edit/matchtags");
+    require("thirdparty/CodeMirror2/addon/edit/matchbrackets");
+    require("thirdparty/CodeMirror2/addon/edit/closebrackets");
+    require("thirdparty/CodeMirror2/addon/edit/closetag");
+    require("thirdparty/CodeMirror2/addon/scroll/scrollpastend");
+    require("thirdparty/CodeMirror2/addon/selection/active-line");
+    require("thirdparty/CodeMirror2/addon/selection/mark-selection");
+    require("thirdparty/CodeMirror2/addon/mode/multiplex");
+    require("thirdparty/CodeMirror2/addon/mode/overlay");
+    require("thirdparty/CodeMirror2/addon/search/match-highlighter");
+    require("thirdparty/CodeMirror2/addon/search/searchcursor");
+    require("thirdparty/CodeMirror2/keymap/sublime");
 
     // Load dependent modules
     var Global                  = require("utils/Global"),
diff --git a/src/utils/CodeMirrorAddons.js b/src/utils/CodeMirrorAddons.js
deleted file mode 100644
index 4a7bc974668..00000000000
--- a/src/utils/CodeMirrorAddons.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, CodeMirror */
-
-define(function(require) {
-    "use strict";
-
-    var CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror");
-
-    // Load CodeMirror add-ons--these attach themselves to the CodeMirror module
-    require("thirdparty/CodeMirror2/addon/fold/xml-fold");
-    require("thirdparty/CodeMirror2/addon/edit/matchtags");
-    require("thirdparty/CodeMirror2/addon/edit/matchbrackets");
-    require("thirdparty/CodeMirror2/addon/edit/closebrackets");
-    require("thirdparty/CodeMirror2/addon/edit/closetag");
-    require("thirdparty/CodeMirror2/addon/scroll/scrollpastend");
-    require("thirdparty/CodeMirror2/addon/selection/active-line");
-    require("thirdparty/CodeMirror2/addon/selection/mark-selection");
-    require("thirdparty/CodeMirror2/addon/mode/multiplex");
-    require("thirdparty/CodeMirror2/addon/mode/overlay");
-    require("thirdparty/CodeMirror2/addon/search/match-highlighter");
-    require("thirdparty/CodeMirror2/addon/search/searchcursor");
-    require("thirdparty/CodeMirror2/keymap/sublime");
-
-
-    CodeMirror.defaults.highlightSelectionMatches = true;
-    CodeMirror.defaults.styleSelectedText = true;
-
-});

From ab93c012d7a2dad4e332bd25813fc552c244ce7c Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 30 May 2014 21:44:29 -0400
Subject: [PATCH 41/96] Moved Theme to ThemeManager

---
 src/view/Theme.js        | 129 ---------------------------------------
 src/view/ThemeManager.js | 114 +++++++++++++++++++++++++++++++---
 2 files changed, 107 insertions(+), 136 deletions(-)
 delete mode 100644 src/view/Theme.js

diff --git a/src/view/Theme.js b/src/view/Theme.js
deleted file mode 100644
index 5985a8c0dcb..00000000000
--- a/src/view/Theme.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Brackets Themes Copyright (c) 2014 Miguel Castillo.
- *
- * Licensed under MIT
- */
-
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require, less */
-
-define(function () {
-    "use strict";
-
-    var FileSystem     = require("filesystem/FileSystem"),
-        FileUtils      = require("file/FileUtils"),
-        ExtensionUtils = require("utils/ExtensionUtils");
-
-    var commentRegex = /\/\*([\s\S]*?)\*\//mg,
-        scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg;
-
-    /**
-    *  Theme object to encasulate all the logic in one pretty bundle.
-    *  The theme will self register when it is created.
-    *
-    *  * Required settings are fileName and path
-    *
-    * @constructor
-    */
-    function Theme(file, displayName) {
-        var _self     = this,
-            fileName  = file.name;
-
-        _self.file        = file;
-        _self.displayName = displayName || toDisplayName(fileName);
-        _self.name        = fileName.substring(0, fileName.lastIndexOf('.'));
-        _self.className   = "theme-" + _self.name;
-    }
-
-
-    Theme.prototype.getFile = function() {
-        return this.file;
-    };
-
-
-    Theme.prototype.load = function(force) {
-        var theme = this;
-
-        if (theme.css && !force) {
-            return theme;
-        }
-
-        if (theme.css) {
-            $(theme.css).remove();
-        }
-
-        return FileUtils.readAsText(this.getFile())
-            .then(function(content) {
-                var result = extractScrollbars(content);
-                theme.scrollbar = result.scrollbar;
-                return result.content;
-            })
-            .then(function(content) {
-                return lessify(content, theme);
-            })
-            .then(function(style) {
-                return ExtensionUtils.addEmbeddedStyleSheet(style);
-            })
-            .then(function(styleNode) {
-                theme.css = styleNode;
-                return theme;
-            })
-            .promise();
-    };
-
-
-    /**
-    *  Takes all dashes and converts them to white spaces...
-    *  Then takes all first letters and capitalizes them.
-    */
-    function toDisplayName (name) {
-        name = name.substring(0, name.lastIndexOf('.')).replace(/-/g, ' ');
-        var parts = name.split(" ");
-
-        $.each(parts.slice(0), function (index, part) {
-            parts[index] = part[0].toUpperCase() + part.substring(1);
-        });
-
-        return parts.join(" ");
-    }
-
-
-    function extractScrollbars(content) {
-        var scrollbar = [];
-
-        // Go through and extract out scrollbar customizations so that we can
-        // enable/disable via settings.
-        content = content
-            .replace(commentRegex, "")
-            .replace(scrollbarsRegex, function(match) {
-                scrollbar.push(match);
-                return "";
-            });
-
-        return {
-            content: content,
-            scrollbar: scrollbar
-        };
-    }
-
-
-    function lessify(content, theme) {
-        var deferred = $.Deferred(),
-            parser = new less.Parser();
-
-        parser.parse("." + theme.className + "{" + content + "}", function (err, tree) {
-            if (err) {
-                deferred.reject(err);
-            }
-            else {
-                deferred.resolve(tree.toCSS());
-            }
-        });
-
-        return deferred.promise();
-    }
-
-
-    return Theme;
-});
-
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 4e4432f0803..4370f335819 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -6,7 +6,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global $, define, require */
+/*global $, define, require, less */
 
 define(function (require, exports, module) {
     "use strict";
@@ -19,25 +19,125 @@ define(function (require, exports, module) {
         FileUtils          = require("file/FileUtils"),
         EditorManager      = require("editor/EditorManager"),
         ExtensionUtils     = require("utils/ExtensionUtils"),
-        Theme              = require("view/Theme"),
         ThemeSettings      = require("view/ThemeSettings"),
         ThemeView          = require("view/ThemeView"),
         AppInit            = require("utils/AppInit"),
         PreferencesManager = require("preferences/PreferencesManager"),
         prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
 
+    var _themes         = {},
+        appReady        = false,
+        commentRegex    = /\/\*([\s\S]*?)\*\//mg,
+        scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg,
+        validExtensions = ["css", "less"];
+
+
     // Load up reset.css to override brackground settings from brackets because
     // they make the themes look really bad.
     ExtensionUtils.addLinkedStyleSheet("themes/reset.css");
     ExtensionUtils.addLinkedStyleSheet("styles/brackets_theme_settings.css");
 
-    var appReady = false;
 
-    // Bucket with all fully resolved theme objects.
-    var _themes = {};
+    /**
+    * @constructor
+    */
+    function Theme(file, displayName) {
+        var _self     = this,
+            fileName  = file.name;
+
+        _self.file        = file;
+        _self.displayName = displayName || toDisplayName(fileName);
+        _self.name        = fileName.substring(0, fileName.lastIndexOf('.'));
+        _self.className   = "theme-" + _self.name;
+    }
+
+
+    Theme.prototype.getFile = function() {
+        return this.file;
+    };
+
+
+    Theme.prototype.load = function(force) {
+        var theme = this;
+
+        if (theme.css && !force) {
+            return theme;
+        }
+
+        if (theme.css) {
+            $(theme.css).remove();
+        }
+
+        return FileUtils.readAsText(this.getFile())
+            .then(function(content) {
+                var result = extractScrollbars(content);
+                theme.scrollbar = result.scrollbar;
+                return result.content;
+            })
+            .then(function(content) {
+                return lessifyTheme(content, theme);
+            })
+            .then(function(style) {
+                return ExtensionUtils.addEmbeddedStyleSheet(style);
+            })
+            .then(function(styleNode) {
+                theme.css = styleNode;
+                return theme;
+            })
+            .promise();
+    };
+
+
+    /**
+    *  Takes all dashes and converts them to white spaces...
+    *  Then takes all first letters and capitalizes them.
+    */
+    function toDisplayName (name) {
+        name = name.substring(0, name.lastIndexOf('.')).replace(/-/g, ' ');
+        var parts = name.split(" ");
+
+        $.each(parts.slice(0), function (index, part) {
+            parts[index] = part[0].toUpperCase() + part.substring(1);
+        });
 
-    // Valid theme file extensions
-    var validExtensions = ["css", "less"];
+        return parts.join(" ");
+    }
+
+
+    function extractScrollbars(content) {
+        var scrollbar = [];
+
+        // Go through and extract out scrollbar customizations so that we can
+        // enable/disable via settings.
+        content = content
+            .replace(commentRegex, "")
+            .replace(scrollbarsRegex, function(match) {
+                scrollbar.push(match);
+                return "";
+            });
+
+        return {
+            content: content,
+            scrollbar: scrollbar
+        };
+    }
+
+
+    function lessifyTheme(content, theme) {
+        var deferred = $.Deferred(),
+            parser = new less.Parser();
+
+        parser.parse("." + theme.className + "{" + content + "}", function (err, tree) {
+            if (err) {
+                deferred.reject(err);
+            }
+            else {
+                deferred.resolve(tree.toCSS());
+            }
+        });
+
+        return deferred.promise();
+    }
 
 
     /**

From 1d812288da9745dafa1fba7212d1770e75c7ddd8 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sat, 31 May 2014 22:34:35 -0400
Subject: [PATCH 42/96] Corrected issue with documents not getting properly
 styles with a theme

---
 src/view/ThemeManager.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 4370f335819..d79b2fa6ae1 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -26,7 +26,7 @@ define(function (require, exports, module) {
         prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
 
     var _themes         = {},
-        appReady        = false,
+        themeReady      = false,
         commentRegex    = /\/\*([\s\S]*?)\*\//mg,
         scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg,
         validExtensions = ["css", "less"];
@@ -144,7 +144,7 @@ define(function (require, exports, module) {
     * Refresh currently load theme
     */
     function refresh(force) {
-        if (!appReady) {
+        if (!themeReady) {
             return;
         }
 
@@ -348,12 +348,6 @@ define(function (require, exports, module) {
         ThemeView.updateFontType();
     });
 
-
-    $(EditorManager).on("activeEditorChange", function() {
-        refresh();
-    });
-
-
     FileSystem.on("change", function(evt, file) {
         var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
             theme = _themes[name];
@@ -363,10 +357,16 @@ define(function (require, exports, module) {
         }
     });
 
+    $(EditorManager).on("activeEditorChange", function() {
+        refresh();
+    });
 
+    // When the app is ready, we need to try to load whatever theme needs to be processed
     AppInit.appReady(function() {
-        appReady = true;
-        refresh(true);
+        loadThemes(getThemes(), true).done(function(){
+            themeReady = true;
+            refresh(true);
+        });
     });
 
 

From 8d94e86eb408269c02b4ace25db657ba9dac5ccc Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sat, 31 May 2014 22:37:01 -0400
Subject: [PATCH 43/96] Removed force reload when appReady is resolved

---
 src/view/ThemeManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index d79b2fa6ae1..68bcaf1a909 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -365,7 +365,7 @@ define(function (require, exports, module) {
     AppInit.appReady(function() {
         loadThemes(getThemes(), true).done(function(){
             themeReady = true;
-            refresh(true);
+            refresh();
         });
     });
 

From 78343180f3cfd2ec279acdda4bd69e8b4164815b Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 1 Jun 2014 11:50:43 -0400
Subject: [PATCH 44/96] Refactored ThemeManager to merge several functions to
 make the code a bit more readable.

---
 src/view/ThemeManager.js | 250 ++++++++++++++++++---------------------
 1 file changed, 116 insertions(+), 134 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 68bcaf1a909..d3b9aa0b58c 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -42,55 +42,19 @@ define(function (require, exports, module) {
     * @constructor
     */
     function Theme(file, displayName) {
-        var _self     = this,
-            fileName  = file.name;
+        var fileName = file.name;
 
-        _self.file        = file;
-        _self.displayName = displayName || toDisplayName(fileName);
-        _self.name        = fileName.substring(0, fileName.lastIndexOf('.'));
-        _self.className   = "theme-" + _self.name;
+        this.file        = file;
+        this.displayName = displayName || toDisplayName(fileName);
+        this.name        = fileName.substring(0, fileName.lastIndexOf('.'));
+        this.className   = "theme-" + this.name;
     }
 
 
-    Theme.prototype.getFile = function() {
-        return this.file;
-    };
-
-
-    Theme.prototype.load = function(force) {
-        var theme = this;
-
-        if (theme.css && !force) {
-            return theme;
-        }
-
-        if (theme.css) {
-            $(theme.css).remove();
-        }
-
-        return FileUtils.readAsText(this.getFile())
-            .then(function(content) {
-                var result = extractScrollbars(content);
-                theme.scrollbar = result.scrollbar;
-                return result.content;
-            })
-            .then(function(content) {
-                return lessifyTheme(content, theme);
-            })
-            .then(function(style) {
-                return ExtensionUtils.addEmbeddedStyleSheet(style);
-            })
-            .then(function(styleNode) {
-                theme.css = styleNode;
-                return theme;
-            })
-            .promise();
-    };
-
-
     /**
-    *  Takes all dashes and converts them to white spaces...
-    *  Then takes all first letters and capitalizes them.
+    * @private
+    * Takes all dashes and converts them to white spaces...
+    * Then takes all first letters and capitalizes them.
     */
     function toDisplayName (name) {
         name = name.substring(0, name.lastIndexOf('.')).replace(/-/g, ' ');
@@ -104,6 +68,12 @@ define(function (require, exports, module) {
     }
 
 
+    /**
+    * @private
+    * Extracts the scrollbar text from the css/less content so that it can be treated
+    * as a separate styling component that can be anabled/disabled independently from
+    * the theme.
+    */
     function extractScrollbars(content) {
         var scrollbar = [];
 
@@ -123,6 +93,11 @@ define(function (require, exports, module) {
     }
 
 
+    /**
+    * @private
+    * Takes the content of a file and feeds it through the less processor in order
+    * to provide support for less files.
+    */
     function lessifyTheme(content, theme) {
         var deferred = $.Deferred(),
             parser = new less.Parser();
@@ -140,43 +115,99 @@ define(function (require, exports, module) {
     }
 
 
+    function isFileTypeValid(file) {
+        return file.isFile &&
+            validExtensions.indexOf(FileUtils.getFileExtension(file.name)) !== -1;
+    }
+
+
     /**
-    * Refresh currently load theme
+    * @private
+    * Will trigger a refresh of codemirror instance and editor resize so that
+    * inline widgets get properly
     */
-    function refresh(force) {
-        if (!themeReady) {
-            return;
-        }
-
-        var cm = getCM();
+    function refreshEditor(cm) {
+        // Really dislike timing issues with CodeMirror.  I have to refresh
+        // the editor after a little bit of time to make sure that themes
+        // are properly applied to quick edit widgets
+        setTimeout(function(){
+            cm.refresh();
+            EditorManager.resizeEditor();
+        }, 100);
+    }
 
-        if (cm) {
-            ThemeView.setDocumentMode(cm);
 
-            if (!force) {
-                ThemeView.updateThemes(cm);
-                refreshEditor(cm);
-            }
-            else {
-                loadThemes(getThemes(), true).done(function() {
-                    ThemeView.updateThemes(cm);
-                    refreshEditor(cm);
-                });
+    /**
+    * Loads theme style files
+    */
+    function loadCurrentThemes() {
+        return $.when(undefined, _.map(getCurrentThemes(), function (theme) {
+            if (theme.css) {
+                $(theme.css).remove();
             }
-        }
+
+            return FileUtils.readAsText(theme.file)
+                .then(function(content) {
+                    var result = extractScrollbars(content);
+                    theme.scrollbar = result.scrollbar;
+                    return result.content;
+                })
+                .then(function(content) {
+                    return lessifyTheme(content, theme);
+                })
+                .then(function(style) {
+                    return ExtensionUtils.addEmbeddedStyleSheet(style);
+                })
+                .then(function(styleNode) {
+                    theme.css = styleNode;
+                    return theme;
+                })
+                .promise();
+        }));
     }
 
 
     /**
     * Returns all current theme objects
     */
-    function getThemes() {
+    function getCurrentThemes() {
         return _.map(prefs.get("themes").slice(0), function (item) {
             return _themes[item];
         });
     }
 
 
+    /**
+    * Refresh currently load theme
+    * @param <boolean> force is to cause the refresh to force reload the current themes
+    */
+    function refresh(force) {
+        if (!themeReady) {
+            return;
+        }
+
+        var editor = EditorManager.getActiveEditor();
+        if (!editor || !editor._codeMirror) {
+            return;
+        }
+
+        var cm =  editor._codeMirror;
+
+        ThemeView.setDocumentMode(cm);
+
+        if (!force) {
+            ThemeView.updateThemes(cm);
+            refreshEditor(cm);
+        }
+        else {
+            loadCurrentThemes().done(function() {
+                ThemeView.updateThemes(cm);
+                refreshEditor(cm);
+            });
+        }
+    }
+
+
     /**
     * Loads a theme from a file. fileName is the full path to the file
     */
@@ -194,8 +225,8 @@ define(function (require, exports, module) {
                 ThemeSettings.setThemes(_themes);
 
                 // For themes that are loaded after ThemeManager has been loaded,
-                // we should check if it the theme in the selected array so that
-                // we can determine if we need to trigger a refresh
+                // we should check if it's the current theme.  It is, then we just
+                // load it.
                 if (currentThemes.indexOf(theme.name) !== -1) {
                     refresh(true);
                 }
@@ -212,7 +243,7 @@ define(function (require, exports, module) {
 
 
     /**
-    * Loads a theme from a file. fileName is the full path to the file
+    * Loads a theme from a file.
     */
     function loadPackage(themePackage) {
         var fileName = themePackage.path + "/" + themePackage.metadata.theme;
@@ -257,80 +288,31 @@ define(function (require, exports, module) {
             }
         }
 
+        function loadThemesFiles(themes) {
+            // Iterate through each name in the themes and make them theme objects
+            var deferred = _.map(themes.files, function (themeFile) {
+                return loadFile(themes.path + "/" + themeFile);
+            });
+
+            return $.when.apply(undefined, deferred);
+        }
 
         FileSystem.getDirectoryForPath(path).getContents(readContent);
         return result.then(loadThemesFiles).promise();
     }
 
 
-    function isFileTypeValid(file) {
-        return file.isFile &&
-            validExtensions.indexOf(FileUtils.getFileExtension(file.name)) !== -1;
-    }
-
-
-    /**
-    * Process theme meta deta to create theme instances
-    */
-    function loadThemesFiles(themes) {
-        // Iterate through each name in the themes and make them theme objects
-        var deferred = _.map(themes.files, function (themeFile) {
-            return loadFile(themes.path + "/" + themeFile);
-        });
-
-        return $.when.apply(undefined, deferred);
-    }
-
-
-    /**
-    * Loads theme style files
-    */
-    function loadThemes(themes, refresh) {
-        var pending = _.map(themes, function (theme) {
-            if (theme) {
-                return theme.load(refresh);
-            }
-        });
-
-        return $.when.apply(undefined, pending);
-    }
-
-
-    /**
-    * Will trigger a refresh of codemirror instance and editor resize so that
-    * inline widgets get properly
-    */
-    function refreshEditor(cm) {
-        // Really dislike timing issues with CodeMirror.  I have to refresh
-        // the editor after a little bit of time to make sure that themes
-        // are properly applied to quick edit widgets
-        setTimeout(function(){
-            cm.refresh();
-            EditorManager.resizeEditor();
-        }, 100);
-    }
-
-
-    function getCM() {
-        var editor = EditorManager.getActiveEditor();
-        if (!editor || !editor._codeMirror) {
-            return;
-        }
-        return editor._codeMirror;
-    }
-
-
     prefs.on("change", "themes", function() {
         refresh(true);
-        ThemeView.updateScrollbars(getThemes()[0]);
+        ThemeView.updateScrollbars(getCurrentThemes()[0]);
 
         // Expose event for theme changes
-        $(exports).trigger("themeChange", getThemes());
+        $(exports).trigger("themeChange", getCurrentThemes());
     });
 
     prefs.on("change", "customScrollbars", function() {
         refresh();
-        ThemeView.updateScrollbars(getThemes()[0]);
+        ThemeView.updateScrollbars(getCurrentThemes()[0]);
     });
 
     prefs.on("change", "fontSize", function() {
@@ -352,7 +334,7 @@ define(function (require, exports, module) {
         var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
             theme = _themes[name];
 
-        if (theme && theme.getFile().parentPath === file.parentPath) {
+        if (theme && theme.file.parentPath === file.parentPath) {
             refresh(true);
         }
     });
@@ -363,7 +345,7 @@ define(function (require, exports, module) {
 
     // When the app is ready, we need to try to load whatever theme needs to be processed
     AppInit.appReady(function() {
-        loadThemes(getThemes(), true).done(function(){
+        loadCurrentThemes().done(function(){
             themeReady = true;
             refresh();
         });
@@ -381,9 +363,9 @@ define(function (require, exports, module) {
     //
     // Exposed API
     //
-    exports.refresh       = refresh;
-    exports.loadFile      = loadFile;
-    exports.loadPackage   = loadPackage;
-    exports.loadDirectory = loadDirectory;
-    exports.getThemes     = getThemes;
+    exports.refresh          = refresh;
+    exports.loadFile         = loadFile;
+    exports.loadPackage      = loadPackage;
+    exports.loadDirectory    = loadDirectory;
+    exports.getCurrentThemes = getCurrentThemes;
 });

From 280c83e56917ff2cf5584d9744fd0a9b032c44f2 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 1 Jun 2014 23:23:54 -0400
Subject: [PATCH 45/96] Added documentation to ThemeManager.js

---
 src/view/ThemeManager.js | 53 +++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index d3b9aa0b58c..dc4a2c6657a 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -40,6 +40,9 @@ define(function (require, exports, module) {
 
     /**
     * @constructor
+    *
+    * @param {File} file for the theme
+    * @param {string} displayName is an optional parameter used as the display name for the theme
     */
     function Theme(file, displayName) {
         var fileName = file.name;
@@ -53,8 +56,11 @@ define(function (require, exports, module) {
 
     /**
     * @private
-    * Takes all dashes and converts them to white spaces...
-    * Then takes all first letters and capitalizes them.
+    * Takes all dashes and converts them to white spaces. Then takes all first letters
+    * and capitalizes them.
+    *
+    * @param {string} name is what needs to be procseed to generate a display name
+    * @return {string} theme name properly formatted for display
     */
     function toDisplayName (name) {
         name = name.substring(0, name.lastIndexOf('.')).replace(/-/g, ' ');
@@ -73,6 +79,10 @@ define(function (require, exports, module) {
     * Extracts the scrollbar text from the css/less content so that it can be treated
     * as a separate styling component that can be anabled/disabled independently from
     * the theme.
+    *
+    * @param {string} content is the css/less input string to be processed
+    * @return {{content: string, scrollbar: string}} content is the new css/less content
+    * with the scrollbar rules extracted out and put in scrollbar
     */
     function extractScrollbars(content) {
         var scrollbar = [];
@@ -97,6 +107,10 @@ define(function (require, exports, module) {
     * @private
     * Takes the content of a file and feeds it through the less processor in order
     * to provide support for less files.
+    *
+    * @param {string} content is the css/less string to be processed
+    * @param {Theme} theme is the object the css/less corresponds to
+    * @return {$.Deferred} promsie with the processed css/less as the resolved value
     */
     function lessifyTheme(content, theme) {
         var deferred = $.Deferred(),
@@ -124,7 +138,9 @@ define(function (require, exports, module) {
     /**
     * @private
     * Will trigger a refresh of codemirror instance and editor resize so that
-    * inline widgets get properly
+    * inline widgets get properly rendered
+    *
+    * @param {CodeMiror} cm code mirror instance to refresh
     */
     function refreshEditor(cm) {
         // Really dislike timing issues with CodeMirror.  I have to refresh
@@ -138,7 +154,11 @@ define(function (require, exports, module) {
 
 
     /**
-    * Loads theme style files
+    * @private
+    * Loads all current themes
+    *
+    * @return {$.Deferred} promise object resolved with the theme object and all
+    *    corresponding new css/less and scrollbar information
     */
     function loadCurrentThemes() {
         return $.when(undefined, _.map(getCurrentThemes(), function (theme) {
@@ -168,7 +188,10 @@ define(function (require, exports, module) {
 
 
     /**
-    * Returns all current theme objects
+    * @private
+    * Get all current theme objects
+    *
+    * @return {_.map} collection of the current theme instances
     */
     function getCurrentThemes() {
         return _.map(prefs.get("themes").slice(0), function (item) {
@@ -178,8 +201,9 @@ define(function (require, exports, module) {
 
 
     /**
-    * Refresh currently load theme
-    * @param <boolean> force is to cause the refresh to force reload the current themes
+    * Refresh currently loaded themes
+    *
+    * @param <boolean> force is to force reload the current themes
     */
     function refresh(force) {
         if (!themeReady) {
@@ -209,7 +233,12 @@ define(function (require, exports, module) {
 
 
     /**
-    * Loads a theme from a file. fileName is the full path to the file
+    * Loads a theme from a file.
+    *
+    * @param {string} fileName is the full path to the file to be opened
+    * @param {!srting} displayName is an optional parameter to specify the display
+    *    name for the theme
+    * @return {$.Deferred} promise object resolved with the theme to be loaded from fileName
     */
     function loadFile(fileName, displayName) {
         var deferred      = new $.Deferred(),
@@ -243,7 +272,10 @@ define(function (require, exports, module) {
 
 
     /**
-    * Loads a theme from a file.
+    * Loads a theme from an extension package.
+    *
+    * @param {package} themePackage is a package for the theme to be loaded.
+    * @return {$.Deferred} promise object resolved with the theme to be loaded from the pacakge
     */
     function loadPackage(themePackage) {
         var fileName = themePackage.path + "/" + themePackage.metadata.theme;
@@ -253,6 +285,9 @@ define(function (require, exports, module) {
 
     /**
     * Load css/less files from a directory to be treated as themes
+    *
+    * @param {string} path where theme files are to be loaded from
+    * @return {$.Deferred} promise object resolved with the themes to be loaded from the directory
     */
     function loadDirectory(path) {
         var result = new $.Deferred();

From 72f6354202ea2bb4fa59942c7e1d05b7ec9392ec Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Tue, 3 Jun 2014 16:25:30 -0400
Subject: [PATCH 46/96] Adding comment I mistakenly changed

---
 src/utils/ExtensionLoader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js
index 9c6ee8a1c88..b70ce093fc7 100644
--- a/src/utils/ExtensionLoader.js
+++ b/src/utils/ExtensionLoader.js
@@ -143,7 +143,7 @@ define(function (require, exports, module) {
     }
     
     /**
-     * Loads the extension that lives at baseUrl
+     * Loads the extension that lives at baseUrl into its own Require.js context
      *
      * @param {!string} name, used to identify the extension
      * @param {!{baseUrl: string}} config object with baseUrl property containing absolute path of extension

From 43ed1379d19408c898749a45beda6de46d70d656 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 5 Jun 2014 11:49:57 -0400
Subject: [PATCH 47/96] Fixed issue where themes that no longer existed would
 cause the theme loader to completely fail.  Also Added better handling for
 theme names that's not strictly based on the name of the file

---
 src/view/ThemeManager.js | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index dc4a2c6657a..96ae5de5fd0 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -31,26 +31,22 @@ define(function (require, exports, module) {
         scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg,
         validExtensions = ["css", "less"];
 
-
-    // Load up reset.css to override brackground settings from brackets because
-    // they make the themes look really bad.
-    ExtensionUtils.addLinkedStyleSheet("themes/reset.css");
     ExtensionUtils.addLinkedStyleSheet("styles/brackets_theme_settings.css");
 
-
     /**
     * @constructor
     *
     * @param {File} file for the theme
     * @param {string} displayName is an optional parameter used as the display name for the theme
     */
-    function Theme(file, displayName) {
+    function Theme(file, options) {
+        options = options || {};
         var fileName = file.name;
 
         this.file        = file;
-        this.displayName = displayName || toDisplayName(fileName);
-        this.name        = fileName.substring(0, fileName.lastIndexOf('.'));
-        this.className   = "theme-" + this.name;
+        this.displayName = options.title     || toDisplayName(fileName);
+        this.name        = options.name      || fileName.substring(0, fileName.lastIndexOf('.'));
+        this.className   = options.className || "theme-" + this.name;
     }
 
 
@@ -162,6 +158,10 @@ define(function (require, exports, module) {
     */
     function loadCurrentThemes() {
         return $.when(undefined, _.map(getCurrentThemes(), function (theme) {
+            if (!theme) {
+                return $.Deferred().reject("Theme not found");
+            }
+
             if (theme.css) {
                 $(theme.css).remove();
             }
@@ -176,6 +176,7 @@ define(function (require, exports, module) {
                     return lessifyTheme(content, theme);
                 })
                 .then(function(style) {
+                    console.log(style);
                     return ExtensionUtils.addEmbeddedStyleSheet(style);
                 })
                 .then(function(styleNode) {
@@ -240,7 +241,8 @@ define(function (require, exports, module) {
     *    name for the theme
     * @return {$.Deferred} promise object resolved with the theme to be loaded from fileName
     */
-    function loadFile(fileName, displayName) {
+    function loadFile(fileName, options) {
+        options = options || {};
         var deferred      = new $.Deferred(),
             file          = FileSystem.getFileForPath(fileName),
             currentThemes = (prefs.get("themes") || []);
@@ -249,7 +251,7 @@ define(function (require, exports, module) {
             var theme;
 
             if (exists) {
-                theme = new Theme(file, displayName);
+                theme = new Theme(file, options);
                 _themes[theme.name] = theme;
                 ThemeSettings.setThemes(_themes);
 
@@ -279,7 +281,7 @@ define(function (require, exports, module) {
     */
     function loadPackage(themePackage) {
         var fileName = themePackage.path + "/" + themePackage.metadata.theme;
-        return loadFile(fileName, themePackage.metadata.title);
+        return loadFile(fileName, themePackage.metadata);
     }
 
 
@@ -380,10 +382,13 @@ define(function (require, exports, module) {
 
     // When the app is ready, we need to try to load whatever theme needs to be processed
     AppInit.appReady(function() {
-        loadCurrentThemes().done(function(){
-            themeReady = true;
-            refresh();
-        });
+        loadCurrentThemes()
+            .always(function() {
+                themeReady = true;
+            })
+            .done(function(){
+                refresh();
+            });
     });
 
 

From 1c058054afc7edbf15beba69777aac793b51ac29 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 5 Jun 2014 11:52:47 -0400
Subject: [PATCH 48/96] Removed temp code to load all code mirror themes

---
 src/view/ThemeManager.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 96ae5de5fd0..df67b17d252 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -391,15 +391,6 @@ define(function (require, exports, module) {
             });
     });
 
-
-    /**
-    * TODO: remove temporary code to load all themes from CodeMirror.  This is just to test
-    * the whole workflow of loading an entire directory and also to show case themes in brackets :)
-    */
-    var cm_path = FileUtils.getNativeBracketsDirectoryPath() + "/thirdparty/CodeMirror2";
-    loadDirectory(cm_path + "/theme");
-
-
     //
     // Exposed API
     //

From ea1aab037703d1d32061746cb255dbaeb07efb9b Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 5 Jun 2014 12:07:19 -0400
Subject: [PATCH 49/96] Fixed issue with theme not being applied when set while
 no documents were open

---
 src/view/ThemeManager.js | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index df67b17d252..843a8dbae5a 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -211,25 +211,17 @@ define(function (require, exports, module) {
             return;
         }
 
-        var editor = EditorManager.getActiveEditor();
-        if (!editor || !editor._codeMirror) {
-            return;
-        }
-
-        var cm =  editor._codeMirror;
-
-        ThemeView.setDocumentMode(cm);
+        $.when(force && loadCurrentThemes()).done(function() {
+            var editor = EditorManager.getActiveEditor();
+            if (!editor || !editor._codeMirror) {
+                return;
+            }
 
-        if (!force) {
+            var cm =  editor._codeMirror;
+            ThemeView.setDocumentMode(cm);
             ThemeView.updateThemes(cm);
             refreshEditor(cm);
-        }
-        else {
-            loadCurrentThemes().done(function() {
-                ThemeView.updateThemes(cm);
-                refreshEditor(cm);
-            });
-        }
+        });
     }
 
 

From 1416cd904326d3b3dae5f589cb94821724be9383 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 5 Jun 2014 15:21:29 -0400
Subject: [PATCH 50/96] Remove old css file to avoid weird flashes when saving
 a theme

---
 src/view/ThemeManager.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 843a8dbae5a..a913cc25490 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -162,10 +162,6 @@ define(function (require, exports, module) {
                 return $.Deferred().reject("Theme not found");
             }
 
-            if (theme.css) {
-                $(theme.css).remove();
-            }
-
             return FileUtils.readAsText(theme.file)
                 .then(function(content) {
                     var result = extractScrollbars(content);
@@ -176,10 +172,14 @@ define(function (require, exports, module) {
                     return lessifyTheme(content, theme);
                 })
                 .then(function(style) {
-                    console.log(style);
                     return ExtensionUtils.addEmbeddedStyleSheet(style);
                 })
                 .then(function(styleNode) {
+                    // Remove after the style has been applied to avoid weird flashes
+                    if (theme.css) {
+                        $(theme.css).remove();
+                    }
+
                     theme.css = styleNode;
                     return theme;
                 })

From 8bfd51ef37d354f539700d6579b33a1ea29749ea Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 5 Jun 2014 18:48:11 -0400
Subject: [PATCH 51/96] Adjusted code mirror override to allow for themes to
 override the defined styling tokens

---
 src/styles/brackets_codemirror_override.less | 198 +++++++++---------
 src/themes/reset.css                         | 205 -------------------
 2 files changed, 102 insertions(+), 301 deletions(-)
 delete mode 100644 src/themes/reset.css

diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
index 4b5daa3eee3..4dcf5d83b2b 100644
--- a/src/styles/brackets_codemirror_override.less
+++ b/src/styles/brackets_codemirror_override.less
@@ -44,7 +44,7 @@
     .code-font-win();
 }
 
-@code-padding: 15px;
+@code-padding: 8px;
 
 .CodeMirror-activeline-background {
     background: transparent;
@@ -76,111 +76,117 @@
 }
 
 
-.cm-s-default {
-    span.cm-keyword {color: @accent-keyword;}
-    span.cm-atom {color: @accent-atom;}
-    span.cm-number {color: @accent-number;}
-    span.cm-def {color: @accent-def;}
-    span.cm-variable {color: @accent-variable;}
-    span.cm-variable-2 {color: @accent-variable-2;}
-    span.cm-variable-3 {color: @accent-variable-3;}
-    span.cm-property {color: @accent-property;}
-    span.cm-operator {color: @accent-operator;}
-    span.cm-comment {color: @accent-comment;}
-    span.cm-string {color: @accent-string;}
-    span.cm-string-2 {color: @accent-string-2;}
-    span.cm-meta {color: @accent-meta;}
-    span.cm-error {color: @accent-error;}
-    span.cm-qualifier {color: @accent-qualifier;}
-    span.cm-builtin {color: @accent-builtin;}
-    span.cm-bracket {color: @accent-bracket;}
-    span.cm-tag {color: @accent-tag;}
-    span.cm-attribute {color: @accent-attribute;}
-    span.cm-header {color: @accent-header;}
-    span.cm-quote {color: @accent-quote;}
-    span.cm-hr {color: @accent-hr;}
-    span.cm-link {color: @accent-link;}
-    span.cm-rangeinfo {color: @accent-rangeinfo;}
-    span.cm-minus {color: @accent-minus;}
-    span.cm-plus {color: @accent-plus;}
-    
-    span.CodeMirror-matchingbracket {color: @accent-bracket !important; background-color: @matching-bracket;}
-    span.CodeMirror-nonmatchingbracket {color: @accent-bracket !important;}
+span.cm-keyword {color: @accent-keyword;}
+span.cm-atom {color: @accent-atom;}
+span.cm-number {color: @accent-number;}
+span.cm-def {color: @accent-def;}
+span.cm-variable {color: @accent-variable;}
+span.cm-variable-2 {color: @accent-variable-2;}
+span.cm-variable-3 {color: @accent-variable-3;}
+span.cm-property {color: @accent-property;}
+span.cm-operator {color: @accent-operator;}
+span.cm-comment {color: @accent-comment;}
+span.cm-string {color: @accent-string;}
+span.cm-string-2 {color: @accent-string-2;}
+span.cm-meta {color: @accent-meta;}
+span.cm-error {color: @accent-error;}
+span.cm-qualifier {color: @accent-qualifier;}
+span.cm-builtin {color: @accent-builtin;}
+span.cm-bracket {color: @accent-bracket;}
+span.cm-tag {color: @accent-tag;}
+span.cm-attribute {color: @accent-attribute;}
+span.cm-header {color: @accent-header;}
+span.cm-quote {color: @accent-quote;}
+span.cm-hr {color: @accent-hr;}
+span.cm-link {color: @accent-link;}
+span.cm-rangeinfo {color: @accent-rangeinfo;}
+span.cm-minus {color: @accent-minus;}
+span.cm-plus {color: @accent-plus;}
 
-    .CodeMirror-cursors {
-        .CodeMirror-cursor {
-            .code-cursor();
-        }
+span.CodeMirror-matchingbracket {
+    color: @accent-bracket !important;
+    background-color: @matching-bracket;
+}
 
-        /* Ensure the cursor shows up in front of code spans with a background color
-         * (e.g. matchingbracket).
-         */
-        z-index: 3;
-    }
+span.CodeMirror-nonmatchingbracket {
+    color: @accent-bracket !important;
+}
 
-    .CodeMirror-lines {
-        padding: @code-padding 0;
-        
-        /* This is necessary for issue #2780. The logic for closing dropdowns depends on "click" events. Now
-         * that each line has a separate div element, there is a good chance that mouseDown and mouseUp events
-         * occur on different elements, which means a click event will not be sent. By disabling pointer events here,
-         * we are guaranteed that the mouse event will be captured by our parent div, and click events will 
-         * be dispatched.
-         */
-        pointer-events: none;
+.CodeMirror-cursors {
+    .CodeMirror-cursor {
+        .code-cursor();
     }
-    
-    .CodeMirror-linewidget {
-        /* Re-enable pointer events for line widget. Pointer events are disabled for "CodeMirror-lines", which is the
-         * parent of line widgets, so they need to be explicitly re-enabled here in order for selection to work. */
-        pointer-events: auto;
-    }
-    
-    .CodeMirror-gutters {
-        background-color: @background-color-3;
-        border-right: none;
+
+    /* Ensure the cursor shows up in front of code spans with a background color
+     * (e.g. matchingbracket).
+     */
+    z-index: 3;
+}
+
+.CodeMirror-lines {
+    padding: @code-padding 0;
+
+    /* This is necessary for issue #2780. The logic for closing dropdowns depends on "click" events. Now
+     * that each line has a separate div element, there is a good chance that mouseDown and mouseUp events
+     * occur on different elements, which means a click event will not be sent. By disabling pointer events here,
+     * we are guaranteed that the mouse event will be captured by our parent div, and click events will 
+     * be dispatched.
+     */
+    pointer-events: none;
+}
+
+.CodeMirror-linewidget {
+    /* Re-enable pointer events for line widget. Pointer events are disabled for "CodeMirror-lines", which is the
+     * parent of line widgets, so they need to be explicitly re-enabled here in order for selection to work. */
+    pointer-events: auto;
+}
+
+.CodeMirror-gutters {
+    background-color: @background-color-3;
+    border-right: none;
+}
+
+.platform-mac & {
+    .CodeMirror-scrollbar-filler {
+        background-image: url(images/scrollbar-mac-corner.png);
     }
-    
-    .platform-mac & {
-        .CodeMirror-scrollbar-filler {
-            background-image: url(images/scrollbar-mac-corner.png);
-        }
-        .CodeMirror-gutter-filler {
-            background-image: url(images/scrollbar-mac-bg.png);
-        }
+    .CodeMirror-gutter-filler {
+        background-image: url(images/scrollbar-mac-bg.png);
     }
-    .platform-win & {
-        .CodeMirror-scrollbar-filler,
-        .CodeMirror-gutter-filler {
-            background-color: @win-scrollbar-track;
-            height: 12px !important;
-        }
-        .CodeMirror-scrollbar-filler {
-            width: 12px !important;
-        }
+}
+.platform-win & {
+    .CodeMirror-scrollbar-filler,
+    .CodeMirror-gutter-filler {
+        background-color: @win-scrollbar-track;
+        height: 12px !important;
     }
-    .platform-linux & {
-        .CodeMirror-scrollbar-filler,
-        .CodeMirror-gutter-filler {
-            background-color: @background-color-3;
-            height: 12px !important;
-        }
-        .CodeMirror-scrollbar-filler {
-            width: 12px !important;
-        }
+    .CodeMirror-scrollbar-filler {
+        width: 12px !important;
     }
-    
-    .CodeMirror-linenumber {
-        color: @accent-comment;
-        min-width: 2.5em;
-        /*font-size: 0.9em;*/  /* restore after SourceCodePro font fix? */
-        padding: 0 @code-padding 0 10px;  /* left padding for project panel selection triangle */
+}
+.platform-linux & {
+    .CodeMirror-scrollbar-filler,
+    .CodeMirror-gutter-filler {
+        background-color: @background-color-3;
+        height: 12px !important;
     }
-    &.CodeMirror-focused .CodeMirror-selected {
-        background: @selection-color-focused;
+    .CodeMirror-scrollbar-filler {
+        width: 12px !important;
     }
 }
 
+.CodeMirror-linenumber {
+    color: @accent-comment;
+    /*font-size: 0.9em;*/  /* restore after SourceCodePro font fix? */
+    border-left: solid 10px transparent;
+    border-right: solid @code-padding transparent;
+    padding: 0px;
+}
+
+.CodeMirror-focused .CodeMirror-selected {
+    background: @selection-color-focused;
+}
+
 /*
     CodeMirror's use of descendant selectors for certain styling causes problems when editors are
     nested because, for items in the inner editor, the left-hand clause in the selector will now
@@ -216,10 +222,10 @@
         visibility: visible;
     }
     
-    .CodeMirror.cm-s-default .CodeMirror-selected {
+    .CodeMirror .CodeMirror-selected {
         background: @selection-color-unfocused;
     }
-    .CodeMirror.cm-s-default.CodeMirror-focused .CodeMirror-selected {
+    .CodeMirror.CodeMirror-focused .CodeMirror-selected {
         background: @selection-color-focused;
     }
     .CodeMirror .CodeMirror-gutters {
diff --git a/src/themes/reset.css b/src/themes/reset.css
deleted file mode 100644
index c3118ff479f..00000000000
--- a/src/themes/reset.css
+++ /dev/null
@@ -1,205 +0,0 @@
-.CodeMirror:not(.cm-s-default) .CodeMirror-scroll
-{
-    background-color: transparent;
-}
-
-.CodeMirror:not(.cm-s-default) .CodeMirror-activeline-background,
-.CodeMirror:not(.cm-s-default) .CodeMirror-activeline .CodeMirror-gutter-elt
-{
-    background-color: transparent !important;
-}
-
-.CodeMirror:not(.cm-s-default) .CodeMirror-activeline-background
-{
-    outline: 1px solid #dddddd;
-}
-
-.CodeMirror:not(.cm-s-default) .CodeMirror-matchingtag
-{
-    background: transparent;/*rgba(49, 49, 49, 0.9);*/
-}
-
-.CodeMirror:not(.cm-s-default) .CodeMirror-activeline .CodeMirror-gutter-elt
-{
-    z-index: 5;
-}
-
-.CodeMirror-cursors {
-    z-index: 5 !important;
-}
-
-
-/**
-* Overrides for CodeMirror themes.
-*/
-
-.CodeMirror.cm-s-light-table .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-monokai-dark-soda .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-nando .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-obsidian .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-
-.CodeMirror.cm-s-pixie .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-visual-studio-ex .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 1);
-}
-
-.CodeMirror.cm-s-visual-studio .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 1);
-}
-
-.CodeMirror.cm-s-zamiere .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-3024-day .CodeMirror-matchingtag
-{
-    background: rgba(93, 212, 124, 0.78);
-}
-
-.CodeMirror.cm-s-3024-night .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-ambiance .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-base16-dark .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.1);
-}
-
-.CodeMirror.cm-s-base16-light .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.7);
-}
-
-.CodeMirror.cm-s-blackboard .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-cobalt .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-eclipse .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 1);
-}
-
-.CodeMirror.cm-s-elegant .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 1);
-}
-
-.CodeMirror.cm-s-erlang-dark .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-lesser-dark .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-mbo .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-midnight .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.7);
-}
-
-.CodeMirror.cm-s-monokai .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.1);
-}
-
-.CodeMirror.cm-s-neat .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 1);
-}
-
-.CodeMirror.cm-s-night .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-paraiso-dark .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-paraiso-light .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 1);
-}
-
-.CodeMirror.cm-s-rubyblue .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-solarized.CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 1);
-}
-
-.CodeMirror.cm-s-the-matrix .CodeMirror-matchingtag
-{
-    background: rgba(0, 255, 0, 0.3);
-}
-
-.CodeMirror.cm-s-tomorrow-night-eighties .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-twilight .CodeMirror-matchingtag
-{
-    background: rgba(33, 96, 33, .8);
-}
-
-.CodeMirror.cm-s-vibrant-ink .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.3);
-}
-
-.CodeMirror.cm-s-xq-dark .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 0.5);
-}
-
-.CodeMirror.cm-s-xq-light .CodeMirror-matchingtag
-{
-    background: rgba(207, 234, 214, 1);
-}

From ef8b5cd263b709c3db00a970a74bf4dd6c1ba8eb Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 5 Jun 2014 21:09:39 -0400
Subject: [PATCH 52/96] Adding initial default themes. Thor Dark and Thor Light

---
 .../default/ThorDarkTheme/main.less           | 149 ++++++++++++++++++
 .../default/ThorDarkTheme/package.json        |  12 ++
 .../default/ThorLightTheme/main.less          | 149 ++++++++++++++++++
 .../default/ThorLightTheme/package.json       |  12 ++
 src/styles/brackets_codemirror_override.less  |   2 +-
 5 files changed, 323 insertions(+), 1 deletion(-)
 create mode 100644 src/extensions/default/ThorDarkTheme/main.less
 create mode 100644 src/extensions/default/ThorDarkTheme/package.json
 create mode 100644 src/extensions/default/ThorLightTheme/main.less
 create mode 100644 src/extensions/default/ThorLightTheme/package.json

diff --git a/src/extensions/default/ThorDarkTheme/main.less b/src/extensions/default/ThorDarkTheme/main.less
new file mode 100644
index 00000000000..d22d3df75ef
--- /dev/null
+++ b/src/extensions/default/ThorDarkTheme/main.less
@@ -0,0 +1,149 @@
+// Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// Style definitions are from
+// https://github.com/chriskempson/tomorrow-theme/tree/master/Brackets
+
+
+// Brackets-specific default font and color definitions
+@import url("styles/brackets_colors.less");
+
+// Default theme -- all UI styling comes from variables in a theme
+// Themes can rely on variables defined above
+@import url("styles/brackets_theme_default.less");
+
+// Include Codemirror styling overrides so that we can overrides proper values
+// for the theme.  If you need to customize the tree, you also include jsTree.less
+// and even brackets_scrollbars.less
+@import url("styles/brackets_codemirror_override.less");
+
+
+/*
+ * Brackets Default Theme
+ *
+ * Defines all the variables that one can configure in a theme. This should
+ * contain all variables / mixins for UI styling that we want to be able to
+ * change in a theme.
+ *
+ * Throughout the rest of the LESS files we should _only_ use color
+ * variable names that are on the LHS of the list below. So, if we
+ * need a new color for some UI element, we should add a variable
+ * in this file.
+ */
+
+/* Overall Colors */
+@background: #1d1f21;
+@current-line: #282a2e;
+@foreground: #c5c8c6;
+@comment: #969896;
+@orange: #de935f;
+@blue: #81a2be;
+@purple: #b294bb;
+@green: #b5bd68;
+@red: #cc6666;
+@aqua: #8abeb7;
+@yellow: #f0c674;
+
+/*
+ * Background colors are ordered from least "intense" to most "intense"
+ * So, if the background is light, then @background-color-3 should be
+ * lightest, -2 should be darker, and -1 should be darker still.
+ *
+ * The opposite is true for a dark background -- background-color-3 should be
+ * the darkest, -2 should be lighter, and -1 should be lighter still.
+ */
+@background-color-1: lighten(@background, @bc-color-step-size*2);
+@background-color-2: lighten(@background, @bc-color-step-size);
+@background-color-3: @background;
+
+/*
+ * @content-color-stronger should be should be further away from the
+ * background color than @content-color (i.e. more contrasty).
+ *
+ * @content-color-weaker should be closer to the background color
+ * than @content-color (i.e. less contrasty).
+ */
+@content-color: @foreground;
+@content-color-stronger: lighten(@foreground, @bc-color-step-size);
+@content-color-weaker: darken(@foreground, @bc-color-step-size);
+
+/* Code Styling */
+
+/* code accent colors */
+@accent-keyword: @purple;
+@accent-atom: @orange;
+@accent-number: @green;
+@accent-def: @foreground;
+@accent-variable: @orange;
+@accent-variable-2: @blue;
+@accent-variable-3: @yellow;
+@accent-property: @yellow;
+@accent-operator: @foreground;
+@accent-comment: @comment;
+@accent-string: @green;
+@accent-string-2: @aqua;
+@accent-meta: @red;
+@accent-error: @red;
+@accent-qualifier: @blue;
+@accent-builtin: @yellow;
+@accent-bracket: @foreground;
+@accent-tag: @blue;
+@accent-attribute: @orange;
+@accent-header: @purple;
+@accent-quote: @blue;
+@accent-hr: @orange;
+@accent-link: @yellow;
+@accent-rangeinfo: @aqua;
+@accent-minus: @red;
+@accent-plus: @green;
+
+/* inline editor colors */
+@inline-background-color-1: lighten(@background, @bc-color-step-size);
+@inline-background-color-2: lighten(@background, @bc-color-step-size*2);
+@inline-background-color-3: rgba(0,0,0,0);
+
+@inline-color-1: darken(@foreground, @bc-color-step-size*2);
+@inline-color-2: darken(@foreground, @bc-color-step-size);
+@inline-color-3: @background;
+
+/* Selection colors */
+@selection-color-focused: #585858;
+@selection-color-unfocused: #424242;
+
+@activeline-bgcolor: rgba(96, 96, 96, 0.5);
+@activeline-number-bgcolor: rgba(96, 96, 96, 0.5);
+@matching-bracket: rgba(189, 100, 100, 0.8);
+
+.code-cursor() {
+    // to make a block cursor, use something like this:
+    // background-color: fadeout(@blue, 50%);
+    // border: none !important;
+
+    // to make an I-cursor, use something like this:
+    border-left: 1px solid @content-color !important;
+}
+
+.CodeMirror .CodeMirror-gutters {
+    border-right: 1px solid #696969;
+}
+
+.CodeMirror-focused .CodeMirror-activeline .CodeMirror-gutter-elt {
+    color: @comment;
+}
diff --git a/src/extensions/default/ThorDarkTheme/package.json b/src/extensions/default/ThorDarkTheme/package.json
new file mode 100644
index 00000000000..2f6ddee63a4
--- /dev/null
+++ b/src/extensions/default/ThorDarkTheme/package.json
@@ -0,0 +1,12 @@
+{
+    "title": "Thor Dark",
+    "name": "thor-dark-theme",
+    "description": "Awesome dark theme for Brackets",
+    "version": "0.0.1",
+    "author": "Miguel Castillo <mahchagnu@gmail.com>",
+    "engines": {
+        "brackets": ">=0.39.0"
+    },
+    "theme": "main.less",
+    "screenshot": "screenshot.png"
+}
diff --git a/src/extensions/default/ThorLightTheme/main.less b/src/extensions/default/ThorLightTheme/main.less
new file mode 100644
index 00000000000..4760db2898b
--- /dev/null
+++ b/src/extensions/default/ThorLightTheme/main.less
@@ -0,0 +1,149 @@
+// Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// Brackets-specific default font and color definitions
+@import url("styles/brackets_colors.less");
+
+// Default theme -- all UI styling comes from variables in a theme
+// Themes can rely on variables defined above
+@import url("styles/brackets_theme_default.less");
+
+// Include Codemirror styling overrides so that we can overrides proper values
+// for the theme.  If you need to customize the tree, you also include jsTree.less
+// and even brackets_scrollbars.less
+@import url("styles/brackets_codemirror_override.less");
+
+/*
+ * Brackets Default Theme
+ *
+ * Defines all the variables that one can configure in a theme. This should
+ * contain all variables / mixins for UI styling that we want to be able to
+ * change in a theme.
+ *
+ * Throughout the rest of the LESS files we should _only_ use color
+ * variable names that are on the LHS of the list below. So, if we
+ * need a new color for some UI element, we should add a variable
+ * in this file.
+ */
+
+/* Overall Colors */
+
+/*
+ * Background colors are ordered from least "intense" to most "intense"
+ * So, if the background is light, then @background-color-3 should be
+ * lightest, -2 should be darker, and -1 should be darker still.
+ *
+ * The opposite is true for a dark background -- background-color-3 should be
+ * the darkest, -2 should be lighter, and -1 should be lighter still.
+ */
+@background-color-1: darken(@bc-white, @bc-color-step-size*2);
+@background-color-2: darken(@bc-white, @bc-color-step-size);
+@background-color-3: #f8f8f8;
+
+/*
+ * @content-color-stronger should be should be further away from the
+ * background color than @content-color (i.e. more contrasty).
+ *
+ * @content-color-weaker should be closer to the background color
+ * than @content-color (i.e. less contrasty).
+ */
+@content-color: #535353;
+@content-color-stronger: @bc-black;
+@content-color-weaker: lighten(@bc-black, @bc-color-step-size*6);
+
+/* Code Styling */
+
+/* code accent colors */
+@accent-keyword: #0023E6;
+@accent-atom: #CA0000;
+@accent-number: #738d00;
+@accent-def: #333333;
+@accent-variable: #535353;
+@accent-variable-2: #333333;
+@accent-variable-3: #535353;
+@accent-property: #535353;
+@accent-operator: #535353;
+@accent-comment: #949494;
+@accent-string: #CA0000;
+@accent-string-2: #009100;
+@accent-meta: #535353;
+@accent-error: #dc322f;
+@accent-qualifier: #446fbd;
+@accent-builtin: #446fbd;
+@accent-bracket: #222;
+@accent-tag: #446fbd;
+@accent-attribute: #738d00;
+@accent-header: #d33682;
+@accent-quote: #446fbd;
+@accent-hr: #CA0000;
+@accent-link: #8757ad;
+@accent-rangeinfo: #6c71c4;
+@accent-minus: #dc322f;
+@accent-plus: #859900;
+@match-text: #121212;
+@cm-match-highlight: rgba(244, 237, 98, 0.7);
+@cm-current-match-highlight: rgb(255, 108, 0);
+
+/* code highlight */
+@matching-bracket: #cfead6;
+
+/* inline editor colors */
+@inline-background-color-1: #eaeaea;
+@inline-background-color-2: #dfe2e2;
+@inline-background-color-3: #d0d5d5;
+
+@inline-color-1: #a1a3a4;
+@inline-color-2: #8a8a8a;
+@inline-color-3: @bc-black;
+
+/* sidebar/toolbar colors */
+@project-panel-base-color: #3C3F41;
+@project-panel-text-1: #ffffff;
+@project-panel-text-2: #94A3A7;
+@main-toolbar-background-color: #5D5F60;
+
+/* open working file highlight */
+@open-working-file-name-highlight: #8fddff;
+@open-working-file-ext-highlight: #8fddff;
+
+/* selection colors */
+@selection-color-focused: #abdffa;
+@selection-color-unfocused: #d5dee3;
+
+/* background color of the line that has the cursor */
+@activeline-bgcolor: #ebefef;
+@activeline-number-bgcolor: #dde4e5;
+
+/* custom scrollbar colors */
+@win-scrollbar-track: rgb(240, 240, 240);
+@win-scrollbar-thumb: rgb(206, 206, 206);
+@win-scrollbar-thumb-hover: rgb(166, 166, 166);
+@win-scrollbar-thumb-active: rgb(96, 96, 96);
+
+@linux-scrollbar-thumb: rgba(0, 0, 0, 0.24);
+@linux-scrollbar-thumb-inactive: rgba(0, 0, 0, 0.12);
+
+/* live preview */
+@live-preview-sync-error-background: #ff5d99;
+@live-preview-sync-error-color: @bc-white;
+
+.CodeMirror .CodeMirror-gutters {
+    border-right: 1px solid #CCCCCC;
+}
diff --git a/src/extensions/default/ThorLightTheme/package.json b/src/extensions/default/ThorLightTheme/package.json
new file mode 100644
index 00000000000..fe4dc603e18
--- /dev/null
+++ b/src/extensions/default/ThorLightTheme/package.json
@@ -0,0 +1,12 @@
+{
+    "title": "Thor Light",
+    "name": "thor-light-theme",
+    "description": "Awesome light theme for Brackets",
+    "version": "0.0.1",
+    "author": "Miguel Castillo <mahchagnu@gmail.com>",
+    "engines": {
+        "brackets": ">=0.39.0"
+    },
+    "theme": "main.less",
+    "screenshot": "screenshot.png"
+}
diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
index 4dcf5d83b2b..97ac5bf3d09 100644
--- a/src/styles/brackets_codemirror_override.less
+++ b/src/styles/brackets_codemirror_override.less
@@ -21,7 +21,7 @@
 /* Brackets / CodeMirror Code Formatting */
 
 .CodeMirror pre {
-    padding: 0 @code-padding 0 0;
+    padding: 0 @code-padding 0 2px;
 }
 
 .show-line-padding .CodeMirror pre {

From 2c06fd2b4f5b0887f917ae6464af1e43cbee4095 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 5 Jun 2014 22:35:52 -0400
Subject: [PATCH 53/96] Added importance to make sure cursor is visible when it
 is on the left side of a matching bracket/parenthesis

---
 src/styles/brackets_codemirror_override.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
index 97ac5bf3d09..e2093b5ac50 100644
--- a/src/styles/brackets_codemirror_override.less
+++ b/src/styles/brackets_codemirror_override.less
@@ -120,7 +120,7 @@ span.CodeMirror-nonmatchingbracket {
     /* Ensure the cursor shows up in front of code spans with a background color
      * (e.g. matchingbracket).
      */
-    z-index: 3;
+    z-index: 3 !important;
 }
 
 .CodeMirror-lines {

From aebe379a7e1f9bf918d73050c1c5f07289765238 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sat, 7 Jun 2014 09:27:54 -0400
Subject: [PATCH 54/96] Removed stale general.html file

---
 src/htmlContent/themes-general.html | 45 -----------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 src/htmlContent/themes-general.html

diff --git a/src/htmlContent/themes-general.html b/src/htmlContent/themes-general.html
deleted file mode 100644
index adc4991573a..00000000000
--- a/src/htmlContent/themes-general.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<form class="form-horizontal">
-    <div class="control-group">
-        <label class="control-label">{{Strings.CURRENT_THEME}}</label>
-        <div class="controls">
-            <select>
-                {{#themes}}
-                <option style="text-align:left;" value="{{name}}" data-target="themes">{{displayName}}</option>
-                {{/themes}}
-            </select>
-        </div>
-    </div>
-
-    <div class="control-group">
-        <label class="control-label">{{Strings.CUSTOM_SCROLLBARS}}</label>
-        <div class="controls">
-            {{#settings.customScrollbars}}
-                <input type="checkbox" data-target="customScrollbars" checked>
-            {{/settings.customScrollbars}}
-            {{^settings.customScrollbars}}
-                <input type="checkbox" data-target="customScrollbars">
-            {{/settings.customScrollbars}}
-        </div>
-    </div>
-
-    <div class="control-group">
-        <label class="control-label">{{Strings.FONT_SIZE}}</label>
-        <div class="controls">
-            <input type="text" data-target="fontSize" value="{{settings.fontSize}}">
-        </div>
-    </div>
-
-    <div class="control-group">
-        <label class="control-label">{{Strings.FONT_FAMILY}}</label>
-        <div class="controls">
-            <input type="text" data-target="fontType" value="{{settings.fontType}}">
-        </div>
-    </div>
-
-    <div class="control-group">
-        <label class="control-label">{{Strings.LINE_HEIGHT}}</label>
-        <div class="controls">
-            <input type="text" data-target="lineHeight" value="{{settings.lineHeight}}">
-        </div>
-    </div>
-</form>

From 8cef24a1a49d499cee85c69a4ed297e687c35455 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sat, 7 Jun 2014 09:30:29 -0400
Subject: [PATCH 55/96] Fixed issues in CM override less file that's breaking
 the build

---
 src/styles/brackets_codemirror_override.less | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
index e2093b5ac50..5fe4b61b991 100644
--- a/src/styles/brackets_codemirror_override.less
+++ b/src/styles/brackets_codemirror_override.less
@@ -146,7 +146,7 @@ span.CodeMirror-nonmatchingbracket {
     border-right: none;
 }
 
-.platform-mac & {
+.platform-mac {
     .CodeMirror-scrollbar-filler {
         background-image: url(images/scrollbar-mac-corner.png);
     }
@@ -154,7 +154,8 @@ span.CodeMirror-nonmatchingbracket {
         background-image: url(images/scrollbar-mac-bg.png);
     }
 }
-.platform-win & {
+
+.platform-win {
     .CodeMirror-scrollbar-filler,
     .CodeMirror-gutter-filler {
         background-color: @win-scrollbar-track;
@@ -164,7 +165,8 @@ span.CodeMirror-nonmatchingbracket {
         width: 12px !important;
     }
 }
-.platform-linux & {
+
+.platform-linux {
     .CodeMirror-scrollbar-filler,
     .CodeMirror-gutter-filler {
         background-color: @background-color-3;

From 710d4e098cc9e739824be6db0286674b0b5d6e6e Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sat, 7 Jun 2014 10:45:49 -0400
Subject: [PATCH 56/96] Fixed issue where themes aren't properly reloaded when
 modified

---
 src/view/ThemeManager.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index a913cc25490..9fe05a4cde5 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -129,6 +129,14 @@ define(function (require, exports, module) {
         return file.isFile &&
             validExtensions.indexOf(FileUtils.getFileExtension(file.name)) !== -1;
     }
+    
+    
+    function getThemeByFile(file) {
+        var path = file._path;
+        return _.find(_themes, function(item) {
+            return item.file._path === path;
+        });
+    }
 
 
     /**
@@ -360,10 +368,15 @@ define(function (require, exports, module) {
     });
 
     FileSystem.on("change", function(evt, file) {
+        if ( file.isDirectory ) {
+            return;
+        }
+        
         var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
-            theme = _themes[name];
+            theme = getThemeByFile(file);
 
-        if (theme && theme.file.parentPath === file.parentPath) {
+        console.log(theme);
+        if (theme) {
             refresh(true);
         }
     });

From 9894c0e4d3bb6c29e69ae466a6820f9710ebddef Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sat, 7 Jun 2014 10:47:00 -0400
Subject: [PATCH 57/96] Removed leftover console.log statement

---
 src/view/ThemeManager.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 9fe05a4cde5..b2a29b6d805 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -375,7 +375,6 @@ define(function (require, exports, module) {
         var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
             theme = getThemeByFile(file);
 
-        console.log(theme);
         if (theme) {
             refresh(true);
         }

From 72f5f34f01dae6e3ea82973c2cab2b677963db56 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sat, 7 Jun 2014 11:03:30 -0400
Subject: [PATCH 58/96] Fixed issue with document types not properly cleaned up
 from the DOM.  Also, document type is now going in the body element to enable
 styling per document type

---
 src/view/ThemeView.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
index 7256c9f07cb..7aab5d32c6c 100644
--- a/src/view/ThemeView.js
+++ b/src/view/ThemeView.js
@@ -11,7 +11,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var theme, currentThemes = [];
+    var theme, currentDocMode, currentThemes = [];
 
     var _                  = require("thirdparty/lodash"),
         CodeMirror         = require("thirdparty/CodeMirror2/lib/codemirror"),
@@ -77,6 +77,8 @@ define(function (require, exports, module) {
 
     /**
     *  Handles updating codemirror with the current selection of themes.
+    *
+    * @param <CodeMirror> cm is the CodeMirror instance currently loaded
     */
     function updateThemes(cm) {
         var newThemes = (prefs.get("themes") || []).join(" "),
@@ -115,12 +117,16 @@ define(function (require, exports, module) {
 
 
     /**
+    * Sets the document type in the DOM to enable styling per doc type
     *
+    * @param <CodeMirror> cm is the CodeMirror instance currently loaded
+    * @rreturn <string> current document type
     */
     function setDocumentMode(cm) {
         var mode = cm.getDoc().getMode();
         var docMode = mode && (mode.helperType || mode.name);
-        $("html").removeClass("doctype-" + docMode).addClass("doctype-" + docMode);
+        $("body").removeClass("doctype-" + currentDocMode).addClass("doctype-" + docMode);
+        currentDocMode = docMode; // Update docMode
         return docMode;
     }
 

From 57df196fd811f0e948220d617c1ea2b0a7f21fa0 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 8 Jun 2014 09:15:29 -0400
Subject: [PATCH 59/96] Reverted back tune up changes in codemirror-override. 
 Will do another pass a bit later

---
 src/styles/brackets_codemirror_override.less | 21 +++++++-------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/styles/brackets_codemirror_override.less b/src/styles/brackets_codemirror_override.less
index 5fe4b61b991..8e49a9e7fbb 100644
--- a/src/styles/brackets_codemirror_override.less
+++ b/src/styles/brackets_codemirror_override.less
@@ -21,7 +21,7 @@
 /* Brackets / CodeMirror Code Formatting */
 
 .CodeMirror pre {
-    padding: 0 @code-padding 0 2px;
+    padding: 0 @code-padding 0 0;
 }
 
 .show-line-padding .CodeMirror pre {
@@ -44,7 +44,7 @@
     .code-font-win();
 }
 
-@code-padding: 8px;
+@code-padding: 15px;
 
 .CodeMirror-activeline-background {
     background: transparent;
@@ -103,14 +103,8 @@ span.cm-rangeinfo {color: @accent-rangeinfo;}
 span.cm-minus {color: @accent-minus;}
 span.cm-plus {color: @accent-plus;}
 
-span.CodeMirror-matchingbracket {
-    color: @accent-bracket !important;
-    background-color: @matching-bracket;
-}
-
-span.CodeMirror-nonmatchingbracket {
-    color: @accent-bracket !important;
-}
+span.CodeMirror-matchingbracket {color: @accent-bracket !important; background-color: @matching-bracket;}
+span.CodeMirror-nonmatchingbracket {color: @accent-bracket !important;}
 
 .CodeMirror-cursors {
     .CodeMirror-cursor {
@@ -120,7 +114,7 @@ span.CodeMirror-nonmatchingbracket {
     /* Ensure the cursor shows up in front of code spans with a background color
      * (e.g. matchingbracket).
      */
-    z-index: 3 !important;
+    z-index: 3;
 }
 
 .CodeMirror-lines {
@@ -179,10 +173,9 @@ span.CodeMirror-nonmatchingbracket {
 
 .CodeMirror-linenumber {
     color: @accent-comment;
+    min-width: 2.5em;
     /*font-size: 0.9em;*/  /* restore after SourceCodePro font fix? */
-    border-left: solid 10px transparent;
-    border-right: solid @code-padding transparent;
-    padding: 0px;
+    padding: 0 @code-padding 0 10px;  /* left padding for project panel selection triangle */
 }
 
 .CodeMirror-focused .CodeMirror-selected {

From 7f5a33c74dca7b24a35166ef0da36191e24a92da Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Sun, 8 Jun 2014 11:43:44 -0400
Subject: [PATCH 60/96] Added rootpath to handle imports defined in
 styles/brackets*.less files.  This also allows for handling of other imports
 relative to the theme itself.

---
 src/extensions/default/ThorDarkTheme/main.less  |  6 +++---
 src/extensions/default/ThorLightTheme/main.less |  6 +++---
 src/view/ThemeManager.js                        | 15 ++++++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/extensions/default/ThorDarkTheme/main.less b/src/extensions/default/ThorDarkTheme/main.less
index d22d3df75ef..bcaaafd04aa 100644
--- a/src/extensions/default/ThorDarkTheme/main.less
+++ b/src/extensions/default/ThorDarkTheme/main.less
@@ -23,16 +23,16 @@
 
 
 // Brackets-specific default font and color definitions
-@import url("styles/brackets_colors.less");
+@import url("brackets_colors.less");
 
 // Default theme -- all UI styling comes from variables in a theme
 // Themes can rely on variables defined above
-@import url("styles/brackets_theme_default.less");
+@import url("brackets_theme_default.less");
 
 // Include Codemirror styling overrides so that we can overrides proper values
 // for the theme.  If you need to customize the tree, you also include jsTree.less
 // and even brackets_scrollbars.less
-@import url("styles/brackets_codemirror_override.less");
+@import url("brackets_codemirror_override.less");
 
 
 /*
diff --git a/src/extensions/default/ThorLightTheme/main.less b/src/extensions/default/ThorLightTheme/main.less
index 4760db2898b..a469becad71 100644
--- a/src/extensions/default/ThorLightTheme/main.less
+++ b/src/extensions/default/ThorLightTheme/main.less
@@ -19,16 +19,16 @@
 // DEALINGS IN THE SOFTWARE.
 
 // Brackets-specific default font and color definitions
-@import url("styles/brackets_colors.less");
+@import url("brackets_colors.less");
 
 // Default theme -- all UI styling comes from variables in a theme
 // Themes can rely on variables defined above
-@import url("styles/brackets_theme_default.less");
+@import url("brackets_theme_default.less");
 
 // Include Codemirror styling overrides so that we can overrides proper values
 // for the theme.  If you need to customize the tree, you also include jsTree.less
 // and even brackets_scrollbars.less
-@import url("styles/brackets_codemirror_override.less");
+@import url("brackets_codemirror_override.less");
 
 /*
  * Brackets Default Theme
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index b2a29b6d805..9773699d9df 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -29,10 +29,12 @@ define(function (require, exports, module) {
         themeReady      = false,
         commentRegex    = /\/\*([\s\S]*?)\*\//mg,
         scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg,
+        stylesPath       = FileUtils.getNativeBracketsDirectoryPath() + "/styles/",
         validExtensions = ["css", "less"];
 
     ExtensionUtils.addLinkedStyleSheet("styles/brackets_theme_settings.css");
 
+
     /**
     * @constructor
     *
@@ -109,8 +111,11 @@ define(function (require, exports, module) {
     * @return {$.Deferred} promsie with the processed css/less as the resolved value
     */
     function lessifyTheme(content, theme) {
-        var deferred = $.Deferred(),
-            parser = new less.Parser();
+        var deferred = $.Deferred();
+        var parser   = new less.Parser({
+            rootpath: stylesPath,
+            filename: theme.file._path
+        });
 
         parser.parse("." + theme.className + "{" + content + "}", function (err, tree) {
             if (err) {
@@ -129,8 +134,8 @@ define(function (require, exports, module) {
         return file.isFile &&
             validExtensions.indexOf(FileUtils.getFileExtension(file.name)) !== -1;
     }
-    
-    
+
+
     function getThemeByFile(file) {
         var path = file._path;
         return _.find(_themes, function(item) {
@@ -371,7 +376,7 @@ define(function (require, exports, module) {
         if ( file.isDirectory ) {
             return;
         }
-        
+
         var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
             theme = getThemeByFile(file);
 

From d71bbcb47c94acb316f610c7b1ae0819793e76e5 Mon Sep 17 00:00:00 2001
From: Larz <larz@Larzs-MacBook-Pro-2.local>
Date: Sun, 8 Jun 2014 10:15:36 -0700
Subject: [PATCH 61/96] Tweaked darkt theme and removed #status-overwrite text
 color that interfered with theming.

---
 .../default/ThorDarkTheme/main.less           | 83 +++++++++++++------
 src/styles/brackets.less                      |  1 -
 2 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/src/extensions/default/ThorDarkTheme/main.less b/src/extensions/default/ThorDarkTheme/main.less
index bcaaafd04aa..60f39a8371d 100644
--- a/src/extensions/default/ThorDarkTheme/main.less
+++ b/src/extensions/default/ThorDarkTheme/main.less
@@ -50,16 +50,18 @@
 
 /* Overall Colors */
 @background: #1d1f21;
-@current-line: #282a2e;
+@current-line: #000;
 @foreground: #c5c8c6;
 @comment: #969896;
-@orange: #de935f;
-@blue: #81a2be;
-@purple: #b294bb;
-@green: #b5bd68;
-@red: #cc6666;
+@orange: #ce8a33;
+@blue: #6c9ef8;
+@purple: #a97ad0;
+@green: #85a300;
+@red: #dc322f;
 @aqua: #8abeb7;
+@violet: #6c71c4;
 @yellow: #f0c674;
+@pink: #d85896;
 
 /*
  * Background colors are ordered from least "intense" to most "intense"
@@ -87,30 +89,30 @@
 /* Code Styling */
 
 /* code accent colors */
-@accent-keyword: @purple;
+@accent-keyword: @blue;
 @accent-atom: @orange;
 @accent-number: @green;
-@accent-def: @foreground;
-@accent-variable: @orange;
-@accent-variable-2: @blue;
-@accent-variable-3: @yellow;
-@accent-property: @yellow;
+@accent-def: @purple;
+@accent-variable: @foreground;
+@accent-variable-2: @foreground;
+@accent-variable-3: @foreground;
+@accent-property: @purple;
 @accent-operator: @foreground;
 @accent-comment: @comment;
-@accent-string: @green;
-@accent-string-2: @aqua;
-@accent-meta: @red;
+@accent-string: @orange;
+@accent-string-2: @orange;
+@accent-meta: @foreground;
 @accent-error: @red;
 @accent-qualifier: @blue;
-@accent-builtin: @yellow;
+@accent-builtin: @blue;
 @accent-bracket: @foreground;
 @accent-tag: @blue;
-@accent-attribute: @orange;
-@accent-header: @purple;
+@accent-attribute: @green;
+@accent-header: @pink;
 @accent-quote: @blue;
 @accent-hr: @orange;
-@accent-link: @yellow;
-@accent-rangeinfo: @aqua;
+@accent-link: @purple;
+@accent-rangeinfo: @violet;
 @accent-minus: @red;
 @accent-plus: @green;
 
@@ -127,9 +129,18 @@
 @selection-color-focused: #585858;
 @selection-color-unfocused: #424242;
 
-@activeline-bgcolor: rgba(96, 96, 96, 0.5);
-@activeline-number-bgcolor: rgba(96, 96, 96, 0.5);
-@matching-bracket: rgba(189, 100, 100, 0.8);
+@activeline-bgcolor: rgb(49, 49, 49);
+@activeline-number-bgcolor: rgb(0, 0, 0);
+@matching-bracket: rgba(100, 189, 138, 0.43);
+
+/* Status Bar Colors */
+@status-bar-background-color: #1C1C1E;
+@status-bar-border: rgba(255, 255, 255, 0.08);
+@status-bar-text-color: #a1a1a1;
+@status-bar-quiet-text-color: #666;
+
+
+/* Extra CSS */
 
 .code-cursor() {
     // to make a block cursor, use something like this:
@@ -141,9 +152,33 @@
 }
 
 .CodeMirror .CodeMirror-gutters {
-    border-right: 1px solid #696969;
+    // gutter border:
+    // border-right: 1px solid rgba(255, 255, 255, 0.03);
 }
 
 .CodeMirror-focused .CodeMirror-activeline .CodeMirror-gutter-elt {
     color: @comment;
 }
+
+#status-bar {
+    background: @status-bar-background-color;
+    border-top: 1px solid @status-bar-border;
+    color:@status-bar-text-color;
+}
+
+#status-info {
+    color: @status-bar-text-color;
+}
+
+#status-file {
+    color: @status-bar-quiet-text-color;
+}
+
+#status-indicators {
+    background: @status-bar-background-color;
+    color: @status-bar-text-color;
+
+    > div {
+        border-left: 1px solid @status-bar-border;
+    }
+}
diff --git a/src/styles/brackets.less b/src/styles/brackets.less
index 30f90e19f69..4eb3657d0bb 100644
--- a/src/styles/brackets.less
+++ b/src/styles/brackets.less
@@ -219,7 +219,6 @@ a, img {
 #status-overwrite {
     transition: background-color 3s;
     background-color: rgba(120, 178, 242, 0);
-    color: rgb(69, 69, 69);
     cursor: pointer;
 }
 

From cdfa4bebf36391c4c68fa6f1f587fc7ceca76516 Mon Sep 17 00:00:00 2001
From: Larz <larz@Larzs-MacBook-Pro-2.local>
Date: Sun, 8 Jun 2014 10:18:13 -0700
Subject: [PATCH 62/96] Using default Brackets theme as default light theme.

---
 .../default/ThorLightTheme/main.less          | 105 ------------------
 1 file changed, 105 deletions(-)

diff --git a/src/extensions/default/ThorLightTheme/main.less b/src/extensions/default/ThorLightTheme/main.less
index a469becad71..b05bbeb2101 100644
--- a/src/extensions/default/ThorLightTheme/main.less
+++ b/src/extensions/default/ThorLightTheme/main.less
@@ -42,108 +42,3 @@
  * need a new color for some UI element, we should add a variable
  * in this file.
  */
-
-/* Overall Colors */
-
-/*
- * Background colors are ordered from least "intense" to most "intense"
- * So, if the background is light, then @background-color-3 should be
- * lightest, -2 should be darker, and -1 should be darker still.
- *
- * The opposite is true for a dark background -- background-color-3 should be
- * the darkest, -2 should be lighter, and -1 should be lighter still.
- */
-@background-color-1: darken(@bc-white, @bc-color-step-size*2);
-@background-color-2: darken(@bc-white, @bc-color-step-size);
-@background-color-3: #f8f8f8;
-
-/*
- * @content-color-stronger should be should be further away from the
- * background color than @content-color (i.e. more contrasty).
- *
- * @content-color-weaker should be closer to the background color
- * than @content-color (i.e. less contrasty).
- */
-@content-color: #535353;
-@content-color-stronger: @bc-black;
-@content-color-weaker: lighten(@bc-black, @bc-color-step-size*6);
-
-/* Code Styling */
-
-/* code accent colors */
-@accent-keyword: #0023E6;
-@accent-atom: #CA0000;
-@accent-number: #738d00;
-@accent-def: #333333;
-@accent-variable: #535353;
-@accent-variable-2: #333333;
-@accent-variable-3: #535353;
-@accent-property: #535353;
-@accent-operator: #535353;
-@accent-comment: #949494;
-@accent-string: #CA0000;
-@accent-string-2: #009100;
-@accent-meta: #535353;
-@accent-error: #dc322f;
-@accent-qualifier: #446fbd;
-@accent-builtin: #446fbd;
-@accent-bracket: #222;
-@accent-tag: #446fbd;
-@accent-attribute: #738d00;
-@accent-header: #d33682;
-@accent-quote: #446fbd;
-@accent-hr: #CA0000;
-@accent-link: #8757ad;
-@accent-rangeinfo: #6c71c4;
-@accent-minus: #dc322f;
-@accent-plus: #859900;
-@match-text: #121212;
-@cm-match-highlight: rgba(244, 237, 98, 0.7);
-@cm-current-match-highlight: rgb(255, 108, 0);
-
-/* code highlight */
-@matching-bracket: #cfead6;
-
-/* inline editor colors */
-@inline-background-color-1: #eaeaea;
-@inline-background-color-2: #dfe2e2;
-@inline-background-color-3: #d0d5d5;
-
-@inline-color-1: #a1a3a4;
-@inline-color-2: #8a8a8a;
-@inline-color-3: @bc-black;
-
-/* sidebar/toolbar colors */
-@project-panel-base-color: #3C3F41;
-@project-panel-text-1: #ffffff;
-@project-panel-text-2: #94A3A7;
-@main-toolbar-background-color: #5D5F60;
-
-/* open working file highlight */
-@open-working-file-name-highlight: #8fddff;
-@open-working-file-ext-highlight: #8fddff;
-
-/* selection colors */
-@selection-color-focused: #abdffa;
-@selection-color-unfocused: #d5dee3;
-
-/* background color of the line that has the cursor */
-@activeline-bgcolor: #ebefef;
-@activeline-number-bgcolor: #dde4e5;
-
-/* custom scrollbar colors */
-@win-scrollbar-track: rgb(240, 240, 240);
-@win-scrollbar-thumb: rgb(206, 206, 206);
-@win-scrollbar-thumb-hover: rgb(166, 166, 166);
-@win-scrollbar-thumb-active: rgb(96, 96, 96);
-
-@linux-scrollbar-thumb: rgba(0, 0, 0, 0.24);
-@linux-scrollbar-thumb-inactive: rgba(0, 0, 0, 0.12);
-
-/* live preview */
-@live-preview-sync-error-background: #ff5d99;
-@live-preview-sync-error-color: @bc-white;
-
-.CodeMirror .CodeMirror-gutters {
-    border-right: 1px solid #CCCCCC;
-}

From 1491ad30df9ec5748b009f0b51e55ab9b6407b75 Mon Sep 17 00:00:00 2001
From: Larz <larz@Larzs-MacBook-Pro-2.local>
Date: Sun, 8 Jun 2014 10:33:20 -0700
Subject: [PATCH 63/96] More dark theme tweaks.

---
 src/extensions/default/ThorDarkTheme/main.less | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/extensions/default/ThorDarkTheme/main.less b/src/extensions/default/ThorDarkTheme/main.less
index 60f39a8371d..0b70097e580 100644
--- a/src/extensions/default/ThorDarkTheme/main.less
+++ b/src/extensions/default/ThorDarkTheme/main.less
@@ -52,10 +52,10 @@
 @background: #1d1f21;
 @current-line: #000;
 @foreground: #c5c8c6;
-@comment: #969896;
-@orange: #ce8a33;
+@comment: #767676;
+@orange: #d89333;
 @blue: #6c9ef8;
-@purple: #a97ad0;
+@purple: #b77fdb;
 @green: #85a300;
 @red: #dc322f;
 @aqua: #8abeb7;
@@ -126,7 +126,7 @@
 @inline-color-3: @background;
 
 /* Selection colors */
-@selection-color-focused: #585858;
+@selection-color-focused: #133c53;
 @selection-color-unfocused: #424242;
 
 @activeline-bgcolor: rgb(49, 49, 49);

From 22fc5693068de6720815df6f8c1259e4137c77e0 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Tue, 17 Jun 2014 11:30:19 -0400
Subject: [PATCH 64/96] Removed extra call the get promise object. Redundant.

---
 src/view/ThemeManager.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 9773699d9df..ca84c34fdb3 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -29,7 +29,7 @@ define(function (require, exports, module) {
         themeReady      = false,
         commentRegex    = /\/\*([\s\S]*?)\*\//mg,
         scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg,
-        stylesPath       = FileUtils.getNativeBracketsDirectoryPath() + "/styles/",
+        stylesPath      = FileUtils.getNativeBracketsDirectoryPath() + "/styles/",
         validExtensions = ["css", "less"];
 
     ExtensionUtils.addLinkedStyleSheet("styles/brackets_theme_settings.css");
@@ -195,8 +195,7 @@ define(function (require, exports, module) {
 
                     theme.css = styleNode;
                     return theme;
-                })
-                .promise();
+                });
         }));
     }
 

From 67abe1920eebff1fb081549db3903b33790855b2 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 19 Jun 2014 22:58:48 -0400
Subject: [PATCH 65/96] Removed stale dependency

---
 src/view/ThemeSettings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index b9f8ba71899..e8ee46f4cf1 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -26,7 +26,6 @@ define(function(require, exports, module) {
     };
 
     var _                  = require("thirdparty/lodash"),
-        FileUtils          = require("file/FileUtils"),
         Dialogs            = require("widgets/Dialogs"),
         Strings            = require("strings"),
         PreferencesManager = require("preferences/PreferencesManager"),

From e14f151164d813f00073d5a3d9ab2c11ef6b7e7a Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 19 Jun 2014 23:00:57 -0400
Subject: [PATCH 66/96] Added a default to be loaded when the current theme
 isn't available.  This cleaned up the rejected promises being returned. Fixed
 issue in loadCurrentTheme incorrect $.when call. Cleaned up a few other small
 issues

---
 src/view/ThemeManager.js | 47 +++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index ca84c34fdb3..1db7aec5b49 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -25,7 +25,8 @@ define(function (require, exports, module) {
         PreferencesManager = require("preferences/PreferencesManager"),
         prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
 
-    var _themes         = {},
+    var loadedThemes    = {},
+        defaultTheme    = "thor-light-theme",
         themeReady      = false,
         commentRegex    = /\/\*([\s\S]*?)\*\//mg,
         scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg,
@@ -64,7 +65,7 @@ define(function (require, exports, module) {
         name = name.substring(0, name.lastIndexOf('.')).replace(/-/g, ' ');
         var parts = name.split(" ");
 
-        $.each(parts.slice(0), function (index, part) {
+        _.each(parts.slice(0), function (index, part) {
             parts[index] = part[0].toUpperCase() + part.substring(1);
         });
 
@@ -80,7 +81,7 @@ define(function (require, exports, module) {
     *
     * @param {string} content is the css/less input string to be processed
     * @return {{content: string, scrollbar: string}} content is the new css/less content
-    * with the scrollbar rules extracted out and put in scrollbar
+    *    with the scrollbar rules extracted out and put in scrollbar
     */
     function extractScrollbars(content) {
         var scrollbar = [];
@@ -111,7 +112,7 @@ define(function (require, exports, module) {
     * @return {$.Deferred} promsie with the processed css/less as the resolved value
     */
     function lessifyTheme(content, theme) {
-        var deferred = $.Deferred();
+        var deferred = new $.Deferred();
         var parser   = new less.Parser({
             rootpath: stylesPath,
             filename: theme.file._path
@@ -130,15 +131,29 @@ define(function (require, exports, module) {
     }
 
 
+    /**
+    * @private
+    * Verifies that the file passed in is a valid theme file type.
+    *
+    * @param {File} file is object to verify if it is a valid theme file type
+    * @return {boolean} to confirm if the file is a valid theme file type
+    */
     function isFileTypeValid(file) {
         return file.isFile &&
             validExtensions.indexOf(FileUtils.getFileExtension(file.name)) !== -1;
     }
 
 
+    /**
+    * @private
+    * Will search all loaded themes for one the matches the file passed in
+    *
+    * @param {File} file is the search criteria
+    * @return {Theme} theme that matches the file
+    */
     function getThemeByFile(file) {
         var path = file._path;
-        return _.find(_themes, function(item) {
+        return _.find(loadedThemes, function(item) {
             return item.file._path === path;
         });
     }
@@ -170,10 +185,7 @@ define(function (require, exports, module) {
     *    corresponding new css/less and scrollbar information
     */
     function loadCurrentThemes() {
-        return $.when(undefined, _.map(getCurrentThemes(), function (theme) {
-            if (!theme) {
-                return $.Deferred().reject("Theme not found");
-            }
+        var pendingThemes = _.map(getCurrentThemes(), function (theme) {
 
             return FileUtils.readAsText(theme.file)
                 .then(function(content) {
@@ -196,7 +208,9 @@ define(function (require, exports, module) {
                     theme.css = styleNode;
                     return theme;
                 });
-        }));
+        });
+
+        return $.when.apply(undefined, pendingThemes);
     }
 
 
@@ -208,7 +222,7 @@ define(function (require, exports, module) {
     */
     function getCurrentThemes() {
         return _.map(prefs.get("themes").slice(0), function (item) {
-            return _themes[item];
+            return loadedThemes[item] || loadedThemes[defaultTheme];
         });
     }
 
@@ -256,8 +270,8 @@ define(function (require, exports, module) {
 
             if (exists) {
                 theme = new Theme(file, options);
-                _themes[theme.name] = theme;
-                ThemeSettings.setThemes(_themes);
+                loadedThemes[theme.name] = theme;
+                ThemeSettings.setThemes(loadedThemes);
 
                 // For themes that are loaded after ThemeManager has been loaded,
                 // we should check if it's the current theme.  It is, then we just
@@ -372,14 +386,11 @@ define(function (require, exports, module) {
     });
 
     FileSystem.on("change", function(evt, file) {
-        if ( file.isDirectory ) {
+        if (file.isDirectory) {
             return;
         }
 
-        var name = (file.name || "").substring(0, file.name.lastIndexOf('.')),
-            theme = getThemeByFile(file);
-
-        if (theme) {
+        if (getThemeByFile(file)) {
             refresh(true);
         }
     });

From 31cb2a68356123db3e36777dd08a5738541ab6ca Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 19 Jun 2014 23:57:58 -0400
Subject: [PATCH 67/96] Export reset settings interface and set the default
 theme to thor-light-theme

---
 src/view/ThemeSettings.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index e8ee46f4cf1..37f4ad44c42 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -18,7 +18,7 @@ define(function(require, exports, module) {
         "lineHeight": '1.3em',
         "fontType": "'SourceCodePro-Medium', ＭＳ ゴシック, 'MS Gothic', monospace",
         "customScrollbars": true,
-        "themes": ["default"]
+        "themes": ["thor-light-theme"]
     };
 
     var templates = {
@@ -91,7 +91,7 @@ define(function(require, exports, module) {
 
 
     function getValues() {
-        return _.transform(arguments, function(result, value, key) {
+        return _.transform(arguments, function(result, value) {
             result[value] = prefs.get(value);
         });
     }
@@ -115,6 +115,7 @@ define(function(require, exports, module) {
 
     // Exposed API
     exports.defaults   = defaults;
+    exports.reset      = reset;
     exports.setThemes  = setThemes;
     exports.showDialog = showDialog;
 });

From b6a7ef3840dfe4aba33799445bc7da33872bceb0 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 20 Jun 2014 00:04:07 -0400
Subject: [PATCH 68/96] Changed loop for iterating through new settings.
 Feedback from Kevin

---
 src/view/ThemeSettings.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index 37f4ad44c42..d6deb6d8b5f 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -75,11 +75,9 @@ define(function(require, exports, module) {
 
         Dialogs.showModalDialogUsingTemplate($template).done(function (id) {
             if (id === "save") {
-                for (var i in newSettings) {
-                    if (currentSettings.hasOwnProperty(i)) {
-                        prefs.set(i, newSettings[i]);
-                    }
-                }
+                Object.keys(newSettings).forEach(function (setting) {
+                    prefs.set(setting, newSettings[setting]);
+                });
             }
         });
     }

From 86f78eb4c8b1307e49af80aca86ed0d51ff54fbf Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 20 Jun 2014 00:08:42 -0400
Subject: [PATCH 69/96] Cleaned up a bit of the logic for selecting themes in
 the event handler for the settings UI

---
 src/view/ThemeSettings.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index d6deb6d8b5f..0aa85914776 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -65,11 +65,16 @@ define(function(require, exports, module) {
                 newSettings[attr] = $target.val();
             })
             .on("change", function() {
+                var items;
                 var $target = $(":selected", this);
                 var attr = $target.attr("data-target");
+
                 if (attr) {
-                    var items = $target.map(function(i, item) {return $(item).val();}).toArray();
-                    prefs.set(attr, items);
+                    items = $target.map(function(i, item) {
+                        return $(item).val();
+                    });
+
+                    prefs.set(attr, items.toArray());
                 }
             });
 

From a102a518a880e0b5e95abd547e652bbe23912c70 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 20 Jun 2014 00:36:39 -0400
Subject: [PATCH 70/96] Cleaned up some of the comments and stale variables

---
 src/view/ThemeView.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
index 7aab5d32c6c..8ffb25ac8e9 100644
--- a/src/view/ThemeView.js
+++ b/src/view/ThemeView.js
@@ -11,11 +11,10 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var theme, currentDocMode, currentThemes = [];
+    var currentDocMode, currentThemes = [];
 
     var _                  = require("thirdparty/lodash"),
         CodeMirror         = require("thirdparty/CodeMirror2/lib/codemirror"),
-        ExtensionUtils     = require("utils/ExtensionUtils"),
         PreferencesManager = require("preferences/PreferencesManager"),
         prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
 
@@ -78,7 +77,7 @@ define(function (require, exports, module) {
     /**
     *  Handles updating codemirror with the current selection of themes.
     *
-    * @param <CodeMirror> cm is the CodeMirror instance currently loaded
+    * @param {CodeMirror} cm is the CodeMirror instance currently loaded
     */
     function updateThemes(cm) {
         var newThemes = (prefs.get("themes") || []).join(" "),
@@ -119,8 +118,8 @@ define(function (require, exports, module) {
     /**
     * Sets the document type in the DOM to enable styling per doc type
     *
-    * @param <CodeMirror> cm is the CodeMirror instance currently loaded
-    * @rreturn <string> current document type
+    * @param {CodeMirror} cm is the CodeMirror instance currently loaded
+    * @rreturn {string} current document type
     */
     function setDocumentMode(cm) {
         var mode = cm.getDoc().getMode();

From c2d26f2e04f250778c9127e9a37012118066d5cc Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 26 Jun 2014 21:29:55 -0400
Subject: [PATCH 71/96] Removing extra promise call

---
 src/view/ThemeManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 1db7aec5b49..1dd8ef221dc 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -353,7 +353,7 @@ define(function (require, exports, module) {
         }
 
         FileSystem.getDirectoryForPath(path).getContents(readContent);
-        return result.then(loadThemesFiles).promise();
+        return result.then(loadThemesFiles);
     }
 
 

From f9eb8b4f5fa9c6c5bf1d38b30b91f389ea3768dd Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 3 Jul 2014 15:17:54 -0400
Subject: [PATCH 72/96] Iterating through all default properties when reading
 values instead of passing in which values to read

---
 src/view/ThemeSettings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index 0aa85914776..5a318177b56 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -36,7 +36,7 @@ define(function(require, exports, module) {
     var $settings = $(templates.settings).addClass("themeSettings");
 
     function showDialog() {
-        var currentSettings = getValues("themes", "fontSize", "fontType", "lineHeight", "customScrollbars");
+        var currentSettings = getValues();
         var newSettings     = {};
         var themes          = _.map(_themes, function(theme) {return theme;});
         var template        = $("<div>").append($settings).html();
@@ -94,8 +94,8 @@ define(function(require, exports, module) {
 
 
     function getValues() {
-        return _.transform(arguments, function(result, value) {
-            result[value] = prefs.get(value);
+        return _.transform(defaults, function(result, value, key) {
+            result[key] = prefs.get(key);
         });
     }
 

From a66ba6ef68bfb12d92cbf87a714f1d2bc8c5454d Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 3 Jul 2014 15:29:18 -0400
Subject: [PATCH 73/96] Renamed variable for better legibility and added
 comments where needed

---
 src/view/ThemeSettings.js | 60 +++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index 5a318177b56..d086bc0e792 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -11,8 +11,21 @@
 define(function(require, exports, module) {
     "use strict";
 
-    var _themes = {};
+    var _                  = require("thirdparty/lodash"),
+        Dialogs            = require("widgets/Dialogs"),
+        Strings            = require("strings"),
+        PreferencesManager = require("preferences/PreferencesManager");
+
+    var prefs = PreferencesManager.getExtensionPrefs("brackets-themes");
 
+    /**
+     * Currently loaded themes that are available to choose from.
+     */
+    var loadedThemes = {};
+
+    /**
+     * Object with all default values that can be configure via the settings UI
+     */
     var defaults = {
         "fontSize": 12,
         "lineHeight": '1.3em',
@@ -25,20 +38,18 @@ define(function(require, exports, module) {
         "settings": require("text!htmlContent/themes-settings.html")
     };
 
-    var _                  = require("thirdparty/lodash"),
-        Dialogs            = require("widgets/Dialogs"),
-        Strings            = require("strings"),
-        PreferencesManager = require("preferences/PreferencesManager"),
-        prefs              = PreferencesManager.getExtensionPrefs("brackets-themes");
-
-
-    // Setup all the templates so that we can easily render them with Mustache
+    /**
+     * Cached html settings jQuery object for easier processing when opening the settings dialog
+     */
     var $settings = $(templates.settings).addClass("themeSettings");
 
+    /**
+     * Opens the settings dialog
+     */
     function showDialog() {
         var currentSettings = getValues();
         var newSettings     = {};
-        var themes          = _.map(_themes, function(theme) {return theme;});
+        var themes          = _.map(loadedThemes, function(theme) {return theme;});
         var template        = $("<div>").append($settings).html();
         var $template       = $(Mustache.render(template, {"settings": currentSettings, "themes": themes, "Strings": Strings}));
 
@@ -87,24 +98,32 @@ define(function(require, exports, module) {
         });
     }
 
-
+    /**
+     * Interface to set the themes that are available to chose from in the setting dialog
+     * @param {ThemeManager.Theme} themes is a collection of themes created by the ThemeManager
+     */
     function setThemes(themes) {
-        _themes = themes;
+        loadedThemes = themes;
     }
 
-
+    /**
+     * @private
+     * Gets all the configurable settings that need to be loaded in the settings dialog
+     */
     function getValues() {
         return _.transform(defaults, function(result, value, key) {
             result[key] = prefs.get(key);
         });
     }
 
-
-    function reset() {
-        prefs.set("themes",           defaults.themes);
-        prefs.set("fontSize",         defaults.fontSize + "px");
-        prefs.set("lineHeight",       defaults.lineHeight);
-        prefs.set("fontType",         defaults.fontType);
+    /**
+     * Restores themes to factory settings.
+     */
+    function restore() {
+        prefs.set("themes", defaults.themes);
+        prefs.set("fontSize", defaults.fontSize + "px");
+        prefs.set("lineHeight", defaults.lineHeight);
+        prefs.set("fontType", defaults.fontType);
         prefs.set("customScrollbars", defaults.customScrollbars);
     }
 
@@ -116,9 +135,8 @@ define(function(require, exports, module) {
     prefs.definePreference("customScrollbars", "boolean", defaults.customScrollbars);
 
 
-    // Exposed API
     exports.defaults   = defaults;
-    exports.reset      = reset;
+    exports.restore    = restore;
     exports.setThemes  = setThemes;
     exports.showDialog = showDialog;
 });

From 4eb71f104e26e0c1197894d0d09d2746f5dc5f45 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 3 Jul 2014 15:37:54 -0400
Subject: [PATCH 74/96] Renamed references of fontType to fontFamily in
 preparation for the fonts api

---
 src/htmlContent/themes-settings.html |  2 +-
 src/view/ThemeManager.js             |  4 ++--
 src/view/ThemeSettings.js            |  6 +++---
 src/view/ThemeView.js                | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/htmlContent/themes-settings.html b/src/htmlContent/themes-settings.html
index d6325b53d29..2b941c79966 100644
--- a/src/htmlContent/themes-settings.html
+++ b/src/htmlContent/themes-settings.html
@@ -37,7 +37,7 @@ <h1 class="dialog-title">Themes Settings</h1>
             <div class="control-group">
                 <label class="control-label">{{Strings.FONT_FAMILY}}</label>
                 <div class="controls">
-                    <input type="text" data-target="fontType" value="{{settings.fontType}}">
+                    <input type="text" data-target="fontFamily" value="{{settings.fontFamily}}">
                 </div>
             </div>
 
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 1dd8ef221dc..e5d1b6a1844 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -380,9 +380,9 @@ define(function (require, exports, module) {
         ThemeView.updateLineHeight();
     });
 
-    prefs.on("change", "fontType", function() {
+    prefs.on("change", "fontFamily", function() {
         refresh();
-        ThemeView.updateFontType();
+        ThemeView.updateFontFamily();
     });
 
     FileSystem.on("change", function(evt, file) {
diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index d086bc0e792..8dd764e5abe 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -29,7 +29,7 @@ define(function(require, exports, module) {
     var defaults = {
         "fontSize": 12,
         "lineHeight": '1.3em',
-        "fontType": "'SourceCodePro-Medium', ＭＳ ゴシック, 'MS Gothic', monospace",
+        "fontFamily": "'SourceCodePro-Medium', ＭＳ ゴシック, 'MS Gothic', monospace",
         "customScrollbars": true,
         "themes": ["thor-light-theme"]
     };
@@ -123,7 +123,7 @@ define(function(require, exports, module) {
         prefs.set("themes", defaults.themes);
         prefs.set("fontSize", defaults.fontSize + "px");
         prefs.set("lineHeight", defaults.lineHeight);
-        prefs.set("fontType", defaults.fontType);
+        prefs.set("fontFamily", defaults.fontFamily);
         prefs.set("customScrollbars", defaults.customScrollbars);
     }
 
@@ -131,7 +131,7 @@ define(function(require, exports, module) {
     prefs.definePreference("themes", "array", defaults.themes);
     prefs.definePreference("fontSize", "string", defaults.fontSize + "px");
     prefs.definePreference("lineHeight", "string", defaults.lineHeight);
-    prefs.definePreference("fontType", "string", defaults.fontType);
+    prefs.definePreference("fontFamily", "string", defaults.fontFamily);
     prefs.definePreference("customScrollbars", "boolean", defaults.customScrollbars);
 
 
diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
index 8ffb25ac8e9..fe8123dc918 100644
--- a/src/view/ThemeView.js
+++ b/src/view/ThemeView.js
@@ -22,7 +22,7 @@ define(function (require, exports, module) {
     var templates = {
         $lineHeight: $("<style type='text/css' id='lineHeight'>").appendTo("head"),
         $fontSize: $("<style type='text/css' id='fontSize'>").appendTo("head"),
-        $fontType: $("<style type='text/css' id='fontType'>").appendTo("head"),
+        $fontFamily: $("<style type='text/css' id='fontFamily'>").appendTo("head"),
         $scrollbars: $("<style id='scrollbars'>").appendTo("head")
     };
 
@@ -41,10 +41,10 @@ define(function (require, exports, module) {
     }
 
 
-    function updateFontType() {
+    function updateFontFamily() {
         clearFonts();
-        var value = prefs.get("fontType");
-        templates.$fontType.text(".CodeMirror{" + "font-family: " + value + " !important; }");
+        var value = prefs.get("fontFamily");
+        templates.$fontFamily.text(".CodeMirror{" + "font-family: " + value + " !important; }");
     }
 
 
@@ -58,7 +58,7 @@ define(function (require, exports, module) {
         clearFonts();
         updateLineHeight();
         updateFontSize();
-        updateFontType();
+        updateFontFamily();
     }
 
 
@@ -136,7 +136,7 @@ define(function (require, exports, module) {
     exports.updateFonts      = updateFonts;
     exports.updateLineHeight = updateLineHeight;
     exports.updateFontSize   = updateFontSize;
-    exports.updateFontType   = updateFontType;
+    exports.updateFontFamily = updateFontFamily;
     exports.updateScrollbars = updateScrollbars;
     exports.updateThemes     = updateThemes;
     exports.setDocumentMode  = setDocumentMode;

From f5c71e88451ead1e36f17ebd80ba26efc3cebcef Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 3 Jul 2014 21:05:40 -0400
Subject: [PATCH 75/96] Refactored initialization of themes to simplify some of
 the initialization logic

---
 src/view/ThemeManager.js | 102 ++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 56 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index e5d1b6a1844..0be942b5ed0 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -27,7 +27,6 @@ define(function (require, exports, module) {
 
     var loadedThemes    = {},
         defaultTheme    = "thor-light-theme",
-        themeReady      = false,
         commentRegex    = /\/\*([\s\S]*?)\*\//mg,
         scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg,
         stylesPath      = FileUtils.getNativeBracketsDirectoryPath() + "/styles/",
@@ -233,10 +232,6 @@ define(function (require, exports, module) {
     * @param <boolean> force is to force reload the current themes
     */
     function refresh(force) {
-        if (!themeReady) {
-            return;
-        }
-
         $.when(force && loadCurrentThemes()).done(function() {
             var editor = EditorManager.getActiveEditor();
             if (!editor || !editor._codeMirror) {
@@ -357,62 +352,57 @@ define(function (require, exports, module) {
     }
 
 
-    prefs.on("change", "themes", function() {
-        refresh(true);
-        ThemeView.updateScrollbars(getCurrentThemes()[0]);
-
-        // Expose event for theme changes
-        $(exports).trigger("themeChange", getCurrentThemes());
-    });
-
-    prefs.on("change", "customScrollbars", function() {
-        refresh();
-        ThemeView.updateScrollbars(getCurrentThemes()[0]);
-    });
-
-    prefs.on("change", "fontSize", function() {
-        refresh();
-        ThemeView.updateFontSize();
-    });
-
-    prefs.on("change", "lineHeight", function() {
-        refresh();
-        ThemeView.updateLineHeight();
-    });
-
-    prefs.on("change", "fontFamily", function() {
-        refresh();
-        ThemeView.updateFontFamily();
-    });
-
-    FileSystem.on("change", function(evt, file) {
-        if (file.isDirectory) {
-            return;
-        }
-
-        if (getThemeByFile(file)) {
+    function init() {
+        prefs.on("change", "themes", function() {
             refresh(true);
-        }
-    });
+            ThemeView.updateScrollbars(getCurrentThemes()[0]);
+
+            // Expose event for theme changes
+            $(exports).trigger("themeChange", getCurrentThemes());
+        });
+
+        prefs.on("change", "customScrollbars", function() {
+            refresh();
+            ThemeView.updateScrollbars(getCurrentThemes()[0]);
+        });
 
-    $(EditorManager).on("activeEditorChange", function() {
-        refresh();
-    });
+        prefs.on("change", "fontSize", function() {
+            refresh();
+            ThemeView.updateFontSize();
+        });
+
+        prefs.on("change", "lineHeight", function() {
+            refresh();
+            ThemeView.updateLineHeight();
+        });
+
+        prefs.on("change", "fontFamily", function() {
+            refresh();
+            ThemeView.updateFontFamily();
+        });
+
+        FileSystem.on("change", function(evt, file) {
+            if (file.isDirectory) {
+                return;
+            }
+
+            if (getThemeByFile(file)) {
+                refresh(true);
+            }
+        });
+
+        $(EditorManager).on("activeEditorChange", function() {
+            refresh();
+        });
+
+        refresh(true);
+        ThemeView.updateFonts();
+        ThemeView.updateScrollbars();
+    }
 
     // When the app is ready, we need to try to load whatever theme needs to be processed
-    AppInit.appReady(function() {
-        loadCurrentThemes()
-            .always(function() {
-                themeReady = true;
-            })
-            .done(function(){
-                refresh();
-            });
-    });
+    AppInit.appReady(init);
 
-    //
-    // Exposed API
-    //
     exports.refresh          = refresh;
     exports.loadFile         = loadFile;
     exports.loadPackage      = loadPackage;

From 8f019c5d9c62e8801fe5808464bb6dea07dab057 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Thu, 3 Jul 2014 23:03:36 -0400
Subject: [PATCH 76/96] Fixed issue when creating theme display names when
 titles in the package.json isn't provided

---
 src/view/ThemeManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 0be942b5ed0..0cdfecf4f11 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -64,7 +64,7 @@ define(function (require, exports, module) {
         name = name.substring(0, name.lastIndexOf('.')).replace(/-/g, ' ');
         var parts = name.split(" ");
 
-        _.each(parts.slice(0), function (index, part) {
+        _.each(parts.slice(0), function (part, index) {
             parts[index] = part[0].toUpperCase() + part.substring(1);
         });
 

From d92152f6adbe3880f7f3f2ea70f44ca7ea1ce63f Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Tue, 8 Jul 2014 11:26:00 -0400
Subject: [PATCH 77/96] Marking defaults and setThemes as private functions

---
 src/themes/FontCommandsManager.js | 2 +-
 src/view/ThemeManager.js          | 2 +-
 src/view/ThemeSettings.js         | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/themes/FontCommandsManager.js b/src/themes/FontCommandsManager.js
index 590a9bc7fa1..9df4057cabb 100644
--- a/src/themes/FontCommandsManager.js
+++ b/src/themes/FontCommandsManager.js
@@ -23,7 +23,7 @@ define(function (require, exports, module) {
     function updateBracketsFontSize() {
         var fontSize        = prefs.get("fontSize"),
             fontSizeNumeric = Number(fontSize.replace(/px|em/, "")),
-            fontSizeOffset  = fontSizeNumeric - ThemeSettings.defaults.fontSize;
+            fontSizeOffset  = fontSizeNumeric - ThemeSettings._defaults.fontSize;
 
         if (!isNaN(fontSizeOffset)) {
             PreferencesManager.setViewState("fontSizeAdjustment", fontSizeOffset);
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 0cdfecf4f11..42dbc072bb9 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -266,7 +266,7 @@ define(function (require, exports, module) {
             if (exists) {
                 theme = new Theme(file, options);
                 loadedThemes[theme.name] = theme;
-                ThemeSettings.setThemes(loadedThemes);
+                ThemeSettings._setThemes(loadedThemes);
 
                 // For themes that are loaded after ThemeManager has been loaded,
                 // we should check if it's the current theme.  It is, then we just
diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index 8dd764e5abe..14f9bb95752 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -134,9 +134,8 @@ define(function(require, exports, module) {
     prefs.definePreference("fontFamily", "string", defaults.fontFamily);
     prefs.definePreference("customScrollbars", "boolean", defaults.customScrollbars);
 
-
-    exports.defaults   = defaults;
+    exports._setThemes = setThemes;
+    exports._defaults  = defaults;
     exports.restore    = restore;
-    exports.setThemes  = setThemes;
     exports.showDialog = showDialog;
 });

From 43d2628d7b41a49ad264d7e339201b56c5cfbfd5 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Tue, 8 Jul 2014 22:52:51 -0400
Subject: [PATCH 78/96] Moved brackets_theme_settings.css to brackets.less

---
 src/htmlContent/themes-settings.html   |  2 +-
 src/styles/brackets.less               | 13 +++++++++++++
 src/styles/brackets_theme_settings.css | 12 ------------
 src/view/ThemeManager.js               |  2 --
 4 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 src/styles/brackets_theme_settings.css

diff --git a/src/htmlContent/themes-settings.html b/src/htmlContent/themes-settings.html
index 2b941c79966..6246aa50629 100644
--- a/src/htmlContent/themes-settings.html
+++ b/src/htmlContent/themes-settings.html
@@ -1,4 +1,4 @@
-<div class="brackets-themes-settings-dialog modal">
+<div class="theme-settings modal">
     <div class="modal-header">
         <h1 class="dialog-title">Themes Settings</h1>
     </div>
diff --git a/src/styles/brackets.less b/src/styles/brackets.less
index 009f5db1997..a35ef1f0a10 100644
--- a/src/styles/brackets.less
+++ b/src/styles/brackets.less
@@ -1625,3 +1625,16 @@ label input {
     font-weight: 900;
     font-size: 1.01em;
 }
+
+.theme-settings td {
+    padding: 2px;
+}
+
+.theme-settings .modal-body {
+    min-height: 300px;
+    max-height: 300px;
+}
+
+.theme-settings .label {
+    padding: 4px !important;
+}
diff --git a/src/styles/brackets_theme_settings.css b/src/styles/brackets_theme_settings.css
deleted file mode 100644
index daeb0d93760..00000000000
--- a/src/styles/brackets_theme_settings.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.themeSettings td {
-    padding: 2px;
-}
-
-.themeSettings .modal-body {
-    min-height: 300px;
-    max-height: 300px;
-}
-
-.themeSettings .label {
-    padding: 4px !important;
-}
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 42dbc072bb9..8e3b31c8f34 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -32,8 +32,6 @@ define(function (require, exports, module) {
         stylesPath      = FileUtils.getNativeBracketsDirectoryPath() + "/styles/",
         validExtensions = ["css", "less"];
 
-    ExtensionUtils.addLinkedStyleSheet("styles/brackets_theme_settings.css");
-
 
     /**
     * @constructor

From b3f1ece1f0dc763b0d14caeaa84665db2af50c30 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 00:18:22 -0400
Subject: [PATCH 79/96] Adding unit tests for themes core functionality

---
 src/view/ThemeManager.js                  |   9 +-
 test/UnitTestSuite.js                     |   1 +
 test/spec/Theme-test-files/empty.css      |   0
 test/spec/Theme-test-files/empty.less     |   0
 test/spec/Theme-test-files/empty.txt      |   0
 test/spec/Theme-test-files/scrollbars.css |  21 ++++
 test/spec/ThemeManager-test.js            | 114 ++++++++++++++++++++++
 7 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 test/spec/Theme-test-files/empty.css
 create mode 100644 test/spec/Theme-test-files/empty.less
 create mode 100644 test/spec/Theme-test-files/empty.txt
 create mode 100644 test/spec/Theme-test-files/scrollbars.css
 create mode 100644 test/spec/ThemeManager-test.js

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 8e3b31c8f34..811aa2f1338 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -59,7 +59,8 @@ define(function (require, exports, module) {
     * @return {string} theme name properly formatted for display
     */
     function toDisplayName (name) {
-        name = name.substring(0, name.lastIndexOf('.')).replace(/-/g, ' ');
+        var extIndex = name.lastIndexOf('.');
+        name = name.substring(0, extIndex !== -1 ? extIndex : undefined).replace(/-/g, ' ');
         var parts = name.split(" ");
 
         _.each(parts.slice(0), function (part, index) {
@@ -184,7 +185,7 @@ define(function (require, exports, module) {
     function loadCurrentThemes() {
         var pendingThemes = _.map(getCurrentThemes(), function (theme) {
 
-            return FileUtils.readAsText(theme.file)
+            return theme && FileUtils.readAsText(theme.file)
                 .then(function(content) {
                     var result = extractScrollbars(content);
                     theme.scrollbar = result.scrollbar;
@@ -406,4 +407,8 @@ define(function (require, exports, module) {
     exports.loadPackage      = loadPackage;
     exports.loadDirectory    = loadDirectory;
     exports.getCurrentThemes = getCurrentThemes;
+    
+    // Exposed for testing purposes
+    exports._toDisplayName     = toDisplayName;
+    exports._extractScrollbars = extractScrollbars;
 });
diff --git a/test/UnitTestSuite.js b/test/UnitTestSuite.js
index 1d00ea9574d..e1655a31152 100644
--- a/test/UnitTestSuite.js
+++ b/test/UnitTestSuite.js
@@ -71,6 +71,7 @@ define(function (require, exports, module) {
     require("spec/StringMatch-test");
     require("spec/StringUtils-test");
     require("spec/TextRange-test");
+    require("spec/ThemeManager-test");
     require("spec/UpdateNotification-test");
     require("spec/UrlParams-test");
     require("spec/ValidationUtils-test");
diff --git a/test/spec/Theme-test-files/empty.css b/test/spec/Theme-test-files/empty.css
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/spec/Theme-test-files/empty.less b/test/spec/Theme-test-files/empty.less
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/spec/Theme-test-files/empty.txt b/test/spec/Theme-test-files/empty.txt
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/spec/Theme-test-files/scrollbars.css b/test/spec/Theme-test-files/scrollbars.css
new file mode 100644
index 00000000000..8c0f8810c32
--- /dev/null
+++ b/test/spec/Theme-test-files/scrollbars.css
@@ -0,0 +1,21 @@
+span{}
+
+::-webkit-scrollbar {
+    width: 12px;
+}
+
+::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
+    -webkit-border-radius: 10px;
+}
+
+::-webkit-scrollbar-thumb {
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+    background: grey;
+    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
+}
+
+::-webkit-scrollbar-thumb:window-inactive {
+    background: white;
+}
diff --git a/test/spec/ThemeManager-test.js b/test/spec/ThemeManager-test.js
new file mode 100644
index 00000000000..c0ab9a241bf
--- /dev/null
+++ b/test/spec/ThemeManager-test.js
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
+ *  
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), 
+ * to deal in the Software without restriction, including without limitation 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ *  
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global define, describe, beforeEach, it, runs, expect, waitsForDone, beforeFirst, afterLast */
+
+define(function (require, exports, module) {
+    "use strict";
+
+    var ThemeManager     = require("view/ThemeManager"),
+        FileSystem       = require("filesystem/FileSystem"),
+        FileUtils        = require("file/FileUtils"),
+        SpecRunnerUtils  = require("spec/SpecRunnerUtils");
+
+    var testFilePath = SpecRunnerUtils.getTestPath("/spec/Theme-test-files");
+    
+    describe("ThemeManager", function () {
+
+        describe("toDisplayName", function() {
+            it("Name with no extension", function() {
+                expect(ThemeManager._toDisplayName("this file")).toEqual("This File");
+            });
+
+            it("Short name", function() {
+                expect(ThemeManager._toDisplayName("this file.css")).toEqual("This File");
+            });
+            
+            it("Long name", function() {
+                expect(ThemeManager._toDisplayName("this is a simple file.css")).toEqual("This Is A Simple File");
+            });
+
+            it("Name with dashes", function() {
+                expect(ThemeManager._toDisplayName("this-is a simple-file.css")).toEqual("This Is A Simple File");
+            });
+        });
+        
+        
+        describe("Extract Scrollbar", function() {
+            runs(function() {
+                var themeFile = FileSystem.getFileForPath(testFilePath + "/scrollbars.css");
+                var promise = FileUtils.readAsText(themeFile).done(function(content) {
+                    var themeScrollbars = ThemeManager._extractScrollbars(content);
+                    expect(themeScrollbars.scrollbar.length).toEqual(4);
+                    expect(themeScrollbars.content.trim()).toEqual("span{}");
+                });
+
+                waitsForDone(promise, "theme with scrollbar", 5000); 
+            });
+
+            runs(function() {
+                var themeFile = FileSystem.getFileForPath(testFilePath + "/empty.css");
+                var promise = FileUtils.readAsText(themeFile).done(function(content) {
+                    var themeScrollbars = ThemeManager._extractScrollbars(content);
+                    expect(themeScrollbars.scrollbar.length).toEqual(0);
+                    expect(themeScrollbars.content.trim()).toEqual("");
+                });
+
+                waitsForDone(promise, "empty theme", 5000); 
+            });
+        });
+        
+        
+        describe("Load themes", function() {
+            runs(function () {
+                var promise = ThemeManager.loadFile(testFilePath + "/scrollbars.css").done(function(theme) {
+                    expect(theme.name).toEqual("scrollbars");
+                    expect(theme.displayName).toEqual("Scrollbars");
+                    expect(theme.className).toEqual("theme-scrollbars");
+                });
+                
+                waitsForDone(promise, "theme file", 5000);
+            });
+
+            runs(function () {
+                var promise = ThemeManager.loadDirectory(testFilePath).done(function() {
+                    var themes = Array.prototype.slice.call(arguments);
+                    expect(themes.length).toEqual(3);
+                });
+
+                waitsForDone(promise, "theme directory - skips invalid extensions", 5000);
+            });
+        });
+        
+        
+        describe("Theme selection", function() {
+            it("Get current theme", function() {
+                expect(ThemeManager.getCurrentThemes().length).toEqual(1);
+                expect(ThemeManager.getCurrentThemes()[0]).toBeUndefined();
+            });
+        });
+
+    });
+    
+});

From 1b75f82bd16d8cf2cecf45148613f61b462f1a86 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 00:23:42 -0400
Subject: [PATCH 80/96] Moved around the settings template variable definition

---
 src/view/ThemeSettings.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index 14f9bb95752..2409f74401e 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -14,7 +14,8 @@ define(function(require, exports, module) {
     var _                  = require("thirdparty/lodash"),
         Dialogs            = require("widgets/Dialogs"),
         Strings            = require("strings"),
-        PreferencesManager = require("preferences/PreferencesManager");
+        PreferencesManager = require("preferences/PreferencesManager"),
+        settingsTemplate   = require("text!htmlContent/themes-settings.html");
 
     var prefs = PreferencesManager.getExtensionPrefs("brackets-themes");
 
@@ -34,14 +35,11 @@ define(function(require, exports, module) {
         "themes": ["thor-light-theme"]
     };
 
-    var templates = {
-        "settings": require("text!htmlContent/themes-settings.html")
-    };
 
     /**
      * Cached html settings jQuery object for easier processing when opening the settings dialog
      */
-    var $settings = $(templates.settings).addClass("themeSettings");
+    var $settings = $(settingsTemplate).addClass("themeSettings");
 
     /**
      * Opens the settings dialog

From dba9b0be1c81210a3f149d2f4da571f873c6b735 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 00:26:43 -0400
Subject: [PATCH 81/96] Corrected jsdoc to use $.Promise rather than $.Deferred

---
 src/view/ThemeManager.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 811aa2f1338..5f67dec3e31 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -107,7 +107,7 @@ define(function (require, exports, module) {
     *
     * @param {string} content is the css/less string to be processed
     * @param {Theme} theme is the object the css/less corresponds to
-    * @return {$.Deferred} promsie with the processed css/less as the resolved value
+    * @return {$.Promise} promsie with the processed css/less as the resolved value
     */
     function lessifyTheme(content, theme) {
         var deferred = new $.Deferred();
@@ -179,7 +179,7 @@ define(function (require, exports, module) {
     * @private
     * Loads all current themes
     *
-    * @return {$.Deferred} promise object resolved with the theme object and all
+    * @return {$.Promise} promise object resolved with the theme object and all
     *    corresponding new css/less and scrollbar information
     */
     function loadCurrentThemes() {
@@ -251,7 +251,7 @@ define(function (require, exports, module) {
     * @param {string} fileName is the full path to the file to be opened
     * @param {!srting} displayName is an optional parameter to specify the display
     *    name for the theme
-    * @return {$.Deferred} promise object resolved with the theme to be loaded from fileName
+    * @return {$.Promise} promise object resolved with the theme to be loaded from fileName
     */
     function loadFile(fileName, options) {
         options = options || {};
@@ -289,7 +289,7 @@ define(function (require, exports, module) {
     * Loads a theme from an extension package.
     *
     * @param {package} themePackage is a package for the theme to be loaded.
-    * @return {$.Deferred} promise object resolved with the theme to be loaded from the pacakge
+    * @return {$.Promise} promise object resolved with the theme to be loaded from the pacakge
     */
     function loadPackage(themePackage) {
         var fileName = themePackage.path + "/" + themePackage.metadata.theme;
@@ -301,7 +301,7 @@ define(function (require, exports, module) {
     * Load css/less files from a directory to be treated as themes
     *
     * @param {string} path where theme files are to be loaded from
-    * @return {$.Deferred} promise object resolved with the themes to be loaded from the directory
+    * @return {$.Promise} promise object resolved with the themes to be loaded from the directory
     */
     function loadDirectory(path) {
         var result = new $.Deferred();

From e2e7c86e3fcfbda45ccf5f6f2059c861a7b63fa1 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 00:29:18 -0400
Subject: [PATCH 82/96] Corrected jsdoc parameter to be options rather than
 displayName

---
 src/view/ThemeManager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 5f67dec3e31..fe0c15bf530 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -249,8 +249,8 @@ define(function (require, exports, module) {
     * Loads a theme from a file.
     *
     * @param {string} fileName is the full path to the file to be opened
-    * @param {!srting} displayName is an optional parameter to specify the display
-    *    name for the theme
+    * @param {object} options is an optional parameter to specify metadata
+    *    for the theme.
     * @return {$.Promise} promise object resolved with the theme to be loaded from fileName
     */
     function loadFile(fileName, options) {

From ba3223e29cfad2f7c7829bdf29fb9ac421df21bb Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 00:32:18 -0400
Subject: [PATCH 83/96] Refactored the logic for making all first letters in
 each word upper case

---
 src/view/ThemeManager.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index fe0c15bf530..d7b3cfd25f0 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -61,13 +61,10 @@ define(function (require, exports, module) {
     function toDisplayName (name) {
         var extIndex = name.lastIndexOf('.');
         name = name.substring(0, extIndex !== -1 ? extIndex : undefined).replace(/-/g, ' ');
-        var parts = name.split(" ");
 
-        _.each(parts.slice(0), function (part, index) {
-            parts[index] = part[0].toUpperCase() + part.substring(1);
-        });
-
-        return parts.join(" ");
+        return name.split(" ").map(function (part) {
+            return part[0].toUpperCase() + part.substring(1);
+        }).join(" ");
     }
 
 

From aa13d464f3719dfe3594dbeca976f4a9e7b6ebda Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 12:26:34 -0400
Subject: [PATCH 84/96] Adding more unit tests around extract scrollbars
 routine

---
 src/view/ThemeManager.js                      |  4 +-
 test/spec/Theme-test-files/scrollbars.css     |  3 +-
 .../Theme-test-files/simple-scrollbars.css    |  7 ++
 test/spec/ThemeManager-test.js                | 71 ++++++++++++-------
 4 files changed, 55 insertions(+), 30 deletions(-)
 create mode 100644 test/spec/Theme-test-files/simple-scrollbars.css

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index d7b3cfd25f0..e49a0e93784 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -28,7 +28,7 @@ define(function (require, exports, module) {
     var loadedThemes    = {},
         defaultTheme    = "thor-light-theme",
         commentRegex    = /\/\*([\s\S]*?)\*\//mg,
-        scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?){(?:[\s\S]*?)}/mg,
+        scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?)\{(?:[\s\S]*?)\}/mg,
         stylesPath      = FileUtils.getNativeBracketsDirectoryPath() + "/styles/",
         validExtensions = ["css", "less"];
 
@@ -404,7 +404,7 @@ define(function (require, exports, module) {
     exports.loadPackage      = loadPackage;
     exports.loadDirectory    = loadDirectory;
     exports.getCurrentThemes = getCurrentThemes;
-    
+
     // Exposed for testing purposes
     exports._toDisplayName     = toDisplayName;
     exports._extractScrollbars = extractScrollbars;
diff --git a/test/spec/Theme-test-files/scrollbars.css b/test/spec/Theme-test-files/scrollbars.css
index 8c0f8810c32..0e230af932f 100644
--- a/test/spec/Theme-test-files/scrollbars.css
+++ b/test/spec/Theme-test-files/scrollbars.css
@@ -1,4 +1,5 @@
-span{}
+span {
+}
 
 ::-webkit-scrollbar {
     width: 12px;
diff --git a/test/spec/Theme-test-files/simple-scrollbars.css b/test/spec/Theme-test-files/simple-scrollbars.css
new file mode 100644
index 00000000000..1e25194e435
--- /dev/null
+++ b/test/spec/Theme-test-files/simple-scrollbars.css
@@ -0,0 +1,7 @@
+::-webkit-scrollbar {
+    width: 12px;
+}
+
+::-webkit-scrollbar-thumb:window-inactive{
+    background: white;
+}
diff --git a/test/spec/ThemeManager-test.js b/test/spec/ThemeManager-test.js
index c0ab9a241bf..9208e906993 100644
--- a/test/spec/ThemeManager-test.js
+++ b/test/spec/ThemeManager-test.js
@@ -1,24 +1,24 @@
 /*
  * Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
@@ -33,7 +33,12 @@ define(function (require, exports, module) {
         SpecRunnerUtils  = require("spec/SpecRunnerUtils");
 
     var testFilePath = SpecRunnerUtils.getTestPath("/spec/Theme-test-files");
-    
+
+    function superTrim(text) {
+        return text.replace(/\s/g, '');
+    }
+
+
     describe("ThemeManager", function () {
 
         describe("toDisplayName", function() {
@@ -44,7 +49,7 @@ define(function (require, exports, module) {
             it("Short name", function() {
                 expect(ThemeManager._toDisplayName("this file.css")).toEqual("This File");
             });
-            
+
             it("Long name", function() {
                 expect(ThemeManager._toDisplayName("this is a simple file.css")).toEqual("This Is A Simple File");
             });
@@ -53,18 +58,30 @@ define(function (require, exports, module) {
                 expect(ThemeManager._toDisplayName("this-is a simple-file.css")).toEqual("This Is A Simple File");
             });
         });
-        
-        
+
+
         describe("Extract Scrollbar", function() {
             runs(function() {
                 var themeFile = FileSystem.getFileForPath(testFilePath + "/scrollbars.css");
                 var promise = FileUtils.readAsText(themeFile).done(function(content) {
                     var themeScrollbars = ThemeManager._extractScrollbars(content);
                     expect(themeScrollbars.scrollbar.length).toEqual(4);
-                    expect(themeScrollbars.content.trim()).toEqual("span{}");
+                    expect(superTrim(themeScrollbars.content)).toEqual("span{}");
                 });
 
-                waitsForDone(promise, "theme with scrollbar", 5000); 
+                waitsForDone(promise, "theme with scrollbar and other css", 5000);
+            });
+
+            runs(function() {
+                var themeFile = FileSystem.getFileForPath(testFilePath + "/simple-scrollbars.css");
+                var promise = FileUtils.readAsText(themeFile).done(function(content) {
+                    var themeScrollbars = ThemeManager._extractScrollbars(content);
+                    expect(themeScrollbars.scrollbar.length).toEqual(2);
+                    expect(superTrim(themeScrollbars.scrollbar.join(""))).toEqual("::-webkit-scrollbar{width:12px;}::-webkit-scrollbar-thumb:window-inactive{background:white;}");
+                    expect(superTrim(themeScrollbars.content)).toEqual("");
+                });
+
+                waitsForDone(promise, "theme with only scrollbars", 5000);
             });
 
             runs(function() {
@@ -72,14 +89,14 @@ define(function (require, exports, module) {
                 var promise = FileUtils.readAsText(themeFile).done(function(content) {
                     var themeScrollbars = ThemeManager._extractScrollbars(content);
                     expect(themeScrollbars.scrollbar.length).toEqual(0);
-                    expect(themeScrollbars.content.trim()).toEqual("");
+                    expect(superTrim(themeScrollbars.content)).toEqual("");
                 });
 
-                waitsForDone(promise, "empty theme", 5000); 
+                waitsForDone(promise, "empty theme", 5000);
             });
         });
-        
-        
+
+
         describe("Load themes", function() {
             runs(function () {
                 var promise = ThemeManager.loadFile(testFilePath + "/scrollbars.css").done(function(theme) {
@@ -87,21 +104,21 @@ define(function (require, exports, module) {
                     expect(theme.displayName).toEqual("Scrollbars");
                     expect(theme.className).toEqual("theme-scrollbars");
                 });
-                
+
                 waitsForDone(promise, "theme file", 5000);
             });
 
             runs(function () {
                 var promise = ThemeManager.loadDirectory(testFilePath).done(function() {
                     var themes = Array.prototype.slice.call(arguments);
-                    expect(themes.length).toEqual(3);
+                    expect(themes.length).toEqual(4);
                 });
 
                 waitsForDone(promise, "theme directory - skips invalid extensions", 5000);
             });
         });
-        
-        
+
+
         describe("Theme selection", function() {
             it("Get current theme", function() {
                 expect(ThemeManager.getCurrentThemes().length).toEqual(1);
@@ -110,5 +127,5 @@ define(function (require, exports, module) {
         });
 
     });
-    
+
 });

From c8576b15ea935620096bebcd30fdf7ae7953f1f3 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 12:34:54 -0400
Subject: [PATCH 85/96] Added a couple more checks in unit tests for extract
 scrollbars

---
 test/spec/Theme-test-files/simple-scrollbars.css | 5 ++++-
 test/spec/ThemeManager-test.js                   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/spec/Theme-test-files/simple-scrollbars.css b/test/spec/Theme-test-files/simple-scrollbars.css
index 1e25194e435..660473ad469 100644
--- a/test/spec/Theme-test-files/simple-scrollbars.css
+++ b/test/spec/Theme-test-files/simple-scrollbars.css
@@ -1,7 +1,10 @@
 ::-webkit-scrollbar {
     width: 12px;
+}::-webkit-scrollbar-thumb:window-inactive{
+    background: white;
 }
 
-::-webkit-scrollbar-thumb:window-inactive{
+::-webkit-scrollbar-thumb
+    {
     background: white;
 }
diff --git a/test/spec/ThemeManager-test.js b/test/spec/ThemeManager-test.js
index 9208e906993..83ae8b4ed50 100644
--- a/test/spec/ThemeManager-test.js
+++ b/test/spec/ThemeManager-test.js
@@ -76,8 +76,8 @@ define(function (require, exports, module) {
                 var themeFile = FileSystem.getFileForPath(testFilePath + "/simple-scrollbars.css");
                 var promise = FileUtils.readAsText(themeFile).done(function(content) {
                     var themeScrollbars = ThemeManager._extractScrollbars(content);
-                    expect(themeScrollbars.scrollbar.length).toEqual(2);
-                    expect(superTrim(themeScrollbars.scrollbar.join(""))).toEqual("::-webkit-scrollbar{width:12px;}::-webkit-scrollbar-thumb:window-inactive{background:white;}");
+                    expect(themeScrollbars.scrollbar.length).toEqual(3);
+                    expect(superTrim(themeScrollbars.scrollbar.join(""))).toEqual("::-webkit-scrollbar{width:12px;}::-webkit-scrollbar-thumb:window-inactive{background:white;}::-webkit-scrollbar-thumb{background:white;}");
                     expect(superTrim(themeScrollbars.content)).toEqual("");
                 });
 

From c96b7108ebe1282ac14076d9e0e4bba034baa29f Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 12:38:55 -0400
Subject: [PATCH 86/96] Corrected JSLint reported issues

---
 src/view/ThemeManager.js       | 105 ++++++++++++++++-----------------
 src/view/ThemeSettings.js      |  34 +++++------
 src/view/ThemeView.js          |  51 ++++++++--------
 test/spec/ThemeManager-test.js |  34 +++++------
 4 files changed, 110 insertions(+), 114 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index e49a0e93784..dca12f95271 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -28,28 +28,11 @@ define(function (require, exports, module) {
     var loadedThemes    = {},
         defaultTheme    = "thor-light-theme",
         commentRegex    = /\/\*([\s\S]*?)\*\//mg,
-        scrollbarsRegex = /(?:[^}|,]*)::-webkit-scrollbar(?:[\s\S]*?)\{(?:[\s\S]*?)\}/mg,
+        scrollbarsRegex = /::-webkit-scrollbar(?:[\s\S]*?)\{(?:[\s\S]*?)\}/mg,
         stylesPath      = FileUtils.getNativeBracketsDirectoryPath() + "/styles/",
         validExtensions = ["css", "less"];
 
 
-    /**
-    * @constructor
-    *
-    * @param {File} file for the theme
-    * @param {string} displayName is an optional parameter used as the display name for the theme
-    */
-    function Theme(file, options) {
-        options = options || {};
-        var fileName = file.name;
-
-        this.file        = file;
-        this.displayName = options.title     || toDisplayName(fileName);
-        this.name        = options.name      || fileName.substring(0, fileName.lastIndexOf('.'));
-        this.className   = options.className || "theme-" + this.name;
-    }
-
-
     /**
     * @private
     * Takes all dashes and converts them to white spaces. Then takes all first letters
@@ -58,7 +41,7 @@ define(function (require, exports, module) {
     * @param {string} name is what needs to be procseed to generate a display name
     * @return {string} theme name properly formatted for display
     */
-    function toDisplayName (name) {
+    function toDisplayName(name) {
         var extIndex = name.lastIndexOf('.');
         name = name.substring(0, extIndex !== -1 ? extIndex : undefined).replace(/-/g, ' ');
 
@@ -68,6 +51,23 @@ define(function (require, exports, module) {
     }
 
 
+    /**
+    * @constructor
+    *
+    * @param {File} file for the theme
+    * @param {string} displayName is an optional parameter used as the display name for the theme
+    */
+    function Theme(file, options) {
+        options = options || {};
+        var fileName = file.name;
+
+        this.file        = file;
+        this.displayName = options.title     || toDisplayName(fileName);
+        this.name        = options.name      || fileName.substring(0, fileName.lastIndexOf('.'));
+        this.className   = options.className || "theme-" + this.name;
+    }
+
+
     /**
     * @private
     * Extracts the scrollbar text from the css/less content so that it can be treated
@@ -85,7 +85,7 @@ define(function (require, exports, module) {
         // enable/disable via settings.
         content = content
             .replace(commentRegex, "")
-            .replace(scrollbarsRegex, function(match) {
+            .replace(scrollbarsRegex, function (match) {
                 scrollbar.push(match);
                 return "";
             });
@@ -116,8 +116,7 @@ define(function (require, exports, module) {
         parser.parse("." + theme.className + "{" + content + "}", function (err, tree) {
             if (err) {
                 deferred.reject(err);
-            }
-            else {
+            } else {
                 deferred.resolve(tree.toCSS());
             }
         });
@@ -148,7 +147,7 @@ define(function (require, exports, module) {
     */
     function getThemeByFile(file) {
         var path = file._path;
-        return _.find(loadedThemes, function(item) {
+        return _.find(loadedThemes, function (item) {
             return item.file._path === path;
         });
     }
@@ -165,13 +164,26 @@ define(function (require, exports, module) {
         // Really dislike timing issues with CodeMirror.  I have to refresh
         // the editor after a little bit of time to make sure that themes
         // are properly applied to quick edit widgets
-        setTimeout(function(){
+        setTimeout(function () {
             cm.refresh();
             EditorManager.resizeEditor();
         }, 100);
     }
 
 
+    /**
+    * @private
+    * Get all current theme objects
+    *
+    * @return {_.map} collection of the current theme instances
+    */
+    function getCurrentThemes() {
+        return _.map(prefs.get("themes").slice(0), function (item) {
+            return loadedThemes[item] || loadedThemes[defaultTheme];
+        });
+    }
+
+
     /**
     * @private
     * Loads all current themes
@@ -183,18 +195,18 @@ define(function (require, exports, module) {
         var pendingThemes = _.map(getCurrentThemes(), function (theme) {
 
             return theme && FileUtils.readAsText(theme.file)
-                .then(function(content) {
+                .then(function (content) {
                     var result = extractScrollbars(content);
                     theme.scrollbar = result.scrollbar;
                     return result.content;
                 })
-                .then(function(content) {
+                .then(function (content) {
                     return lessifyTheme(content, theme);
                 })
-                .then(function(style) {
+                .then(function (style) {
                     return ExtensionUtils.addEmbeddedStyleSheet(style);
                 })
-                .then(function(styleNode) {
+                .then(function (styleNode) {
                     // Remove after the style has been applied to avoid weird flashes
                     if (theme.css) {
                         $(theme.css).remove();
@@ -209,26 +221,13 @@ define(function (require, exports, module) {
     }
 
 
-    /**
-    * @private
-    * Get all current theme objects
-    *
-    * @return {_.map} collection of the current theme instances
-    */
-    function getCurrentThemes() {
-        return _.map(prefs.get("themes").slice(0), function (item) {
-            return loadedThemes[item] || loadedThemes[defaultTheme];
-        });
-    }
-
-
     /**
     * Refresh currently loaded themes
     *
     * @param <boolean> force is to force reload the current themes
     */
     function refresh(force) {
-        $.when(force && loadCurrentThemes()).done(function() {
+        $.when(force && loadCurrentThemes()).done(function () {
             var editor = EditorManager.getActiveEditor();
             if (!editor || !editor._codeMirror) {
                 return;
@@ -256,7 +255,7 @@ define(function (require, exports, module) {
             file          = FileSystem.getFileForPath(fileName),
             currentThemes = (prefs.get("themes") || []);
 
-        file.exists(function(err, exists) {
+        file.exists(function (err, exists) {
             var theme;
 
             if (exists) {
@@ -272,8 +271,7 @@ define(function (require, exports, module) {
                 }
 
                 deferred.resolve(theme);
-            }
-            else if (err) {
+            } else if (err) {
                 deferred.reject(err);
             }
         });
@@ -325,8 +323,7 @@ define(function (require, exports, module) {
                     path: path,
                     error: err
                 });
-            }
-            else {
+            } else {
                 result.resolve({
                     files: files,
                     path: path
@@ -349,7 +346,7 @@ define(function (require, exports, module) {
 
 
     function init() {
-        prefs.on("change", "themes", function() {
+        prefs.on("change", "themes", function () {
             refresh(true);
             ThemeView.updateScrollbars(getCurrentThemes()[0]);
 
@@ -357,27 +354,27 @@ define(function (require, exports, module) {
             $(exports).trigger("themeChange", getCurrentThemes());
         });
 
-        prefs.on("change", "customScrollbars", function() {
+        prefs.on("change", "customScrollbars", function () {
             refresh();
             ThemeView.updateScrollbars(getCurrentThemes()[0]);
         });
 
-        prefs.on("change", "fontSize", function() {
+        prefs.on("change", "fontSize", function () {
             refresh();
             ThemeView.updateFontSize();
         });
 
-        prefs.on("change", "lineHeight", function() {
+        prefs.on("change", "lineHeight", function () {
             refresh();
             ThemeView.updateLineHeight();
         });
 
-        prefs.on("change", "fontFamily", function() {
+        prefs.on("change", "fontFamily", function () {
             refresh();
             ThemeView.updateFontFamily();
         });
 
-        FileSystem.on("change", function(evt, file) {
+        FileSystem.on("change", function (evt, file) {
             if (file.isDirectory) {
                 return;
             }
@@ -387,7 +384,7 @@ define(function (require, exports, module) {
             }
         });
 
-        $(EditorManager).on("activeEditorChange", function() {
+        $(EditorManager).on("activeEditorChange", function () {
             refresh();
         });
 
diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index 2409f74401e..280a6aa43a2 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -8,7 +8,7 @@
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
 /*global $, define, require, Mustache */
 
-define(function(require, exports, module) {
+define(function (require, exports, module) {
     "use strict";
 
     var _                  = require("thirdparty/lodash"),
@@ -41,18 +41,28 @@ define(function(require, exports, module) {
      */
     var $settings = $(settingsTemplate).addClass("themeSettings");
 
+    /**
+     * @private
+     * Gets all the configurable settings that need to be loaded in the settings dialog
+     */
+    function getValues() {
+        return _.transform(defaults, function (result, value, key) {
+            result[key] = prefs.get(key);
+        });
+    }
+
     /**
      * Opens the settings dialog
      */
     function showDialog() {
         var currentSettings = getValues();
         var newSettings     = {};
-        var themes          = _.map(loadedThemes, function(theme) {return theme;});
+        var themes          = _.map(loadedThemes, function (theme) { return theme; });
         var template        = $("<div>").append($settings).html();
         var $template       = $(Mustache.render(template, {"settings": currentSettings, "themes": themes, "Strings": Strings}));
 
         // Select the correct theme.
-        _.each(currentSettings.themes, function(item) {
+        _.each(currentSettings.themes, function (item) {
             $template
                 .find("[value='" + item + "']")
                 .attr("selected", "selected");
@@ -63,23 +73,23 @@ define(function(require, exports, module) {
             .tab("show");
 
         $template
-            .on("change", "[data-target]:checkbox", function() {
+            .on("change", "[data-target]:checkbox", function () {
                 var $target = $(this);
                 var attr = $target.attr("data-target");
                 newSettings[attr] = $target.is(":checked");
             })
-            .on("change", "[data-target]:text", function() {
+            .on("change", "[data-target]:text", function () {
                 var $target = $(this);
                 var attr = $target.attr("data-target");
                 newSettings[attr] = $target.val();
             })
-            .on("change", function() {
+            .on("change", function () {
                 var items;
                 var $target = $(":selected", this);
                 var attr = $target.attr("data-target");
 
                 if (attr) {
-                    items = $target.map(function(i, item) {
+                    items = $target.map(function (i, item) {
                         return $(item).val();
                     });
 
@@ -104,16 +114,6 @@ define(function(require, exports, module) {
         loadedThemes = themes;
     }
 
-    /**
-     * @private
-     * Gets all the configurable settings that need to be loaded in the settings dialog
-     */
-    function getValues() {
-        return _.transform(defaults, function(result, value, key) {
-            result[key] = prefs.get(key);
-        });
-    }
-
     /**
      * Restores themes to factory settings.
      */
diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
index fe8123dc918..f49e8d2956c 100644
--- a/src/view/ThemeView.js
+++ b/src/view/ThemeView.js
@@ -27,6 +27,30 @@ define(function (require, exports, module) {
     };
 
 
+    function clearFonts() {
+        // Remove this tag that is intefering with font settings set in this module
+        $("#codemirror-dynamic-fonts").remove();
+    }
+
+
+    /**
+    * Add theme class to the document to add proper theme styling scoping.
+    * New class is added, old class is removed.  This basically allows
+    * themeSettings to get nicely cleaned up from the DOM.
+    */
+    function setDocumentTheme() {
+        var newThemes = (prefs.get("themes") || []);
+        var oldThemes = (currentThemes || []).slice(0);
+        currentThemes = newThemes.slice(0);
+
+        // We gotta prefix theme names with "theme" because themes that start with a number
+        // will not render correctly.  Class names that start with a number are invalid
+        newThemes = _.map(newThemes, function (theme) { return "theme-" + theme; }).join(" ");
+        oldThemes = _.map(oldThemes, function (theme) { return "theme-" + theme; }).join(" ");
+        $("html").removeClass(oldThemes).addClass(newThemes);
+    }
+
+
     function updateLineHeight() {
         clearFonts();
         var value = prefs.get("lineHeight");
@@ -48,12 +72,6 @@ define(function (require, exports, module) {
     }
 
 
-    function clearFonts() {
-        // Remove this tag that is intefering with font settings set in this module
-        $("#codemirror-dynamic-fonts").remove();
-    }
-
-
     function updateFonts() {
         clearFonts();
         updateLineHeight();
@@ -67,8 +85,7 @@ define(function (require, exports, module) {
         if (prefs.get("customScrollbars")) {
             var scrollbar = (theme.scrollbar || []).join(" ");
             templates.$scrollbars.text(scrollbar || "");
-        }
-        else {
+        } else {
             templates.$scrollbars.text("");
         }
     }
@@ -97,24 +114,6 @@ define(function (require, exports, module) {
     }
 
 
-    /**
-    * Add theme class to the document to add proper theme styling scoping.
-    * New class is added, old class is removed.  This basically allows
-    * themeSettings to get nicely cleaned up from the DOM.
-    */
-    function setDocumentTheme() {
-        var newThemes = (prefs.get("themes") || []);
-        var oldThemes = (currentThemes || []).slice(0);
-        currentThemes = newThemes.slice(0);
-
-        // We gotta prefix theme names with "theme" because themes that start with a number
-        // will not render correctly.  Class names that start with a number are invalid
-        newThemes = _.map(newThemes, function(theme){ return "theme-" + theme; }).join(" ");
-        oldThemes = _.map(oldThemes, function(theme){ return "theme-" + theme; }).join(" ");
-        $("html").removeClass(oldThemes).addClass(newThemes);
-    }
-
-
     /**
     * Sets the document type in the DOM to enable styling per doc type
     *
diff --git a/test/spec/ThemeManager-test.js b/test/spec/ThemeManager-test.js
index 83ae8b4ed50..31a8f01763a 100644
--- a/test/spec/ThemeManager-test.js
+++ b/test/spec/ThemeManager-test.js
@@ -41,29 +41,29 @@ define(function (require, exports, module) {
 
     describe("ThemeManager", function () {
 
-        describe("toDisplayName", function() {
-            it("Name with no extension", function() {
+        describe("toDisplayName", function () {
+            it("Name with no extension", function () {
                 expect(ThemeManager._toDisplayName("this file")).toEqual("This File");
             });
 
-            it("Short name", function() {
+            it("Short name", function () {
                 expect(ThemeManager._toDisplayName("this file.css")).toEqual("This File");
             });
 
-            it("Long name", function() {
+            it("Long name", function () {
                 expect(ThemeManager._toDisplayName("this is a simple file.css")).toEqual("This Is A Simple File");
             });
 
-            it("Name with dashes", function() {
+            it("Name with dashes", function () {
                 expect(ThemeManager._toDisplayName("this-is a simple-file.css")).toEqual("This Is A Simple File");
             });
         });
 
 
-        describe("Extract Scrollbar", function() {
-            runs(function() {
+        describe("Extract Scrollbar", function () {
+            runs(function () {
                 var themeFile = FileSystem.getFileForPath(testFilePath + "/scrollbars.css");
-                var promise = FileUtils.readAsText(themeFile).done(function(content) {
+                var promise = FileUtils.readAsText(themeFile).done(function (content) {
                     var themeScrollbars = ThemeManager._extractScrollbars(content);
                     expect(themeScrollbars.scrollbar.length).toEqual(4);
                     expect(superTrim(themeScrollbars.content)).toEqual("span{}");
@@ -72,9 +72,9 @@ define(function (require, exports, module) {
                 waitsForDone(promise, "theme with scrollbar and other css", 5000);
             });
 
-            runs(function() {
+            runs(function () {
                 var themeFile = FileSystem.getFileForPath(testFilePath + "/simple-scrollbars.css");
-                var promise = FileUtils.readAsText(themeFile).done(function(content) {
+                var promise = FileUtils.readAsText(themeFile).done(function (content) {
                     var themeScrollbars = ThemeManager._extractScrollbars(content);
                     expect(themeScrollbars.scrollbar.length).toEqual(3);
                     expect(superTrim(themeScrollbars.scrollbar.join(""))).toEqual("::-webkit-scrollbar{width:12px;}::-webkit-scrollbar-thumb:window-inactive{background:white;}::-webkit-scrollbar-thumb{background:white;}");
@@ -84,9 +84,9 @@ define(function (require, exports, module) {
                 waitsForDone(promise, "theme with only scrollbars", 5000);
             });
 
-            runs(function() {
+            runs(function () {
                 var themeFile = FileSystem.getFileForPath(testFilePath + "/empty.css");
-                var promise = FileUtils.readAsText(themeFile).done(function(content) {
+                var promise = FileUtils.readAsText(themeFile).done(function (content) {
                     var themeScrollbars = ThemeManager._extractScrollbars(content);
                     expect(themeScrollbars.scrollbar.length).toEqual(0);
                     expect(superTrim(themeScrollbars.content)).toEqual("");
@@ -97,9 +97,9 @@ define(function (require, exports, module) {
         });
 
 
-        describe("Load themes", function() {
+        describe("Load themes", function () {
             runs(function () {
-                var promise = ThemeManager.loadFile(testFilePath + "/scrollbars.css").done(function(theme) {
+                var promise = ThemeManager.loadFile(testFilePath + "/scrollbars.css").done(function (theme) {
                     expect(theme.name).toEqual("scrollbars");
                     expect(theme.displayName).toEqual("Scrollbars");
                     expect(theme.className).toEqual("theme-scrollbars");
@@ -109,7 +109,7 @@ define(function (require, exports, module) {
             });
 
             runs(function () {
-                var promise = ThemeManager.loadDirectory(testFilePath).done(function() {
+                var promise = ThemeManager.loadDirectory(testFilePath).done(function () {
                     var themes = Array.prototype.slice.call(arguments);
                     expect(themes.length).toEqual(4);
                 });
@@ -119,8 +119,8 @@ define(function (require, exports, module) {
         });
 
 
-        describe("Theme selection", function() {
-            it("Get current theme", function() {
+        describe("Theme selection", function () {
+            it("Get current theme", function () {
                 expect(ThemeManager.getCurrentThemes().length).toEqual(1);
                 expect(ThemeManager.getCurrentThemes()[0]).toBeUndefined();
             });

From a298a956bf931708317df6389ba5aec3f0dcdfdd Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 12:46:18 -0400
Subject: [PATCH 87/96] Adding full MIT license clauses

---
 src/view/ThemeManager.js  | 20 ++++++++++++++++++--
 src/view/ThemeSettings.js | 20 ++++++++++++++++++--
 src/view/ThemeView.js     | 20 ++++++++++++++++++--
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index dca12f95271..039b69d1f8c 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -1,10 +1,26 @@
 /**
  * Brackets Themes Copyright (c) 2014 Miguel Castillo.
  *
- * Licensed under MIT
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
  */
 
-
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
 /*global $, define, require, less */
 
diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index 280a6aa43a2..696e55e8887 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -1,10 +1,26 @@
 /**
  * Brackets Themes Copyright (c) 2014 Miguel Castillo.
  *
- * Licensed under MIT
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
  */
 
-
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
 /*global $, define, require, Mustache */
 
diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
index f49e8d2956c..8eadee778c8 100644
--- a/src/view/ThemeView.js
+++ b/src/view/ThemeView.js
@@ -1,10 +1,26 @@
 /**
  * Brackets Themes Copyright (c) 2014 Miguel Castillo.
  *
- * Licensed under MIT
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
  */
 
-
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
 /*global $, define, require */
 

From 9c1fa748b80addc8ef8c490273bd9653fcd1db31 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 15:24:46 -0400
Subject: [PATCH 88/96] Added interface to retrieve all loaded themes that have
 been loaded

---
 src/view/ThemeManager.js       | 18 +++++++++++++++---
 test/spec/ThemeManager-test.js |  4 +++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 039b69d1f8c..0e8438360f5 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -79,8 +79,8 @@ define(function (require, exports, module) {
 
         this.file        = file;
         this.displayName = options.title     || toDisplayName(fileName);
-        this.name        = options.name      || fileName.substring(0, fileName.lastIndexOf('.'));
-        this.className   = options.className || "theme-" + this.name;
+        this.name        = options.name      || fileName.replace('.', '-');
+        this.className   = options.className || "theme-" + fileName.substring(0, fileName.lastIndexOf('.'));
     }
 
 
@@ -191,13 +191,24 @@ define(function (require, exports, module) {
     * @private
     * Get all current theme objects
     *
-    * @return {_.map} collection of the current theme instances
+    * @return {array} collection of the current theme instances
     */
     function getCurrentThemes() {
         return _.map(prefs.get("themes").slice(0), function (item) {
             return loadedThemes[item] || loadedThemes[defaultTheme];
         });
     }
+    
+    
+    /**
+     * Provides quick access to all available themes
+     * @return {array} collection of all available themes
+     */
+    function getAllThemes() {
+        return _.map(loadedThemes, function(item) {
+            return item;
+        });
+    }
 
 
     /**
@@ -417,6 +428,7 @@ define(function (require, exports, module) {
     exports.loadPackage      = loadPackage;
     exports.loadDirectory    = loadDirectory;
     exports.getCurrentThemes = getCurrentThemes;
+    exports.getAllThemes     = getAllThemes;
 
     // Exposed for testing purposes
     exports._toDisplayName     = toDisplayName;
diff --git a/test/spec/ThemeManager-test.js b/test/spec/ThemeManager-test.js
index 31a8f01763a..262d0c417b7 100644
--- a/test/spec/ThemeManager-test.js
+++ b/test/spec/ThemeManager-test.js
@@ -100,7 +100,7 @@ define(function (require, exports, module) {
         describe("Load themes", function () {
             runs(function () {
                 var promise = ThemeManager.loadFile(testFilePath + "/scrollbars.css").done(function (theme) {
-                    expect(theme.name).toEqual("scrollbars");
+                    expect(theme.name).toEqual("scrollbars-css");
                     expect(theme.displayName).toEqual("Scrollbars");
                     expect(theme.className).toEqual("theme-scrollbars");
                 });
@@ -111,7 +111,9 @@ define(function (require, exports, module) {
             runs(function () {
                 var promise = ThemeManager.loadDirectory(testFilePath).done(function () {
                     var themes = Array.prototype.slice.call(arguments);
+                    var allThemes = ThemeManager.getAllThemes();
                     expect(themes.length).toEqual(4);
+                    expect(allThemes.length).toEqual(4);
                 });
 
                 waitsForDone(promise, "theme directory - skips invalid extensions", 5000);

From 59944e3c146dd75fffae6b9b8b4e1e6d2f310dce Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 15:50:09 -0400
Subject: [PATCH 89/96] Corrected jslint complain of missing space

---
 src/view/ThemeManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 0e8438360f5..473f0fdfd44 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -205,7 +205,7 @@ define(function (require, exports, module) {
      * @return {array} collection of all available themes
      */
     function getAllThemes() {
-        return _.map(loadedThemes, function(item) {
+        return _.map(loadedThemes, function (item) {
             return item;
         });
     }

From 53e5324bbf9d0a9445c000029e5d04357f67f4b8 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 15:50:29 -0400
Subject: [PATCH 90/96] Added jsdoc return description

---
 src/view/ThemeSettings.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index 696e55e8887..fe5e4da27e5 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -60,6 +60,8 @@ define(function (require, exports, module) {
     /**
      * @private
      * Gets all the configurable settings that need to be loaded in the settings dialog
+     *
+     * @return {array} a collection with all the settings
      */
     function getValues() {
         return _.transform(defaults, function (result, value, key) {

From d6ed17684db930566405cb59b9f8e08ae7df1c62 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 16:26:38 -0400
Subject: [PATCH 91/96] Corrected regression due to new logic to include the
 file extension as part of the theme name

---
 src/view/ThemeManager.js       | 2 +-
 test/spec/ThemeManager-test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index 473f0fdfd44..b9b26da9d99 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -80,7 +80,7 @@ define(function (require, exports, module) {
         this.file        = file;
         this.displayName = options.title     || toDisplayName(fileName);
         this.name        = options.name      || fileName.replace('.', '-');
-        this.className   = options.className || "theme-" + fileName.substring(0, fileName.lastIndexOf('.'));
+        this.className   = options.className || "theme-" + this.name;
     }
 
 
diff --git a/test/spec/ThemeManager-test.js b/test/spec/ThemeManager-test.js
index 262d0c417b7..9b2a3fd9311 100644
--- a/test/spec/ThemeManager-test.js
+++ b/test/spec/ThemeManager-test.js
@@ -102,7 +102,7 @@ define(function (require, exports, module) {
                 var promise = ThemeManager.loadFile(testFilePath + "/scrollbars.css").done(function (theme) {
                     expect(theme.name).toEqual("scrollbars-css");
                     expect(theme.displayName).toEqual("Scrollbars");
-                    expect(theme.className).toEqual("theme-scrollbars");
+                    expect(theme.className).toEqual("theme-scrollbars-css");
                 });
 
                 waitsForDone(promise, "theme file", 5000);

From 8156a388a0223d4dd9d93ddf3fa072b80e22aa02 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 16:48:19 -0400
Subject: [PATCH 92/96] Adding a more specific rule for line height to avoid
 line height not getting applied

---
 src/view/ThemeView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
index 8eadee778c8..dc924a06749 100644
--- a/src/view/ThemeView.js
+++ b/src/view/ThemeView.js
@@ -70,7 +70,7 @@ define(function (require, exports, module) {
     function updateLineHeight() {
         clearFonts();
         var value = prefs.get("lineHeight");
-        templates.$lineHeight.text(".CodeMirror{" + "line-height: " + value + "; }");
+        templates.$lineHeight.text(".CodeMirror-lines > div {" + "line-height: " + value + "; }");
     }
 
 

From 14de4732bfaac2921bb0d0e1f60b6a1632f953c4 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 17:03:24 -0400
Subject: [PATCH 93/96] Make the line height rule a little more relaxed so that
 it does not make use of DOM hierarchies

---
 src/view/ThemeView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/view/ThemeView.js b/src/view/ThemeView.js
index dc924a06749..bf5509cc249 100644
--- a/src/view/ThemeView.js
+++ b/src/view/ThemeView.js
@@ -70,7 +70,7 @@ define(function (require, exports, module) {
     function updateLineHeight() {
         clearFonts();
         var value = prefs.get("lineHeight");
-        templates.$lineHeight.text(".CodeMirror-lines > div {" + "line-height: " + value + "; }");
+        templates.$lineHeight.text(".CodeMirror-lines{" + "line-height: " + value + "; }");
     }
 
 

From 208eb495d452869db8b9b536d1d9549e869391ae Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Wed, 9 Jul 2014 18:03:41 -0400
Subject: [PATCH 94/96] Removed em from line height

---
 src/view/ThemeSettings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/view/ThemeSettings.js b/src/view/ThemeSettings.js
index fe5e4da27e5..5f7a779da57 100644
--- a/src/view/ThemeSettings.js
+++ b/src/view/ThemeSettings.js
@@ -45,7 +45,7 @@ define(function (require, exports, module) {
      */
     var defaults = {
         "fontSize": 12,
-        "lineHeight": '1.3em',
+        "lineHeight": 1.4,
         "fontFamily": "'SourceCodePro-Medium', ＭＳ ゴシック, 'MS Gothic', monospace",
         "customScrollbars": true,
         "themes": ["thor-light-theme"]
@@ -146,7 +146,7 @@ define(function (require, exports, module) {
 
     prefs.definePreference("themes", "array", defaults.themes);
     prefs.definePreference("fontSize", "string", defaults.fontSize + "px");
-    prefs.definePreference("lineHeight", "string", defaults.lineHeight);
+    prefs.definePreference("lineHeight", "number", defaults.lineHeight);
     prefs.definePreference("fontFamily", "string", defaults.fontFamily);
     prefs.definePreference("customScrollbars", "boolean", defaults.customScrollbars);
 

From 11d2c9be996c7c61cd34d8feb0b7de2c61577db2 Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 11 Jul 2014 16:45:54 -0400
Subject: [PATCH 95/96] Adjusted the logic for creating internal themes names
 when one isn't provided

---
 src/view/ThemeManager.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index b9b26da9d99..f12af53bbac 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -77,10 +77,15 @@ define(function (require, exports, module) {
         options = options || {};
         var fileName = file.name;
 
+        // The name is used to map the loaded themes to the list in the settings dialog. So we want
+        // a unique name if one is not provided.  This is partocularly important when loading just
+        // files where there is no other way to feed in meta data to provide unique names.  Say, there
+        // is a theme1.css and a theme1.less that are entirely different themes...
+
         this.file        = file;
-        this.displayName = options.title     || toDisplayName(fileName);
-        this.name        = options.name      || fileName.replace('.', '-');
+        this.name        = options.name      || (options.title || fileName).toLocaleLowerCase().replace(/[\W]/g, '-');
         this.className   = options.className || "theme-" + this.name;
+        this.displayName = options.title     || toDisplayName(fileName);
     }
 
 
@@ -198,8 +203,8 @@ define(function (require, exports, module) {
             return loadedThemes[item] || loadedThemes[defaultTheme];
         });
     }
-    
-    
+
+
     /**
      * Provides quick access to all available themes
      * @return {array} collection of all available themes

From bef48a693873aeca75e79f871dc169d7d65524cf Mon Sep 17 00:00:00 2001
From: Miguel Castillo <manchagnu@gmail.com>
Date: Fri, 11 Jul 2014 18:14:22 -0400
Subject: [PATCH 96/96] Adding fix to lower case windows driver letters so that
 the less processor does not choke.

---
 src/view/ThemeManager.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
index f12af53bbac..f756d94e05f 100644
--- a/src/view/ThemeManager.js
+++ b/src/view/ThemeManager.js
@@ -78,7 +78,7 @@ define(function (require, exports, module) {
         var fileName = file.name;
 
         // The name is used to map the loaded themes to the list in the settings dialog. So we want
-        // a unique name if one is not provided.  This is partocularly important when loading just
+        // a unique name if one is not provided.  This is particularly important when loading just
         // files where there is no other way to feed in meta data to provide unique names.  Say, there
         // is a theme1.css and a theme1.less that are entirely different themes...
 
@@ -118,6 +118,22 @@ define(function (require, exports, module) {
     }
 
 
+    /**
+    * @private
+    * Function will process a string and figure out if it looks like window path with a
+    * a drive.  If that's the case, then we lower case everything.
+    * --- NOTE: There is a bug in less that only checks for lowercase in order to handle
+    * the rootPath configuration...  Hopefully a PR will be coming their way soon.
+    *
+    * @return {string} Windows Drive letter in lowercase.
+    */
+    function fixPath(path) {
+        return path.replace(/^([A-Z]+:)?\//, function (match) {
+            return match.toLocaleLowerCase();
+        });
+    }
+
+
     /**
     * @private
     * Takes the content of a file and feeds it through the less processor in order
@@ -130,8 +146,8 @@ define(function (require, exports, module) {
     function lessifyTheme(content, theme) {
         var deferred = new $.Deferred();
         var parser   = new less.Parser({
-            rootpath: stylesPath,
-            filename: theme.file._path
+            rootpath: fixPath(stylesPath),
+            filename: fixPath(theme.file._path)
         });
 
         parser.parse("." + theme.className + "{" + content + "}", function (err, tree) {