diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
index 67ef81a42f8..dce70c8df03 100644
--- a/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
+++ b/data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
@@ -13,7 +13,7 @@
     {DEFAULT_SCHEDULE}
 
     {SCENARIO_MUSIC the_city_falls.ogg}
-    {EXTRA_SCENARIO_MUSIC vengeful.ogg}
+    {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
     {EXTRA_SCENARIO_MUSIC battle.ogg}
 
     [story]
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg
index 64174f03b31..771bb2aebd3 100644
--- a/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg
+++ b/data/campaigns/Delfadors_Memoirs/scenarios/07_night_in_the_swamp.cfg
@@ -23,7 +23,7 @@
     {SCENARIO_MUSIC underground.ogg}	# No story part, so no intro music
     {EXTRA_SCENARIO_MUSIC frantic.ogg}
     {EXTRA_SCENARIO_MUSIC vengeful.ogg}
-    {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
+    {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
 
     [story]
         [part]
diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
index f4d602e4665..b5da6d55245 100644
--- a/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
+++ b/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
@@ -10,7 +10,7 @@
 
     {SCENARIO_MUSIC loyalists.ogg}
     {EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
-    {EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
+    {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
 
     # no story -- this occurs immediately after the previous scenario
 
diff --git a/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg b/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
index 88e287b576d..98693297fa6 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
@@ -9,7 +9,7 @@
     {DEFAULT_SCHEDULE}
 
     {INTRO_AND_SCENARIO_MUSIC northerners.ogg the_dangerous_symphony.ogg}
-    {EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
+    {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
     {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
index 548a94b04a7..71633378b77 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
@@ -3,7 +3,7 @@
     id=18_A_Choice_Must_Be_Made
     name= _ "A Choice Must Be Made"
     map_data="{campaigns/Heir_To_The_Throne/maps/18_A_Choice_Must_Be_Made.map}"
-    {SCENARIO_MUSIC "nunc_dimittis.ogg"}
+    {SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
     {EXTRA_SCENARIO_MUSIC "knolls.ogg"}
     {TURNS 33 30 27}
 
diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
index f3e8e2b23ac..91cc9807795 100644
--- a/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
+++ b/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
@@ -22,7 +22,7 @@
     {TURNS 35 30 25}
 
     {INTRO_AND_SCENARIO_MUSIC northerners.ogg elvish-theme.ogg}
-    {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
+    {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
     {EXTRA_SCENARIO_MUSIC wanderer.ogg}
     {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
     {EXTRA_SCENARIO_MUSIC suspense.ogg}
diff --git a/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg b/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
index 6fee68b9712..79933411f37 100644
--- a/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
+++ b/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
@@ -15,7 +15,7 @@
 
     {INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg vengeful.ogg}
     {EXTRA_SCENARIO_MUSIC battle.ogg}
-    {EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
+    {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
     {EXTRA_SCENARIO_MUSIC wanderer.ogg}
     {EXTRA_SCENARIO_MUSIC knalgan_theme.ogg}
 
diff --git a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
index 98524264936..db9910d0975 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
@@ -10,7 +10,7 @@
 
     {INTRO_AND_SCENARIO_MUSIC "knolls.ogg" "frantic.ogg"}
     {EXTRA_SCENARIO_MUSIC "knalgan_theme.ogg"}
-    {EXTRA_SCENARIO_MUSIC "the_city_falls.ogg"}
+    {EXTRA_SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
 
     # Story, in places with portraits again
     # wmllint: local spelling geez
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
index 684caa22da1..0abce01fe69 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
@@ -12,6 +12,7 @@
 
     {SCENARIO_MUSIC "northerners.ogg"}
     {EXTRA_SCENARIO_MUSIC "knolls.ogg"}
+    {EXTRA_SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
 
     [event]
         name=prestart
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
index 3abad730f4a..7a9edd2bd85 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
@@ -12,6 +12,7 @@
 
     {SCENARIO_MUSIC "loyalists.ogg"}
     {EXTRA_SCENARIO_MUSIC "battle.ogg"}
+    {EXTRA_SCENARIO_MUSIC "heroes_rite.ogg"}
 
     [event]
         name=prestart
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
index ae7ff0431a1..b189146324f 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/03_Towards_Mountains_of_Haag.cfg
@@ -19,6 +19,7 @@
 
     {SCENARIO_MUSIC "knolls.ogg"}
     {EXTRA_SCENARIO_MUSIC "breaking_the_chains.ogg"}
+    {EXTRA_SCENARIO_MUSIC "knalgan_theme.ogg"}
 
     [event]
         name=prestart
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
index 00176189356..21a2d385aec 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
@@ -5,8 +5,9 @@
     map_data="{campaigns/Son_Of_The_Black_Eye/maps/To_The_Harbour_Of_Tirigaz.map}"
 
     {TURNS 36 30 24}
-    {SCENARIO_MUSIC "knalgan_theme.ogg"}
+    {SCENARIO_MUSIC "underground.ogg"}
     {EXTRA_SCENARIO_MUSIC "suspense.ogg"}
+    {EXTRA_SCENARIO_MUSIC "the_deep_path.ogg"}
 
 #ifdef EASY
     {FIRST_WATCH}
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
index de7dd7def3b..9438990bc65 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
@@ -33,6 +33,7 @@
 
     {SCENARIO_MUSIC "the_city_falls.ogg"}
     {EXTRA_SCENARIO_MUSIC "breaking_the_chains.ogg"}
+    {EXTRA_SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
 
     [event]
         name=prestart
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
index 83e06c8bf5b..3d67a95f8c8 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
@@ -10,6 +10,7 @@
     next_scenario="Silent_Forest"
 
     {SCENARIO_MUSIC "wanderer.ogg"}
+    {EXTRA_SCENARIO_MUSIC "the_dangerous_symphony.ogg"}
 
     [event]
         name=prestart
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
index dab5298e24e..81b3d0d1d42 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
@@ -8,7 +8,7 @@
 
     victory_when_enemies_defeated="yes"
 
-    {SCENARIO_MUSIC "battle.ogg"}
+    {SCENARIO_MUSIC "vengeful.ogg"}
     {EXTRA_SCENARIO_MUSIC "breaking_the_chains.ogg"}
 
     {MORNING}
diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
index 65a634427c0..a4125ec350b 100644
--- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
+++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
@@ -449,7 +449,7 @@
         {REPLACE_SCENARIO_MUSIC "vengeful.ogg"}
         {APPEND_MUSIC "underground.ogg"}
         {APPEND_MUSIC "breaking_the_chains.ogg"}
-        {APPEND_MUSIC "the_city_falls.ogg"}
+        {APPEND_MUSIC "siege_of_laurelmor.ogg"}
         {APPEND_MUSIC "battle.ogg"}
         {APPEND_MUSIC "vengeful.ogg"}
         {APPEND_MUSIC "the_deep_path.ogg"}
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
index d498dba0634..eb120267cd1 100644
--- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
+++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
@@ -12,7 +12,7 @@
     {SCENARIO_MUSIC loyalists.ogg}
     {EXTRA_SCENARIO_MUSIC northerners.ogg}
     {EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
-    {EXTRA_SCENARIO_MUSIC knolls.ogg}
+    {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
 
     # No story
     {THE_VANGUARD_BIGMAP}
diff --git a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
index 49b50010447..24cfcb35cf7 100644
--- a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
+++ b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
@@ -7,7 +7,7 @@
 
     {SCENARIO_MUSIC knalgan_theme.ogg}
     {EXTRA_SCENARIO_MUSIC battle.ogg}
-    {EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
+    {EXTRA_SCENARIO_MUSIC siege_of_laurelmor.ogg}
 
     map_data="{campaigns/The_South_Guard/maps/8b_The_Tides_of_War.map}"
 
diff --git a/data/campaigns/Under_the_Burning_Suns/TODO b/data/campaigns/Under_the_Burning_Suns/TODO
index 930ed91191b..7cecf5a5d81 100644
--- a/data/campaigns/Under_the_Burning_Suns/TODO
+++ b/data/campaigns/Under_the_Burning_Suns/TODO
@@ -1,4 +1,6 @@
 - The character sprites for Kaleh and Nym are old ones based on 1.0 and 
   not TCed; they look slightly wrong next to the recolored 2.0 sprites.
 
--Possibly give the "Emerald Wand of Poison" a better name, and possibly make the item accessible to units other than the Desert Shyde and the Desert Star.
\ No newline at end of file
+-Possibly give the "Emerald Wand of Poison" a better name, and possibly make the item accessible to units other than the Desert Shyde and the Desert Star.
+
+-Give some textual clue about the locations of the coldsword and wand.
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
index ff4d66bb92b..db77e4a4281 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
@@ -25,6 +25,7 @@
     {INTRO_AND_SCENARIO_MUSIC "transience.ogg" "the_deep_path.ogg"}
     {EXTRA_SCENARIO_MUSIC "frantic.ogg"}
     {EXTRA_SCENARIO_MUSIC "the_king_is_dead.ogg"}
+    {EXTRA_SCENARIO_MUSIC "siege_of_laurelmor.ogg"}
 
     {STORY_STIRRING_IN_THE_NIGHT}