More scratch 2 migration

There may be more to do in Frantic Felix. I suspect it was developed in 1.4