Fixed problem with greedy regexp for macrocalls

It was preventing this from working:

```
<<macro>><<bacrp>><<sdf>><<qweqwe>>
```
Make the toolbars be tag driven