Update default theme
Merge branch 'master' into issue-889-account-validation-optional

* master:
  Update default theme
Rename in tests after function rename