Old template dir restored, old hardcoded template paths deleted and Aggregate permissions commented