Using new assets
Fix conflicts
Add wining sreen and the bugs almost all fixed