minor refactor of colors and aditional syntax highlighting