Revert "Revert "Themes: Support applying components from multiple themes [1/3]""

This reverts commit 8044c84261275ccbf7be9e9e5702d9d06e2429b9.