Fixed key maps and keyword highlighting