diff --git a/assets/mods/basegame/items/itemid.csv b/assets/mods/basegame/items/itemid.csv
index 52403dbd3..c4bd5180d 100644
--- a/assets/mods/basegame/items/itemid.csv
+++ b/assets/mods/basegame/items/itemid.csv
@@ -78,7 +78,5 @@ id;classname
 65539;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc04
 65540;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc05
 65541;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc06
-65542;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc07
-65543;net.torvald.terrarum.modulebasegame.gameitems.MusicDisc08
 
 999999;net.torvald.terrarum.modulebasegame.gameitems.ItemTapestry
diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt
index 6dd5c180e..a5dbf7931 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureJukebox.kt
@@ -88,7 +88,7 @@ class FixtureJukebox : Electric, PlaysMusic {
 
         // supress the normal background music playback
         if (musicIsPlaying && !flagDespawn) {
-//            (INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic()
+            (INGAME.musicGovernor as TerrarumMusicGovernor).stopMusic(this, false)
         }
     }
 
diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt
index 354416d3d..8b37aac20 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/MusicDisc.kt
@@ -50,7 +50,10 @@ open class MusicDiscPrototype(originalID: ItemID, module: String, path: String)
         author = meta.author
         collection = meta.album
         name = meta.title
-        nameSecondary = "${meta.author} $EMDASH ${meta.album}"
+        nameSecondary = if (meta.author.isNotBlank() && meta.album.isNotBlank())
+            "${meta.author} $EMDASH ${meta.album}"
+        else
+            "${meta.author.trim()}${meta.album.trim()}"
     }
 
     @Transient override val itemImage: TextureRegion = generateSprite()
@@ -135,11 +138,9 @@ open class MusicDiscPrototype(originalID: ItemID, module: String, path: String)
     }
 }
 
-class MusicDisc01(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/01 Thousands of Shards.ogg")
-class MusicDisc02(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/02 Glitter.ogg")
-class MusicDisc03(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/03 Digital Foliage.ogg")
-class MusicDisc04(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/04 HDMA.ogg")
-class MusicDisc05(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/05 Welded.ogg")
-class MusicDisc06(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/06 Cyllindrical.ogg")
-class MusicDisc07(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/07 Plastic Pop.ogg")
-class MusicDisc08(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/08 Gateway 509.ogg")
+class MusicDisc01(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/3_over_4.ogg")
+class MusicDisc02(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/fog.ogg")
+class MusicDisc03(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/geometry.ogg")
+class MusicDisc04(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/hdma.ogg")
+class MusicDisc05(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/lucid_dream.ogg")
+class MusicDisc06(originalID: ItemID) : MusicDiscPrototype(originalID, "basegame", "audio/music/discs/railway.ogg")
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIJukeboxInventory.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIJukeboxInventory.kt
index 71c1ad9ef..8e9308e5e 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIJukeboxInventory.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIJukeboxInventory.kt
@@ -13,6 +13,7 @@ import net.torvald.terrarum.modulebasegame.ui.UIItemInventoryCellCommonRes.defau
 import net.torvald.terrarum.modulebasegame.ui.UIJukebox.Companion.SLOT_SIZE
 import net.torvald.terrarum.ui.*
 import net.torvald.terrarum.ui.UIItemInventoryElemWide
+import net.torvald.unicode.EMDASH
 
 
 private val songButtonColourTheme = defaultInventoryCellTheme.copy(
@@ -305,6 +306,10 @@ class UIItemJukeboxSonglist(
         if (title.isNotEmpty()) {
             blendNormalStraightAlpha(batch)
 
+            val nameSecondary = if (artist.isNotBlank() && album.isNotBlank())
+                "$artist $EMDASH $album"
+            else
+                "${artist.trim()}${album.trim()}"
 
             // if mouse is over, text lights up
             // highlight item name and count (blocks/walls) if the item is equipped
@@ -317,7 +322,7 @@ class UIItemJukeboxSonglist(
             Toolkit.drawTextCentered(batch, App.fontGame, title, width, posX, posY + textOffsetY)
             // draw artist
             batch.color = batch.color.cpy().mul(0.75f, 0.75f, 0.75f, 1f)
-            Toolkit.drawTextCentered(batch, App.fontGame, album, width, posX, posY + App.fontGame.lineHeight.toInt() - 2*textOffsetY)
+            Toolkit.drawTextCentered(batch, App.fontGame, nameSecondary, width, posX, posY + App.fontGame.lineHeight.toInt() - 2*textOffsetY)
         }
 
         // see IFs above?