Bugfixes +B theme.