Readd convert files but fix those warnings.
Fix warning related to generic {civ} replacement.