theming fixes
more fixes to theme