Replace my X10 crud

I still have a few old crufty X10 devices I control at Halloween time. I am seeing a lot of Zigbee and Zwave products and think I need to move on for next Halloween. Just a couple examples:

* eHomeUpgrade | New XBee Wall Router Makes it Easy to Deploy and Extend ZigBee Networks
* USB Zwave