ColourPET routines now patched in. Re-org