- follow my own org2html sed script conventions helps ;)
- added more new wicket 6-ness