Fixup modes with some new macros.
Fix massive merge-conflict due to stupid EOL-terminators.