cleanup and rename theme