2.1

Update the formtypes with the latest changes. We should properly change the old method calls for options aswell.