Tweaks to bean theming