add themes and cleanup