Convert tabs to spaces
Fix template names