Visual theming. Small logic adjustments.