Merge branch 'theme-improvements' into 'master'

Adjust default theme to thm corporate design, several fixes

See merge request !183
3 jobs for 207-statistics-doesn-t-work
in 5 minutes and 51 seconds and was queued for 2 seconds