AFR calendar theming for changed views
Merge branch 'refs/heads/master' into test