More theme changes

Change-Id: I980d1050dd8ad97806af2e4e654cd421dd1829a0
Merge "More theme changes" into cd-4.3