Chris Nolan has volunteered to write these two conversions:

I6 Ravenloft

and then

X2 Castle Amber