Theme work clean up