more inner content theming and fixes