update grammer and upgrade theme