[#4003] A few more form_themes config changes

| Q             | A
| ------------- | ---
| Doc fix?      | #4003
| New docs?     | not, but finishing an earlier change
| Applies to    | >= 2.6
| Fixed tickets | -

Hi guys!

This follows #4003 - I think I found a few other spots that needed to be updated.

Thanks!