Optimised: 100%

Double checked and slightly altered the last of the files.

All that remains for this branch is for the black flickering to be
fixed.