Simplify theme (again)