added two more speakers and more speaker styles