Theme clean-up

Change-Id: I97b8109a43d1c37abf3a06e1ec755a4dddac1310
Updated change log

Change-Id: I12177ac0cd25b8f3096d2ff1711dbbefb6efdca5