Migrate MP code to global/theme