Fix bugs, remove all color