Theme settings clean up