Yes, I think this solution looks good. Could you rename `themeBundle` to `theme`?