I had all my apps in groups, but as soon as I apply a theme, it removes theme and scatters them into multiple pages. is there a way around this? thank you