added gig styles and fonts
fixed merge conflict