metrics theming fixes