Update colors and others issues