More dark theme changes

Change-Id: I86728fec8de120621ece4f9a1bdc72a1c85b9940