Ok, so the upgrade to WordPress 2.5 seems to have gone well.

Now comes the tweaking.