updated everything to new style except font