Merge pull request #1 from paulmolluzzo/update_color_selector

Update color selector; move "wrap colors" toggle under color selector