reports theme fix
Merge branch '0016-reports-fix' into develop