Replaced all templates with their proper equivalents from miguel's source.
My version had issues with the spacing of elements, arrangement, etc.