Remove obsolete theme
Do not disable error correction

But leave a commented out section to support it
Clarify a couple of comments