Displaying subalbums integrated into the photo display

I just finally upgraded from my ol' Gallery 1.4 installation to Gallery 2.3.1 and I'm using the Siriux theme.

The one thing I am frustrated about is that my subalbums are showing up separately from the rest of the photos within an album. I used to have them integrated in better - so in a row of three photos, for example, one of those photos could be the subalbum. Now it forces the subalbum to be displayed at the top of a page in the album with different formatting, and won't let me just re-order it into the photo grid.

Any ideas on how I can change this? Or is there another theme that will allow this? I don't want the sidebar that's in the default theme so I've switched to this one, which looks good except for this problem.

Thanks!

I really hate the sidebar but otherwise I like the Carbon theme, which seems to do the subalbums correctly - and I can't figure out how to disable that darned sidebar in there. So I was hoping I could just make the Siriux work with the subalbums as expected.

then I guess I'm not calling it the proper term - I'm talking about the column on the left side of all my pages that displays text, such as the album name, date, count. I don't want that taking up a whole column on my screen. I preferred in G1 where that text just displayed as a thin row above the photos.

Banging my head against themes,
Shannon