Adding Revolver and relegating Kahlua to 'coffee liqueur'.