add colored rectangles for debugging tap areas
template clean-up and syncing