add whirl presets, update URIs