[v1.1] edited colors and cleaned up inputs