Alter theme settings form properly for themes

nicxvanrequested to merge
issue/drupal-3560833:3560833-create-better-way into 11.x

Closes #3560833

Merge request reports