added font smoothing
resolved merge conflict