Different naming convention for key-only presets
Add generic shop preset
Preset improvements