extras/Highlight: Fix code style and explicitness

Re-apply previously reverted patch, because the reported regression can
not be confirmed or reproduced; plus add explicit id references to the
properties in the background component.