Update to more recent version (lots of changes)

Laptop -> Desktop upgrade.