Add Underline attribute in syntax highlighting
Some small fixes
Fixed mixed tab and spaces
Still a wrong indentation (spaces instead of tabs)
Fix bugs in #505