theme cleanups

Change-Id: I38a9261b6eb7448ec909cdeeca20d9768061283a