Merge pull request #1953 from awesomerobot/master

making the background on unread notifications stand out a bit more
reorganizing color variables