optimized clear theme a little bit