added fonts
fixed conflict