Fix highlighting; closes #16