added colors and shiet