Computer / Office 2.1 Speakers

Need some advice if there are any audiophiles on here.

I am moving soon and will be after a half-decent sound setup for my computer in a small'ish room.

Currently on my computer I have a Cambridge Audio 340A amplifier and some Mordaunt Short speakers which I love, these will be moving downstairs for use in the living room for the TV / entertainment.

I am currently on the hunt to replace the above for my computer.

I have around a £150 budget and have mainly been looking at 2.1 setups.
I did think about buying a cheap 2nd hand amp and some cheap Gale speakers but think it would probably be best to stick to a 2.1.

I guess the main two things I am after are clarity and lower bass frequency - not fussed about volume as the room my computer will be in is only small.

I have looked at ebay - there seem to be a lot of speakers by "Edifier" - are these any good?

Only these Klipsch speakers have caught my eye so far, which are over my budget (may possibly be able to stretch if anyone can recommend them):
Play.com - Buy online at Play.com and read reviews. Free delivery to UK and Europe!

Can anyone recommend anything?

Thanks for the advice, the Bose Companion 3 look good - slightly out of my price range though.

Not a bad route fishyfish! I can vouch for the Cambridge Audio gear, the TOPAZ is the lower end of the range but still performs well, I have a TOPAZ CD player and cant argue for the price I paid!

I ended up purchasing a Corsair SP2500 2.1 speaker set. Wouldn't usually buy a brand that specialists in other areas, in this case Computer RAM.etc but going by reviews people seem to be pretty pleased with them.
Managed to get them for just over £120 from the supplier I use for work. Im slightly worried about how good the clarity will be - Ill let you know when they arrive!