Fixed all errors from merge hell and unfound sounds, css and js files