change styles further

re-revise color scheme, adjust match organization