DCAF Event Refactor + Gallery