Refactored the bundle to be a single-theme bundle instead of a collection of themes.