Add basic text highlighting
Fix text highlighting