Fix highlighting: bottom is always yellow, top is blue