Moar theme fixes

Change-Id: I893028d00a06d01b613db3365cd507fc824652d5
Merge "Moar theme fixes" into du44