Adapt to use new htmltools