Clean-up in themes