Multi tenant app with multiple themes

[G3EORG3E]

I am developing a multi-tenant application where each instance can utilize one of four different themes.

Here is my current setup: GitHub Repository.

However, I am encountering this issue: Next.js Issue #67704.

I would appreciate any suggestions on restructuring the application to dynamically load components for each theme (with server components) so the resulting JavaScript and CSS bundles will only include the code relevant to the active theme.