update theme with most current changes from cottrell