OK, it's done! Check post 1 for details.
I have not done a huge amount of testing on this version, but I've not changed anything very critical either so it should be fine. That said, if you do get any problems then of course let me know.
I'm off to start my new campaign!