Fix moonfire and add sunfire