fixed a redundancy issue and font color vars