cleanup, add theme