More work on b3 theming.