Making the "offical" template more official