updates to themes to seperate out colors