diff --git a/app/lib/surface/CocoSprite.coffee b/app/lib/surface/CocoSprite.coffee
index 2d3825670..af19c89d9 100644
--- a/app/lib/surface/CocoSprite.coffee
+++ b/app/lib/surface/CocoSprite.coffee
@@ -594,10 +594,9 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     @marks[effects[@effectIndex]].show()
 
   setHighlight: (to, delay) ->
-    # TODO: get highlights working again
-#    @addMark 'highlight', @options.floatingLayer, 'highlight' if to
-#    @marks.highlight?.highlightDelay = delay
-#    @marks.highlight?.toggle to and not @dimmed
+    @addMark 'highlight', @options.floatingLayer, 'highlight' if to
+    @marks.highlight?.highlightDelay = delay
+    @marks.highlight?.toggle to and not @dimmed
 
   setDimmed: (@dimmed) ->
     @marks.highlight?.toggle @marks.highlight.on and not @dimmed
diff --git a/app/lib/surface/LayerAdapter.coffee b/app/lib/surface/LayerAdapter.coffee
index 20651007d..5524b00d0 100644
--- a/app/lib/surface/LayerAdapter.coffee
+++ b/app/lib/surface/LayerAdapter.coffee
@@ -143,6 +143,9 @@ module.exports = LayerAdapter = class LayerAdapter extends CocoClass
   #- Adding, removing children for WebGL layers.
         
   addCocoSprite: (cocoSprite) ->
+    # TODO: Move this into the production DB rather than setting it dynamically.
+    if cocoSprite.thangType?.get('name') is 'Highlight'
+      cocoSprite.thangType.set('spriteType', 'segmented')
     cocoSprite.options.resolutionFactor = @resolutionFactor
     if cocoSprite.layer
       console.warn 'CocoSprite being re-added to a layer?'