Fixup theme usage for light/dark

Change-Id: I3f91e3168a439763d2f851a957043e97c2519208