Refactor for Bolt 2.0; Extensions Marketplace