Detector composition/isotope functionality added; EventRates rewritten using a generic DM event rate