fixed fonts
changing bg color
merge