more theme cleanup and merging