Update labels

The commit is unfinished, I'm afraid - it needs the distro name adding to line 84 - 6579f486 .

Fixes #18 (closed).

Closes #18 (closed)