Color and Column Adjustment

Resolves #689 (again).
Resolves #861.

http://jenkins.buttonweavers.com:8080/job/buttonmen-AdmiralJota/83/

It would probably be a good idea to merge this one into dev before the next production release, so that we're not releasing the intermediate colors to the live site.