Add more building presets

Fixes #1616