Improved syntax highlighting,removed some settings