Move attributes around and reworking template {{name}} replacement a bit