Support standard form types in theme options. Fixes #558