fixed color bug and fontsize bug from merge