Update to htmlbars