Move more default values into defaults file