Okay, I have an Onkyo 605 and a medium sized room. Current setup is my center speaker is a B&W VM1:

http://www.bowers-wilkins.com/display.aspx?infid=1185

The front speakers are LM1:

http://www.bowers-wilkins.com/display.aspx?infid=1503

I don't know what the rear speakers are as they are in ceiling installed by previous owners but sound pretty good.

I also have an ASW300 Subwoofer, but I can't find it on B&W website.

Anyway, I was thinking of upgrading. I need bookshelf speakers for the front and a fairly thin center speaker because the place for it above the TV is fairly thin. I am looking for a significant upgrade over what I have but would like to keep it under $2000.

Also, I was wondering about adding two more rear speakers (for 7.1), but the problem is it would be very difficult to run wires now so I was thinking about wireless so I would like some recommendations on that--they would be in the ceiling speakers. Right now I have two rear speakers right above the couch that sits against a wall. So the two surrounds would be halfway between the fronts and the rears.