     # User is probably actually clicking a span inside the button
     if target.is 'span' then target = target.parents '.button'
 
-    # Remove highlight from previous button
-    @$(".button.#{@action}", @elem).removeClass 'highlight'
+    @$(".button.#{@action}", @elem).removeClass 'active'
 
     if target.hasClass 'mark'
       @action = 'mark'
-      target.addClass 'highlight'
+      target.addClass 'active'
     else
       @action = 'fill'
-      target.addClass 'highlight'
+      target.addClass 'active'
     
 
   # Update timer elem

  startCol: -1
  previousRow: -1
  previousCol: -1
  lockedRow: -1
  lockedCol: -1
  ignoreInput: false

  # For dealing w/ tutorial

    @actionLock = "none"

    # Clear out previous touch data
    @startRow = @startCol = @previousRow = @previousCol = -1

  # Try to either mark or fill a grid cell
  doAction: (row, col) ->
