More work for the light theme

Change-Id: Id23f49f075ebc552852fed8f45b8f40444a04758
5 files changed