Add a defgroup and convert some defvars to defcustoms