theme: code cleanup

Change-Id: Ia7e00bc89cb0a7dc1c3cdad1a32a9b25894770a1