added main_font
fixed conflicts / merged faq into working