move more settings out of init.el