fixed themes doubling
added clean-up