Code and color fix