The first thing I noticed in the official soundtrack listing is that the main theme suite has the word “Hope” just like the previous track from you-know-which-one-scene. And “Rogue One” is not the main theme. Very confusing. Just like the 1993 and 1997 soundtracks have different track titles (and arrangements!), here are my proposals for renaming (in bold), compared to the current ones (and composer’s twisted jokes):

He’s Here For Us
A Krennic Condition
He’s Come For Us
A Long Ride Ahead
Jyn and Scare it
An Offer You Can’t Refuse, Main Theme
Wobani Imperial Labor Camp
Jyncarcerated
Trust Goes Both Ways [includes “The Force Theme”]
Going to See Saw
When Has Become Now
That New Death Star Smell
Death Star Reveal [includes “Death Star Fanfare”]
Jedha Arrival
Jedha Call Saw
Jedha City Ambush
When Ambush Comes to Shove
Star-Dust
Erso Facto
Confrontation on Eadu
Go Do, That Eadu, That You Do, So Well
Krennic’s Aspirations [includes “Imperial Motif” and “The Imperial March”]
Have a Choke and Smile
Rebellions Are Built on Hope
Erso in Vain
Rogue One [includes “The Force Theme”]
Takes One to Rogue One
Cargo Shuttle SW-0608
World’s Worst Vacation Destination
At the Gate to Destiny
Scrambling the Rebel Fleet [includes “The Force Theme” and “Star Wars Main Theme”]
Scarif Tactics
AT-ACT Assault [includes “Rebel Fanfare” and “Imperial Walkers”]
Bazed and Confused
The Master Switch
Switch Hunt
Your Father Would Be Proud
Transmission Impossible
Hope [includes “The Imperial March”, “Rebel Blockade Runner” and “The Force Theme”]
Live and Let Jedi
Despair and Hope
Jyn Erso and Hope Suite
Jyn’s Theme, Rogue One Theme
The Imperial Suite
A New Order, Krennic’s Theme
Guardians of the Whills Suite

Actually it’s just tidying up, nothing special. Probably my most notable idea would be calling those new Imperial fanfares “New Order”.

Still thinking about 10 & 12. I’m trying to avoid too obvious ones like “Visiting Vader”, bah.