diff --git a/src/c3nav/editor/static/editor/js/editor.js b/src/c3nav/editor/static/editor/js/editor.js
index 1241c9c4..270f9c69 100644
--- a/src/c3nav/editor/static/editor/js/editor.js
+++ b/src/c3nav/editor/static/editor/js/editor.js
@@ -36,6 +36,8 @@ editor = {
             for (var i = 0; i < feature_types.length; i++) {
                 feature_type = feature_types[i];
                 editor.feature_types[feature_type.name] = feature_type;
+                feature_type.weight = 1;
+                feature_type.fillOpacity = 0.6;
                 editor.feature_types_order.push(feature_type.name);
                 editcontrols.append(
                     $('<fieldset class="feature_list">').attr('name', feature_type.name).append(
@@ -237,9 +239,10 @@ editor = {
         L.geoJSON(editor.features[$(this).attr('name')].geometry, {
             style: function() {
                 return {
-                    color: '#FFFFEE',
-                    opacity: 0.5,
-                    fillOpacity: 0.5,
+                    color: '#FFFFDD',
+                    weight: 3,
+                    opacity: 0.7,
+                    fillOpacity: 0,
                     className: 'c3nav-highlight'
                 };
             }
@@ -259,9 +262,10 @@ editor = {
             L.geoJSON(e.layer.toGeoJSON(), {
                 style: function() {
                     return {
-                        color: '#FFFFEE',
-                        opacity: 0.5,
-                        fillOpacity: 0.5,
+                        color: '#FFFFDD',
+                        weight: 3,
+                        opacity: 0.7,
+                        fillOpacity: 0,
                         className: 'c3nav-highlight'
                     };
                 }
diff --git a/src/c3nav/mapdata/models/feature.py b/src/c3nav/mapdata/models/feature.py
index 7ca87bb7..c41e907c 100644
--- a/src/c3nav/mapdata/models/feature.py
+++ b/src/c3nav/mapdata/models/feature.py
@@ -31,8 +31,8 @@ class FeatureType(namedtuple('FeatureType', ('name', 'title', 'title_plural', 'g
 
 FEATURE_TYPES = OrderedDict()
 FeatureType('building', _('Building'), _('Buildings'), 'polygon', '#333333')
-FeatureType('room', _('Room'), _('Rooms'), 'polygon', '#CCCCCC')
-FeatureType('outside', _('Outside Area'), _('Outside Areas'), 'polygon', '#EEEEEE')
+FeatureType('room', _('Room'), _('Rooms'), 'polygon', '#FFFFFF')
+FeatureType('outside', _('Outside Area'), _('Outside Areas'), 'polygon', '#FFFFFF')
 FeatureType('obstacle', _('Obstacle'), _('Obstacles'), 'polygon', '#999999')