Move major mode settings back to .emacs