The replacement power supply from HP showed today, so I performed some PC-surgery and the pc is in recovery now. Now, I need to find a way to sync all of the stuff I temporarily placed on the laptop back with the stuff left on the old PC. Maybe a good time for a reformat?

Nah, like I have that kind of time.