Final WPF + XNA update