re-structure theme