Several updates

[macro] For the documentation work, updated, added , and improved some macros + test
[enroute] new template