Adjust the color scheme and rename