update and simplify theme