Some styles clean up

Mostly moved theme styles into themes.xml for easier access.

b/17015742

Change-Id: Ice69034959464714e319e470aefdad1241274880
7 files changed