Added new S2W/DT2W/S2S options to aroma