finally squashed theming issues