Updated so no more double Scott Joplin for Babylon DLC users.
Adjusted new Babylon DLC Great People to proper eras:

Hasegawa Tohaku: Industrial -> Renaissance
Matthew Perry: Modern -> Industrial
Shah Jahan: Industrial -> Renaissance
Dandara: Industrial -> Renaissance
Tupac Amaru: Modern -> Industrial
Zhou Daguan: Renaissance -> Medieval
Stamford Raffles: Modern -> Industrial
Dimitire Cantemir: Industrial -> Renaissance
Ibn Khaldun: Renaissance -> Medieval
Gabriela Mistral: Information -> Modern

Various icon and sound fixes (Thanks to Laurana Kanan!)

Updated Great Writing culture/tourism amounts to match June Patch

Added support of Infixo's Real Great People mod
Fixed some GP ethnicities

Updated for Gathering Storm

Base Upload

Admirals:
Lisboa to Industrial
Nimitz to Modern

Artists:
Rembrandt to Renaissance
El Greco to Renaissance
Qiu Ying to Renaissance
Titian to Renaissance
Jang Seung Eop to Renaissance
Sofonisba Anguissola to Renaissance
Kauffman to Industrial
Hokusai to Industrial
Edmonia Lewis to Industrial
Monet to Industrial
Klimt to Modern
Collot to Industrial
van Gogh to Industrial
Amrita Sher Gil to Modern
Orlovsky to Industrial
Cassatt to Industrial

Engineers:
Alvaar Aalto to Atomic
Alvaar Alto now has 2 charges
John Roebling to Industrial
Charles Correa to Atomic
Wernher von Braun to Atomic
Wernher von Braun's bonus now reduced
Paxton to Industrial

Generals:
Samori Ture to Industrial
Samori Ture now gives an Infantry Unit
Ahmad Shah massoud to Atomic
Vijaya Wimalaratne to Atomic

Merchants:
Mary Katherine Goddard to Industrial
Helena Rubinstein to Modern
Levi Strauss to Industrial
Melitta Bents to Modern
Estee Lauder to Atomic
Jamsetji Tata to Industrial
Masaru Ibuka to Atomic
Masaru Ibuka's bonus reduced

Musicians:
Liszt to Industrial
Tchaikovsky to Industrial
Antonio Carlos Gomez to Industrial
Chopin to Industrial
Juventino Rosas to Industrial
Dvorak to Industrial
Liliuokalani to Industrial
Schumann to Industrial
Mykola Leontovych to Modern
Gauhar Jaan to Modern

Prophets:
Bodhidharma to Classical
Irenaeus to Classical
Haji Huud to Medieval
Madhva Acharya to Medieval
Thomas Aquinas to Medieval
Francis of Assisi to Medieval
Adi Shankara is now Male (fix for code only, I think it was fin in the visuals)

Scientists:
Alfred Nobel to Industrial
Schrodinger to Modern
Sagan to Atomic
Kwolek to Atomic
Kwolek's bonus has been reduced
Abdus Salam to Atomic

Writers:
Tolstoy to Industrial
Dickinson to Industrial
Twain to Industrial
Tagore to Modern
Wells to Industrial
Capek to Modern

New Great People:
Admirals:
Henry Leach
Arleigh Burke
James G. Stavridis

Artists:
Kiki Kogelnik
Rene Magritte
Banksy
Damien Hirst
Yayoi Kusama
Takashi Murakami
Frida Kahlo
Pablo Picasso
Andy Warhol
Roy Lichtenstein
Georgia O'Keeffe
Jasper Johns

Engineers:
Zaha Hadid
Elon Musk
Santiago Calatrava
Antoni Gaudi
Frank Gehry

Generals:
Norman Schwarzkopf
Colin Powell
George Patton

Merchants:
Bill Gates
Mark Zuckerberg
Enzo Ferrari
Steve Jobs

Musicians:
Antonio Carlos Jobim
Gyorgy Ligeti
Igor Stravinsky
Elvis Presley
Christopher Tin
John Williams
Scott Joplin
George Gershwin
John Adams
Duke Ellington

Prophets:
John Calvin
Chaitanya Mahaprabhu
Guru Nanak
Kimpa Vita
Ignatius of Loyola

Scientists:
Timothy Berners-Lee
Shinya Yamanaka
Mildred Dresselhaus

Writers:
Gabriel Garcia Marquez
JRR Tolkien
Agatha Christie
J K Rowling
Chinua Achebe
George R R Martin