Change border color so I can actually see it
Merge branch 'topic/change_color'