Add color to the right rule + clean-up