Theme work cleanup