Updated to include subtitle settings