Added new keywords and changed mailto: field