Add support for many more major modes