Mix and Match Themes and Objects

Allow us to select a theme, and then add any object type to it for auto-generation, allowing more uses for both objects and themes, instead of manually having to put objects into a room.