Update 7

Major update realigning with Afrikaans format