I just moved into a new house that has a large family that I'm putting my home theater in. The dimensions for the room are 23 x 17 x 9 (the ceiling is peaked, from 8' to 10'). Currently the speakers I have are Onix Rockets (RS ELT LRS for main and surrounds, RS ELT CTR for center, and RS UFW-10 for the sub), but I'm looking to upgrade to something better. My speaker budget is around $2,000 to $2,500 and I'm wanting to go with a 7.1 setup. I havn't got a new receiver yet, but I'm looking at the Yamaha RX-V2500. This setup will be used for both music and movies (mainly movies, though). Any suggestions? A couple of brands I was looking at are Axiom and Onix (I have been very pleased with the current speakers that I bought from them). Also for the sub I had thought about just getting a second UFW-10, as it's a great sub anyway, and I like lots of bass.