#273 Demo's Update complete

Completed changing demos. Let me know if anything left behind.