diff --git a/cloudpebble/settings.py b/cloudpebble/settings.py
index ee607887..d593a3ee 100644
--- a/cloudpebble/settings.py
+++ b/cloudpebble/settings.py
@@ -153,7 +153,7 @@
     'jshint/jshint',
     'html.sortable#~0.3.1',
     'alexgorbatchev/jquery-textext',
-    'codemirror#4.2.0',
+    'codemirror#5.15.2',
     'bluebird#3.3.4',
     'kanaka/noVNC',
 )
diff --git a/ide/static/ide/css/codemirror-default.css b/ide/static/ide/css/codemirror-default.css
index 89aa9a9a..830878b2 100644
--- a/ide/static/ide/css/codemirror-default.css
+++ b/ide/static/ide/css/codemirror-default.css
@@ -14,6 +14,7 @@
 .cm-s-cloudpebble span.cm-keyword {color: #f52323;}
 .cm-s-cloudpebble span.cm-string {color: #e47c08;}
 
+.cm-s-cloudpebble span.cm-meta {color: #fff;}
 .cm-s-cloudpebble span.cm-variable {color: #a4dc40;}
 .cm-s-cloudpebble span.cm-variable-2 {color: #9effff;}
 .cm-s-cloudpebble span.cm-def {color: #fd971f;}
diff --git a/ide/static/ide/js/syntax.js b/ide/static/ide/js/syntax.js
index c57145fe..d30a3426 100644
--- a/ide/static/ide/js/syntax.js
+++ b/ide/static/ide/js/syntax.js
@@ -1,308 +1,375 @@
-CloudPebble.Editor.PebbleMode = {
-    name: 'text/x-c',
-    useCPP: true,
-    keywords: {
-        // C
-        'auto': true,
-        'if': true,
-        'break': true,
-        'int': true,
-        'case': true,
-        'long': true,
-        'char': true,
-        'register': true,
-        'continue': true,
-        'return': true,
-        'default': true,
-        'short': true,
-        'do': true,
-        'sizeof': true,
-        'double': true,
-        'static': true,
-        'else': true,
-        'struct': true,
-        'entry': true,
-        'switch': true,
-        'extern': true,
-        'typedef': true,
-        'float': true,
-        'union': true,
-        'for': true,
-        'unsigned': true,
-        'goto': true,
-        'while': true,
-        'enum': true,
-        'void': true,
-        'const': true,
-        'signed': true,
-        'volatile': true,
-        'bool': true,
-        '_Bool': true,
-        'int8_t': true,
-        'uint8_t': true,
-        'int16_t': true,
-        'uint16_t': true,
-        'int32_t': true,
-        'uint32_t': true,
-        'time_t': true,
-        // Pebble-specific
-        'ACCEL_AXIS_X': true,
-        'ACCEL_AXIS_Y': true,
-        'ACCEL_AXIS_Z': true,
-        'ACCEL_SAMPLING_100HZ': true,
-        'ACCEL_SAMPLING_10HZ': true,
-        'ACCEL_SAMPLING_25HZ': true,
-        'ACCEL_SAMPLING_50HZ': true,
-        'APP_LAUNCH_PHONE': true,
-        'APP_LAUNCH_QUICK_LAUNCH': true,
-        'APP_LAUNCH_SYSTEM': true,
-        'APP_LAUNCH_USER': true,
-        'APP_LAUNCH_WAKEUP': true,
-        'APP_LAUNCH_WORKER': true,
-        'APP_LOG_LEVEL_DEBUG': true,
-        'APP_LOG_LEVEL_DEBUG_VERBOSE': true,
-        'APP_LOG_LEVEL_ERROR': true,
-        'APP_LOG_LEVEL_INFO': true,
-        'APP_LOG_LEVEL_WARNING': true,
-        'APP_MSG_ALREADY_RELEASED': true,
-        'APP_MSG_APP_NOT_RUNNING': true,
-        'APP_MSG_BUFFER_OVERFLOW': true,
-        'APP_MSG_BUSY': true,
-        'APP_MSG_CALLBACK_ALREADY_REGISTERED': true,
-        'APP_MSG_CALLBACK_NOT_REGISTERED': true,
-        'APP_MSG_CLOSED': true,
-        'APP_MSG_INTERNAL_ERROR': true,
-        'APP_MSG_INVALID_ARGS': true,
-        'APP_MSG_NOT_CONNECTED': true,
-        'APP_MSG_OK': true,
-        'APP_MSG_OUT_OF_MEMORY': true,
-        'APP_MSG_SEND_REJECTED': true,
-        'APP_MSG_SEND_TIMEOUT': true,
-        'APP_WORKER_RESULT_ALREADY_RUNNING': true,
-        'APP_WORKER_RESULT_ASKING_CONFIRMATION': true,
-        'APP_WORKER_RESULT_DIFFERENT_APP': true,
-        'APP_WORKER_RESULT_NOT_RUNNING': true,
-        'APP_WORKER_RESULT_NO_WORKER': true,
-        'APP_WORKER_RESULT_SUCCESS': true,
-        'AccelAxisType': true,
-        'AccelDataHandler': true,
-        'AccelRawDataHandler': true,
-        'AccelSamplingRate': true,
-        'AccelTapHandler': true,
-        'ActionBarLayer': true,
-        'AnimationCurve': true,
-        'AnimationCurveCustomFunction': true,
-        'AnimationCurveEaseIn': true,
-        'AnimationCurveEaseInOut': true,
-        'AnimationCurveEaseOut': true,
-        'AnimationCurveFunction': true,
-        'AnimationCurveLinear': true,
-        'AnimationCurve_Reserved1': true,
-        'AnimationCurve_Reserved2': true,
-        'AnimationCurve_Reserved3': true,
-        'AnimationSetupImplementation': true,
-        'AnimationStartedHandler': true,
-        'AnimationStoppedHandler': true,
-        'AnimationTeardownImplementation': true,
-        'AnimationUpdateImplementation': true,
-        'AppFocusHandler': true,
-        'AppLaunchReason': true,
-        'AppLogLevel': true,
-        'AppMessageInboxDropped': true,
-        'AppMessageInboxReceived': true,
-        'AppMessageOutboxFailed': true,
-        'AppMessageOutboxSent': true,
-        'AppMessageResult': true,
-        'AppSyncErrorCallback': true,
-        'AppSyncTupleChangedCallback': true,
-        'AppTimer': true,
-        'AppTimerCallback': true,
-        'AppWorkerMessageHandler': true,
-        'AppWorkerResult': true,
-        'BUTTON_ID_BACK': true,
-        'BUTTON_ID_DOWN': true,
-        'BUTTON_ID_SELECT': true,
-        'BUTTON_ID_UP': true,
-        'BatteryStateHandler': true,
-        'BitmapLayer': true,
-        'BluetoothConnectionHandler': true,
-        'ButtonId': true,
-        'ClickConfigProvider': true,
-        'ClickHandler': true,
-        'ClickRecognizerRef': true,
-        'CompassHeading': true,
-        'CompassHeadingHandler': true,
-        'CompassStatus': true,
-        'CompassStatusCalibrated': true,
-        'CompassStatusCalibrating': true,
-        'CompassStatusDataInvalid': true,
-        'DATA_LOGGING_BUSY': true,
-        'DATA_LOGGING_BYTE_ARRAY': true,
-        'DATA_LOGGING_CLOSED': true,
-        'DATA_LOGGING_FULL': true,
-        'DATA_LOGGING_INT': true,
-        'DATA_LOGGING_INVALID_PARAMS': true,
-        'DATA_LOGGING_NOT_FOUND': true,
-        'DATA_LOGGING_SUCCESS': true,
-        'DATA_LOGGING_UINT': true,
-        'DAY_UNIT': true,
-        'DICT_INTERNAL_INCONSISTENCY': true,
-        'DICT_INVALID_ARGS': true,
-        'DICT_MALLOC_FAILED': true,
-        'DICT_NOT_ENOUGH_STORAGE': true,
-        'DICT_OK': true,
-        'DataLoggingItemType': true,
-        'DataLoggingResult': true,
-        'DataLoggingSessionRef': true,
-        'Dictionary': true,
-        'DictionaryKeyUpdatedCallback': true,
-        'DictionaryResult': true,
-        'DictionarySerializeCallback': true,
-        'E_BUSY': true,
-        'E_DOES_NOT_EXIST': true,
-        'E_ERROR': true,
-        'E_INTERNAL': true,
-        'E_INVALID_ARGUMENT': true,
-        'E_INVALID_OPERATION': true,
-        'E_OUT_OF_MEMORY': true,
-        'E_OUT_OF_RESOURCES': true,
-        'E_OUT_OF_STORAGE': true,
-        'E_RANGE': true,
-        'E_UNKNOWN': true,
-        'FRIDAY': true,
-        'GAlign': true,
-        'GAlignBottom': true,
-        'GAlignBottomLeft': true,
-        'GAlignBottomRight': true,
-        'GAlignCenter': true,
-        'GAlignLeft': true,
-        'GAlignRight': true,
-        'GAlignTop': true,
-        'GAlignTopLeft': true,
-        'GAlignTopRight': true,
-        'GColor': true,
-        'GColorBlack': true,
-        'GColorClear': true,
-        'GColorWhite': true,
-        'GCompOp': true,
-        'GCompOpAnd': true,
-        'GCompOpAssign': true,
-        'GCompOpAssignInverted': true,
-        'GCompOpClear': true,
-        'GCompOpOr': true,
-        'GCompOpSet': true,
-        'GContext': true,
-        'GCornerBottomLeft': true,
-        'GCornerBottomRight': true,
-        'GCornerMask': true,
-        'GCornerNone': true,
-        'GCornerTopLeft': true,
-        'GCornerTopRight': true,
-        'GCornersAll': true,
-        'GCornersBottom': true,
-        'GCornersLeft': true,
-        'GCornersRight': true,
-        'GCornersTop': true,
-        'GFont': true,
-        'GPointGetter': true,
-        'GPointReturn': true,
-        'GPointSetter': true,
-        'GRectGetter': true,
-        'GRectReturn': true,
-        'GRectSetter': true,
-        'GTextAlignment': true,
-        'GTextAlignmentCenter': true,
-        'GTextAlignmentLeft': true,
-        'GTextAlignmentRight': true,
-        'GTextLayoutCacheRef': true,
-        'GTextOverflowMode': true,
-        'GTextOverflowModeFill': true,
-        'GTextOverflowModeTrailingEllipsis': true,
-        'GTextOverflowModeWordWrap': true,
-        'HOUR_UNIT': true,
-        'Int16Getter': true,
-        'Int16Setter': true,
-        'InverterLayer': true,
-        'Layer': true,
-        'LayerUpdateProc': true,
-        'MINUTE_UNIT': true,
-        'MONDAY': true,
-        'MONTH_UNIT': true,
-        'MenuLayer': true,
-        'MenuLayerDrawHeaderCallback': true,
-        'MenuLayerDrawRowCallback': true,
-        'MenuLayerDrawSeparatorCallback': true,
-        'MenuLayerGetCellHeightCallback': true,
-        'MenuLayerGetHeaderHeightCallback': true,
-        'MenuLayerGetNumberOfRowsInSectionsCallback': true,
-        'MenuLayerGetNumberOfSectionsCallback': true,
-        'MenuLayerGetSeparatorHeightCallback': true,
-        'MenuLayerSelectCallback': true,
-        'MenuLayerSelectionChangedCallback': true,
-        'MenuRowAlign': true,
-        'MenuRowAlignBottom': true,
-        'MenuRowAlignCenter': true,
-        'MenuRowAlignNone': true,
-        'MenuRowAlignTop': true,
-        'NUM_BUTTONS': true,
-        'NumberWindow': true,
-        'NumberWindowCallback': true,
-        'ResHandle': true,
-        'RotBitmapLayer': true,
-        'SATURDAY': true,
-        'SECOND_UNIT': true,
-        'SNIFF_INTERVAL_NORMAL': true,
-        'SNIFF_INTERVAL_REDUCED': true,
-        'SUNDAY': true,
-        'S_FALSE': true,
-        'S_NO_ACTION_REQUIRED': true,
-        'S_NO_MORE_ITEMS': true,
-        'S_SUCCESS': true,
-        'S_TRUE': true,
-        'ScrollLayer': true,
-        'ScrollLayerCallback': true,
-        'SimpleMenuLayer': true,
-        'SimpleMenuLayerSelectCallback': true,
-        'SniffInterval': true,
-        'StatusCode': true,
-        'THURSDAY': true,
-        'TODAY': true,
-        'TUESDAY': true,
-        'TUPLE_BYTE_ARRAY': true,
-        'TUPLE_CSTRING': true,
-        'TUPLE_INT': true,
-        'TUPLE_UINT': true,
-        'TextLayer': true,
-        'TextLayout': true,
-        'TickHandler': true,
-        'TimeUnits': true,
-        'TupleType': true,
-        'WATCH_INFO_COLOR_BLACK': true,
-        'WATCH_INFO_COLOR_BLUE': true,
-        'WATCH_INFO_COLOR_GREEN': true,
-        'WATCH_INFO_COLOR_GREY': true,
-        'WATCH_INFO_COLOR_MATTE_BLACK': true,
-        'WATCH_INFO_COLOR_ORANGE': true,
-        'WATCH_INFO_COLOR_PINK': true,
-        'WATCH_INFO_COLOR_RED': true,
-        'WATCH_INFO_COLOR_STAINLESS_STEEL': true,
-        'WATCH_INFO_COLOR_UNKNOWN': true,
-        'WATCH_INFO_COLOR_WHITE': true,
-        'WATCH_INFO_MODEL_PEBBLE_ORIGINAL': true,
-        'WATCH_INFO_MODEL_PEBBLE_STEEL': true,
-        'WATCH_INFO_MODEL_UNKNOWN': true,
-        'WEDNESDAY': true,
-        'WakeupHandler': true,
-        'WakeupId': true,
-        'WatchInfoColor': true,
-        'WatchInfoModel': true,
-        'WeekDay': true,
-        'Window': true,
-        'WindowHandler': true,
-        'YEAR_UNIT': true,
-        'status_t': true
+CloudPebble.Editor.PebbleMode = (function() {
+
+    /** After a < symbol, match as a 'string' up to the next > or the end of the line. */
+    function tokenAngleInclude(stream, state) {
+        if (!stream.match(/[^>]*>/)) {
+            stream.match(/.*$/);
+        }
+        state.tokenize = null;
+        return "string";
     }
-};
+
+
+    /** After a #, match as 'meta' until spaces, comments line breaks or <
+     *
+     * Taken/modified from CodeMirror's clike.js
+     */
+    function cppHook(stream, state) {
+        if (!state.startOfLine) return false;
+        for (var ch, next = null; ch = stream.peek();) {
+            if (ch == "\\" && stream.match(/^.$/)) {
+                next = cppHook;
+                break
+            } else if (ch == "/" && stream.match(/^\/[\/\*]/, false)) {
+                break
+            } else if (stream.match(/\s+</, false)) {
+                next = tokenAngleInclude;
+                break
+            } else if (ch.match(/\s/)) {
+                break
+            }
+            stream.next();
+        }
+        state.tokenize = next;
+        return "meta"
+    }
+
+    /** Copied from CodeMirror's clike.js */
+    function pointerHook(_stream, state) {
+        if (state.prevToken == "variable-3") return "variable-3";
+        return false;
+    }
+
+    /** If a 'variable' has a ( after it, match it as a function call instead */
+    function tokenHook(stream, state, style) {
+        if (style === "variable" && stream.match(/\s*\(/, false)) {
+            if (state.context.prev.type === "top") {
+                return "def";
+            }
+            else {
+                return "variable-2";
+            }
+        }
+        else {
+            return style;
+        }
+    }
+
+    // Since it doesn't seem to be possible to add hooks to the mode without overriding the existing hooks, and the
+    // cppHook/pointerHook functions are not exposed outside of CodeMirror, we have to copy them into this file and
+    // reference them again in the 'hooks' object.
+    return {
+        name: 'text/x-c',
+        useCPP: true,
+        styleDefs: true,
+        hooks: {
+            "#": cppHook,
+            "*": pointerHook,
+            token: tokenHook
+        },
+        keywords: {
+            // C
+            'auto': true,
+            'if': true,
+            'break': true,
+            'int': true,
+            'case': true,
+            'long': true,
+            'char': true,
+            'register': true,
+            'continue': true,
+            'return': true,
+            'default': true,
+            'short': true,
+            'do': true,
+            'sizeof': true,
+            'double': true,
+            'static': true,
+            'else': true,
+            'struct': true,
+            'entry': true,
+            'switch': true,
+            'extern': true,
+            'typedef': true,
+            'float': true,
+            'union': true,
+            'for': true,
+            'unsigned': true,
+            'goto': true,
+            'while': true,
+            'enum': true,
+            'void': true,
+            'const': true,
+            'signed': true,
+            'volatile': true,
+            'bool': true,
+            '_Bool': true,
+            'int8_t': true,
+            'uint8_t': true,
+            'int16_t': true,
+            'uint16_t': true,
+            'int32_t': true,
+            'uint32_t': true,
+            'time_t': true,
+            // Pebble-specific
+            'ACCEL_AXIS_X': true,
+            'ACCEL_AXIS_Y': true,
+            'ACCEL_AXIS_Z': true,
+            'ACCEL_SAMPLING_100HZ': true,
+            'ACCEL_SAMPLING_10HZ': true,
+            'ACCEL_SAMPLING_25HZ': true,
+            'ACCEL_SAMPLING_50HZ': true,
+            'APP_LAUNCH_PHONE': true,
+            'APP_LAUNCH_QUICK_LAUNCH': true,
+            'APP_LAUNCH_SYSTEM': true,
+            'APP_LAUNCH_USER': true,
+            'APP_LAUNCH_WAKEUP': true,
+            'APP_LAUNCH_WORKER': true,
+            'APP_LOG_LEVEL_DEBUG': true,
+            'APP_LOG_LEVEL_DEBUG_VERBOSE': true,
+            'APP_LOG_LEVEL_ERROR': true,
+            'APP_LOG_LEVEL_INFO': true,
+            'APP_LOG_LEVEL_WARNING': true,
+            'APP_MSG_ALREADY_RELEASED': true,
+            'APP_MSG_APP_NOT_RUNNING': true,
+            'APP_MSG_BUFFER_OVERFLOW': true,
+            'APP_MSG_BUSY': true,
+            'APP_MSG_CALLBACK_ALREADY_REGISTERED': true,
+            'APP_MSG_CALLBACK_NOT_REGISTERED': true,
+            'APP_MSG_CLOSED': true,
+            'APP_MSG_INTERNAL_ERROR': true,
+            'APP_MSG_INVALID_ARGS': true,
+            'APP_MSG_NOT_CONNECTED': true,
+            'APP_MSG_OK': true,
+            'APP_MSG_OUT_OF_MEMORY': true,
+            'APP_MSG_SEND_REJECTED': true,
+            'APP_MSG_SEND_TIMEOUT': true,
+            'APP_WORKER_RESULT_ALREADY_RUNNING': true,
+            'APP_WORKER_RESULT_ASKING_CONFIRMATION': true,
+            'APP_WORKER_RESULT_DIFFERENT_APP': true,
+            'APP_WORKER_RESULT_NOT_RUNNING': true,
+            'APP_WORKER_RESULT_NO_WORKER': true,
+            'APP_WORKER_RESULT_SUCCESS': true,
+            'AccelAxisType': true,
+            'AccelDataHandler': true,
+            'AccelRawDataHandler': true,
+            'AccelSamplingRate': true,
+            'AccelTapHandler': true,
+            'ActionBarLayer': true,
+            'AnimationCurve': true,
+            'AnimationCurveCustomFunction': true,
+            'AnimationCurveEaseIn': true,
+            'AnimationCurveEaseInOut': true,
+            'AnimationCurveEaseOut': true,
+            'AnimationCurveFunction': true,
+            'AnimationCurveLinear': true,
+            'AnimationCurve_Reserved1': true,
+            'AnimationCurve_Reserved2': true,
+            'AnimationCurve_Reserved3': true,
+            'AnimationSetupImplementation': true,
+            'AnimationStartedHandler': true,
+            'AnimationStoppedHandler': true,
+            'AnimationTeardownImplementation': true,
+            'AnimationUpdateImplementation': true,
+            'AppFocusHandler': true,
+            'AppLaunchReason': true,
+            'AppLogLevel': true,
+            'AppMessageInboxDropped': true,
+            'AppMessageInboxReceived': true,
+            'AppMessageOutboxFailed': true,
+            'AppMessageOutboxSent': true,
+            'AppMessageResult': true,
+            'AppSyncErrorCallback': true,
+            'AppSyncTupleChangedCallback': true,
+            'AppTimer': true,
+            'AppTimerCallback': true,
+            'AppWorkerMessageHandler': true,
+            'AppWorkerResult': true,
+            'BUTTON_ID_BACK': true,
+            'BUTTON_ID_DOWN': true,
+            'BUTTON_ID_SELECT': true,
+            'BUTTON_ID_UP': true,
+            'BatteryStateHandler': true,
+            'BitmapLayer': true,
+            'BluetoothConnectionHandler': true,
+            'ButtonId': true,
+            'ClickConfigProvider': true,
+            'ClickHandler': true,
+            'ClickRecognizerRef': true,
+            'CompassHeading': true,
+            'CompassHeadingHandler': true,
+            'CompassStatus': true,
+            'CompassStatusCalibrated': true,
+            'CompassStatusCalibrating': true,
+            'CompassStatusDataInvalid': true,
+            'DATA_LOGGING_BUSY': true,
+            'DATA_LOGGING_BYTE_ARRAY': true,
+            'DATA_LOGGING_CLOSED': true,
+            'DATA_LOGGING_FULL': true,
+            'DATA_LOGGING_INT': true,
+            'DATA_LOGGING_INVALID_PARAMS': true,
+            'DATA_LOGGING_NOT_FOUND': true,
+            'DATA_LOGGING_SUCCESS': true,
+            'DATA_LOGGING_UINT': true,
+            'DAY_UNIT': true,
+            'DICT_INTERNAL_INCONSISTENCY': true,
+            'DICT_INVALID_ARGS': true,
+            'DICT_MALLOC_FAILED': true,
+            'DICT_NOT_ENOUGH_STORAGE': true,
+            'DICT_OK': true,
+            'DataLoggingItemType': true,
+            'DataLoggingResult': true,
+            'DataLoggingSessionRef': true,
+            'Dictionary': true,
+            'DictionaryKeyUpdatedCallback': true,
+            'DictionaryResult': true,
+            'DictionarySerializeCallback': true,
+            'E_BUSY': true,
+            'E_DOES_NOT_EXIST': true,
+            'E_ERROR': true,
+            'E_INTERNAL': true,
+            'E_INVALID_ARGUMENT': true,
+            'E_INVALID_OPERATION': true,
+            'E_OUT_OF_MEMORY': true,
+            'E_OUT_OF_RESOURCES': true,
+            'E_OUT_OF_STORAGE': true,
+            'E_RANGE': true,
+            'E_UNKNOWN': true,
+            'FRIDAY': true,
+            'GAlign': true,
+            'GAlignBottom': true,
+            'GAlignBottomLeft': true,
+            'GAlignBottomRight': true,
+            'GAlignCenter': true,
+            'GAlignLeft': true,
+            'GAlignRight': true,
+            'GAlignTop': true,
+            'GAlignTopLeft': true,
+            'GAlignTopRight': true,
+            'GColor': true,
+            'GColorBlack': true,
+            'GColorClear': true,
+            'GColorWhite': true,
+            'GCompOp': true,
+            'GCompOpAnd': true,
+            'GCompOpAssign': true,
+            'GCompOpAssignInverted': true,
+            'GCompOpClear': true,
+            'GCompOpOr': true,
+            'GCompOpSet': true,
+            'GContext': true,
+            'GCornerBottomLeft': true,
+            'GCornerBottomRight': true,
+            'GCornerMask': true,
+            'GCornerNone': true,
+            'GCornerTopLeft': true,
+            'GCornerTopRight': true,
+            'GCornersAll': true,
+            'GCornersBottom': true,
+            'GCornersLeft': true,
+            'GCornersRight': true,
+            'GCornersTop': true,
+            'GFont': true,
+            'GPointGetter': true,
+            'GPointReturn': true,
+            'GPointSetter': true,
+            'GRectGetter': true,
+            'GRectReturn': true,
+            'GRectSetter': true,
+            'GTextAlignment': true,
+            'GTextAlignmentCenter': true,
+            'GTextAlignmentLeft': true,
+            'GTextAlignmentRight': true,
+            'GTextLayoutCacheRef': true,
+            'GTextOverflowMode': true,
+            'GTextOverflowModeFill': true,
+            'GTextOverflowModeTrailingEllipsis': true,
+            'GTextOverflowModeWordWrap': true,
+            'HOUR_UNIT': true,
+            'Int16Getter': true,
+            'Int16Setter': true,
+            'InverterLayer': true,
+            'Layer': true,
+            'LayerUpdateProc': true,
+            'MINUTE_UNIT': true,
+            'MONDAY': true,
+            'MONTH_UNIT': true,
+            'MenuLayer': true,
+            'MenuLayerDrawHeaderCallback': true,
+            'MenuLayerDrawRowCallback': true,
+            'MenuLayerDrawSeparatorCallback': true,
+            'MenuLayerGetCellHeightCallback': true,
+            'MenuLayerGetHeaderHeightCallback': true,
+            'MenuLayerGetNumberOfRowsInSectionsCallback': true,
+            'MenuLayerGetNumberOfSectionsCallback': true,
+            'MenuLayerGetSeparatorHeightCallback': true,
+            'MenuLayerSelectCallback': true,
+            'MenuLayerSelectionChangedCallback': true,
+            'MenuRowAlign': true,
+            'MenuRowAlignBottom': true,
+            'MenuRowAlignCenter': true,
+            'MenuRowAlignNone': true,
+            'MenuRowAlignTop': true,
+            'NUM_BUTTONS': true,
+            'NumberWindow': true,
+            'NumberWindowCallback': true,
+            'ResHandle': true,
+            'RotBitmapLayer': true,
+            'SATURDAY': true,
+            'SECOND_UNIT': true,
+            'SNIFF_INTERVAL_NORMAL': true,
+            'SNIFF_INTERVAL_REDUCED': true,
+            'SUNDAY': true,
+            'S_FALSE': true,
+            'S_NO_ACTION_REQUIRED': true,
+            'S_NO_MORE_ITEMS': true,
+            'S_SUCCESS': true,
+            'S_TRUE': true,
+            'ScrollLayer': true,
+            'ScrollLayerCallback': true,
+            'SimpleMenuLayer': true,
+            'SimpleMenuLayerSelectCallback': true,
+            'SniffInterval': true,
+            'StatusCode': true,
+            'THURSDAY': true,
+            'TODAY': true,
+            'TUESDAY': true,
+            'TUPLE_BYTE_ARRAY': true,
+            'TUPLE_CSTRING': true,
+            'TUPLE_INT': true,
+            'TUPLE_UINT': true,
+            'TextLayer': true,
+            'TextLayout': true,
+            'TickHandler': true,
+            'TimeUnits': true,
+            'TupleType': true,
+            'WATCH_INFO_COLOR_BLACK': true,
+            'WATCH_INFO_COLOR_BLUE': true,
+            'WATCH_INFO_COLOR_GREEN': true,
+            'WATCH_INFO_COLOR_GREY': true,
+            'WATCH_INFO_COLOR_MATTE_BLACK': true,
+            'WATCH_INFO_COLOR_ORANGE': true,
+            'WATCH_INFO_COLOR_PINK': true,
+            'WATCH_INFO_COLOR_RED': true,
+            'WATCH_INFO_COLOR_STAINLESS_STEEL': true,
+            'WATCH_INFO_COLOR_UNKNOWN': true,
+            'WATCH_INFO_COLOR_WHITE': true,
+            'WATCH_INFO_MODEL_PEBBLE_ORIGINAL': true,
+            'WATCH_INFO_MODEL_PEBBLE_STEEL': true,
+            'WATCH_INFO_MODEL_UNKNOWN': true,
+            'WEDNESDAY': true,
+            'WakeupHandler': true,
+            'WakeupId': true,
+            'WatchInfoColor': true,
+            'WatchInfoModel': true,
+            'WeekDay': true,
+            'Window': true,
+            'WindowHandler': true,
+            'YEAR_UNIT': true,
+            'status_t': true
+        }
+    }
+})();
 //var browserHeight = document.documentElement.clientHeight;
 //code_mirror.getWrapperElement().style.height = (browserHeight - 130) + 'px';
 //code_mirror.refresh();
diff --git a/ide/templates/ide/project.html b/ide/templates/ide/project.html
index c80dd6b9..fb907162 100644
--- a/ide/templates/ide/project.html
+++ b/ide/templates/ide/project.html
@@ -5,14 +5,14 @@
 {% block title %}CloudPebble – {{ project.name }}{% endblock %}
 
 {% block head %}
-<link rel="stylesheet" href="{% static 'CodeMirror/addon/hint/show-hint.css' %}">
-<link rel="stylesheet" href="{% static 'CodeMirror/addon/dialog/dialog.css' %}">
-<link rel="stylesheet" href="{% static 'CodeMirror/lib/codemirror.css' %}">
-<link rel="stylesheet" href="{% static 'CodeMirror/theme/monokai.css' %}">
-<link rel="stylesheet" href="{% static 'CodeMirror/theme/eclipse.css' %}">
-<link rel="stylesheet" href="{% static 'CodeMirror/theme/blackboard.css' %}">
-<link rel="stylesheet" href="{% static 'CodeMirror/theme/solarized.css' %}">
-<link rel="stylesheet" href="{% static 'CodeMirror/addon/fold/foldgutter.css' %}">
+<link rel="stylesheet" href="{% static 'codemirror/addon/hint/show-hint.css' %}">
+<link rel="stylesheet" href="{% static 'codemirror/addon/dialog/dialog.css' %}">
+<link rel="stylesheet" href="{% static 'codemirror/lib/codemirror.css' %}">
+<link rel="stylesheet" href="{% static 'codemirror/theme/monokai.css' %}">
+<link rel="stylesheet" href="{% static 'codemirror/theme/eclipse.css' %}">
+<link rel="stylesheet" href="{% static 'codemirror/theme/blackboard.css' %}">
+<link rel="stylesheet" href="{% static 'codemirror/theme/solarized.css' %}">
+<link rel="stylesheet" href="{% static 'codemirror/addon/fold/foldgutter.css' %}">
 {% if font_css %}
 <link rel="stylesheet" href="{{ font_css }}" />
 {% endif %}
@@ -482,23 +482,23 @@ <h3>{% trans 'Compass and Accelerometer' %}</h3>
 var LIBPEBBLE_PROXY = {{ libpebble_proxy | safe }};
 var VERSION_REGEX = "{{version_regex|escapejs}}";
 </script>
-<script src="{% static 'CodeMirror/lib/codemirror.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/dialog/dialog.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/search/searchcursor.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/search/search.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/edit/matchbrackets.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/edit/closebrackets.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/comment/comment.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/fold/foldgutter.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/fold/foldcode.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/fold/brace-fold.js' %}"></script>
-<script src="{% static 'CodeMirror/addon/fold/comment-fold.js' %}"></script>
+<script src="{% static 'codemirror/lib/codemirror.js' %}"></script>
+<script src="{% static 'codemirror/addon/dialog/dialog.js' %}"></script>
+<script src="{% static 'codemirror/addon/search/searchcursor.js' %}"></script>
+<script src="{% static 'codemirror/addon/search/search.js' %}"></script>
+<script src="{% static 'codemirror/addon/edit/matchbrackets.js' %}"></script>
+<script src="{% static 'codemirror/addon/edit/closebrackets.js' %}"></script>
+<script src="{% static 'codemirror/addon/comment/comment.js' %}"></script>
+<script src="{% static 'codemirror/addon/fold/foldgutter.js' %}"></script>
+<script src="{% static 'codemirror/addon/fold/foldcode.js' %}"></script>
+<script src="{% static 'codemirror/addon/fold/brace-fold.js' %}"></script>
+<script src="{% static 'codemirror/addon/fold/comment-fold.js' %}"></script>
 <script src="{% static 'ide/external/codemirror.hint.js' %}"></script>
 <script src="{% static 'fuse.js/src/fuse.js' %}"></script>
-<script src="{% static 'CodeMirror/mode/clike/clike.js' %}"></script>
-<script src="{% static 'CodeMirror/mode/javascript/javascript.js' %}"></script>
-<script src="{% static 'CodeMirror/keymap/emacs.js' %}"></script>
-<script src="{% static 'CodeMirror/keymap/vim.js' %}"></script>
+<script src="{% static 'codemirror/mode/clike/clike.js' %}"></script>
+<script src="{% static 'codemirror/mode/javascript/javascript.js' %}"></script>
+<script src="{% static 'codemirror/keymap/emacs.js' %}"></script>
+<script src="{% static 'codemirror/keymap/vim.js' %}"></script>
 <script src="{% static 'ide/external/uuid.js' %}"></script>
 <script src="/ide/jsi18n/"></script>
 <script src="{% static 'ide/js/csrf.js' %}" type="text/javascript"></script>