Theme Toggle Changes

Change-Id: I8fbdc0608d5d559aed718623177317fbbff7b756