Adjust some colors and some fixes