Add back themes

Change-Id: I65f10a21df563f3037f459ec76d30f95bec8e401