Move Colors module into colors.rb.
Additional comments/formatting for a few things.