fixed theming issues (I hope)