Pull request merged: Configurable bouquet keys