Improving templates use
Merge branch 'master' of https://github.com/diegoduncan21/Neatics