[blinkx] Modernize