Past my bedtime, but just an FYI, I went ahead and spent the last hour or so adding the new categories, then going through all my entries and moving or adding the relevant ones to the new categories.