Blue Marlin overhauls J20 packaging

Redesigned packaging for core flavours