Update - Started adding support for the addon merge:
**obviously if you mess with the SVN's you probably know what you're doing, but just in case, just rename skin to "skin.night", install in XBMC\addons
and you should be good**
If not using a pre-merge XBMC, everything should be good except Recently added. If you want to fix just "ctrl+f" the word "PREMERGE" in Home.xml and uncomment that block of code, then comment out the block below. Do the same in Startup.xml. Or just leave as is, all you'll get is a script failed error, nothing big...