Alright - so I restored, then re-upgraded. This is a major upgrade so it kills all customization of the theme and other addons. Things might look a little ugly for now, but I'll fix them when I wake up tomorrow. Please report back here if you see any errors!
Mike