Improve syntax highlighting, add support for line numbers and line highlighting