d2: Update for Gummy libligts

(from old d2-common)
d2: Update for Gummy