Overhauled master config template