Scott,

I took a look at those two mods, and at least as far as overwriting files goes they don't seem to conflict. So long as you haven't done any other modification to overwrite/override files you should be good with renaming the template folders and dropping the files in. And running the SQL patch of course.

I always recommend a backup beforehand as well. (;

--Joe

PS: Just to confirm, I've gone through with dropping my handle. The first link in my sig confirms my intent, as well as the sig of my former profile.