Put overlay support back in.

As I realise I missed some functionality when converting to the Template Modification system.