Massive OpenKit-importer recode/upgrades