have a look and let me know whether this is ok or not…
Looks very well to me. Really Good job.
If I can ask something missing, I would add the usage instructions for the followings macros:
I guess that is something Zelgadis should do… He is the master of the wiki and related templates/macros…