More theme cleanups

Patch set 2: Missed some spaces

Change-Id: I103808c60dcf83707a2df01a52804cd7beaffd57