Update forms

BS3 commit c459c65