Helix: Unify control numbers

http://forum.xbmc.org/showthread.php?tid=194515&pid=1703508#pid1703508