Name change, theme cleanup