Cleaning things up, changing colors and generally creating awesomeness
Merge branch 'iss23'