fonts and colors
styling
styling
merge conflict