theme fixes

Change-Id: I08435588adf2ca2b9830acb0e2fbdb6019d7510c