consolidate color scheme selectors
edit naming convention and remove redundant code
remove pointless comment