diff --git a/.gitignore b/.gitignore
index 35df6d730a28..62b8267d0611 100644
--- a/.gitignore
+++ b/.gitignore
@@ -181,8 +181,8 @@ Temporary Items
 /dmdoc
 
 # Ignore custom music and title screens (amend as appropriate)
-/config/jukebox_music/sounds/*
-!/config/jukebox_music/sounds/exclude
+#/config/jukebox_music/sounds/*
+#!/config/jukebox_music/sounds/exclude
 /config/title_music/sounds/*
 !/config/title_music/sounds/exclude
 /config/title_screens/images/*
diff --git a/config/jukebox_music/sounds/Acceptable in the 80s+3310+5+15.ogg b/config/jukebox_music/sounds/Acceptable in the 80s+3310+5+15.ogg
new file mode 100644
index 000000000000..b317911f30eb
Binary files /dev/null and b/config/jukebox_music/sounds/Acceptable in the 80s+3310+5+15.ogg differ
diff --git a/config/jukebox_music/sounds/Alien Syndicate+3040+5+16.ogg b/config/jukebox_music/sounds/Alien Syndicate+3040+5+16.ogg
new file mode 100644
index 000000000000..22f2a89f884b
Binary files /dev/null and b/config/jukebox_music/sounds/Alien Syndicate+3040+5+16.ogg differ
diff --git a/config/jukebox_music/sounds/Aria Math Synthwave+2980+5+35.ogg b/config/jukebox_music/sounds/Aria Math Synthwave+2980+5+35.ogg
new file mode 100644
index 000000000000..acac3f409344
Binary files /dev/null and b/config/jukebox_music/sounds/Aria Math Synthwave+2980+5+35.ogg differ
diff --git a/config/jukebox_music/sounds/Cacho Casta+1630+5+11.ogg b/config/jukebox_music/sounds/Cacho Casta+1630+5+11.ogg
new file mode 100644
index 000000000000..6c0aa96f8329
Binary files /dev/null and b/config/jukebox_music/sounds/Cacho Casta+1630+5+11.ogg differ
diff --git a/config/jukebox_music/sounds/Carmen Miranda+2840+5+18.ogg b/config/jukebox_music/sounds/Carmen Miranda+2840+5+18.ogg
new file mode 100644
index 000000000000..9cf25fd19d00
Binary files /dev/null and b/config/jukebox_music/sounds/Carmen Miranda+2840+5+18.ogg differ
diff --git a/config/jukebox_music/sounds/Cheeki Breeki+1930+5+4.ogg b/config/jukebox_music/sounds/Cheeki Breeki+1930+5+4.ogg
new file mode 100644
index 000000000000..554eccd56770
Binary files /dev/null and b/config/jukebox_music/sounds/Cheeki Breeki+1930+5+4.ogg differ
diff --git a/config/jukebox_music/sounds/Dont be a Coward+1130+5+12.ogg b/config/jukebox_music/sounds/Dont be a Coward+1130+5+12.ogg
new file mode 100644
index 000000000000..61953208d3bf
Binary files /dev/null and b/config/jukebox_music/sounds/Dont be a Coward+1130+5+12.ogg differ
diff --git a/config/jukebox_music/sounds/Dorime Ameno+1720+5+17.ogg b/config/jukebox_music/sounds/Dorime Ameno+1720+5+17.ogg
new file mode 100644
index 000000000000..9413344ec345
Binary files /dev/null and b/config/jukebox_music/sounds/Dorime Ameno+1720+5+17.ogg differ
diff --git a/config/jukebox_music/sounds/Els Segadors+2500+5+21.ogg b/config/jukebox_music/sounds/Els Segadors+2500+5+21.ogg
new file mode 100644
index 000000000000..7c1cb042bb76
Binary files /dev/null and b/config/jukebox_music/sounds/Els Segadors+2500+5+21.ogg differ
diff --git a/config/jukebox_music/sounds/Epic Sex Guy+2640+5+22.ogg b/config/jukebox_music/sounds/Epic Sex Guy+2640+5+22.ogg
new file mode 100644
index 000000000000..917007019407
Binary files /dev/null and b/config/jukebox_music/sounds/Epic Sex Guy+2640+5+22.ogg differ
diff --git a/config/jukebox_music/sounds/Five o Two+1430+5+23.ogg b/config/jukebox_music/sounds/Five o Two+1430+5+23.ogg
new file mode 100644
index 000000000000..d9715034ded6
Binary files /dev/null and b/config/jukebox_music/sounds/Five o Two+1430+5+23.ogg differ
diff --git a/config/jukebox_music/sounds/Fly me to the Moon+1340+5+9.ogg b/config/jukebox_music/sounds/Fly me to the Moon+1340+5+9.ogg
new file mode 100644
index 000000000000..1e7df61460e6
Binary files /dev/null and b/config/jukebox_music/sounds/Fly me to the Moon+1340+5+9.ogg differ
diff --git a/config/jukebox_music/sounds/Heart Transplant Surgery+2700+5+35.ogg b/config/jukebox_music/sounds/Heart Transplant Surgery+2700+5+35.ogg
new file mode 100644
index 000000000000..897949246590
Binary files /dev/null and b/config/jukebox_music/sounds/Heart Transplant Surgery+2700+5+35.ogg differ
diff --git a/config/jukebox_music/sounds/Honking Alive (Feat Clown)+530+5+24.ogg b/config/jukebox_music/sounds/Honking Alive (Feat Clown)+530+5+24.ogg
new file mode 100644
index 000000000000..34fd2dd7ef75
Binary files /dev/null and b/config/jukebox_music/sounds/Honking Alive (Feat Clown)+530+5+24.ogg differ
diff --git a/config/jukebox_music/sounds/Interworlf Metamorphosis+1430+5+25.ogg b/config/jukebox_music/sounds/Interworlf Metamorphosis+1430+5+25.ogg
new file mode 100644
index 000000000000..6531acc9d351
Binary files /dev/null and b/config/jukebox_music/sounds/Interworlf Metamorphosis+1430+5+25.ogg differ
diff --git a/config/jukebox_music/sounds/La Costa Del Silencio+2800+5+20.ogg b/config/jukebox_music/sounds/La Costa Del Silencio+2800+5+20.ogg
new file mode 100644
index 000000000000..1d436bbaf9d2
Binary files /dev/null and b/config/jukebox_music/sounds/La Costa Del Silencio+2800+5+20.ogg differ
diff --git a/config/jukebox_music/sounds/Never gonna give you up+2120+5+8.ogg b/config/jukebox_music/sounds/Never gonna give you up+2120+5+8.ogg
new file mode 100644
index 000000000000..eb6abb0e210d
Binary files /dev/null and b/config/jukebox_music/sounds/Never gonna give you up+2120+5+8.ogg differ
diff --git a/config/jukebox_music/sounds/No me Importa+3030+5+32.ogg b/config/jukebox_music/sounds/No me Importa+3030+5+32.ogg
new file mode 100644
index 000000000000..d76fc008807c
Binary files /dev/null and b/config/jukebox_music/sounds/No me Importa+3030+5+32.ogg differ
diff --git a/config/jukebox_music/sounds/Out of Touch+2490+5+26.ogg b/config/jukebox_music/sounds/Out of Touch+2490+5+26.ogg
new file mode 100644
index 000000000000..948b5c4a2aa4
Binary files /dev/null and b/config/jukebox_music/sounds/Out of Touch+2490+5+26.ogg differ
diff --git a/config/jukebox_music/sounds/Questionable Ethics+3630+5+28.ogg b/config/jukebox_music/sounds/Questionable Ethics+3630+5+28.ogg
new file mode 100644
index 000000000000..66f20b924f53
Binary files /dev/null and b/config/jukebox_music/sounds/Questionable Ethics+3630+5+28.ogg differ
diff --git a/config/jukebox_music/sounds/Star Wars Canteen+1670+5+3.ogg b/config/jukebox_music/sounds/Star Wars Canteen+1670+5+3.ogg
new file mode 100644
index 000000000000..5f5e4fe08bf8
Binary files /dev/null and b/config/jukebox_music/sounds/Star Wars Canteen+1670+5+3.ogg differ
diff --git a/config/jukebox_music/sounds/Take it Easy+2350+5+30.ogg b/config/jukebox_music/sounds/Take it Easy+2350+5+30.ogg
new file mode 100644
index 000000000000..fef6de03f4c2
Binary files /dev/null and b/config/jukebox_music/sounds/Take it Easy+2350+5+30.ogg differ
diff --git a/config/jukebox_music/sounds/Tears From Heaven+1890+5+13.ogg b/config/jukebox_music/sounds/Tears From Heaven+1890+5+13.ogg
new file mode 100644
index 000000000000..1a063603d858
Binary files /dev/null and b/config/jukebox_music/sounds/Tears From Heaven+1890+5+13.ogg differ
diff --git a/config/jukebox_music/sounds/The Forest Cassette 1+1910+5+19.ogg b/config/jukebox_music/sounds/The Forest Cassette 1+1910+5+19.ogg
new file mode 100644
index 000000000000..1974b6495d7f
Binary files /dev/null and b/config/jukebox_music/sounds/The Forest Cassette 1+1910+5+19.ogg differ
diff --git a/config/jukebox_music/sounds/Top G+2020+5+31.ogg b/config/jukebox_music/sounds/Top G+2020+5+31.ogg
new file mode 100644
index 000000000000..aa80d66122e9
Binary files /dev/null and b/config/jukebox_music/sounds/Top G+2020+5+31.ogg differ
diff --git a/config/jukebox_music/sounds/Un barco a Venus+1970+5+34.ogg b/config/jukebox_music/sounds/Un barco a Venus+1970+5+34.ogg
new file mode 100644
index 000000000000..f7698a130b9a
Binary files /dev/null and b/config/jukebox_music/sounds/Un barco a Venus+1970+5+34.ogg differ
diff --git a/config/jukebox_music/sounds/Verdis Quo+3570+5+9.ogg b/config/jukebox_music/sounds/Verdis Quo+3570+5+9.ogg
new file mode 100644
index 000000000000..bb0b533ce4f2
Binary files /dev/null and b/config/jukebox_music/sounds/Verdis Quo+3570+5+9.ogg differ
diff --git a/config/jukebox_music/sounds/Who will save the world+2260+5+14.ogg b/config/jukebox_music/sounds/Who will save the world+2260+5+14.ogg
new file mode 100644
index 000000000000..365100d94874
Binary files /dev/null and b/config/jukebox_music/sounds/Who will save the world+2260+5+14.ogg differ
diff --git a/config/jukebox_music/sounds/cumbion+2770+5+10.ogg b/config/jukebox_music/sounds/cumbion+2770+5+10.ogg
new file mode 100644
index 000000000000..77627e6a2dbb
Binary files /dev/null and b/config/jukebox_music/sounds/cumbion+2770+5+10.ogg differ
diff --git a/config/jukebox_music/palaceofloadboss+620+5+1.ogg b/config/jukebox_music/sounds/palaceofloadboss+620+5+1.ogg
similarity index 100%
rename from config/jukebox_music/palaceofloadboss+620+5+1.ogg
rename to config/jukebox_music/sounds/palaceofloadboss+620+5+1.ogg
diff --git a/config/jukebox_music/sounds/poison+2680+5+27.ogg b/config/jukebox_music/sounds/poison+2680+5+27.ogg
new file mode 100644
index 000000000000..a916dac35a8d
Binary files /dev/null and b/config/jukebox_music/sounds/poison+2680+5+27.ogg differ
diff --git a/config/jukebox_music/sounds/porcorosso+3000+5+6.ogg b/config/jukebox_music/sounds/porcorosso+3000+5+6.ogg
new file mode 100644
index 000000000000..7a4c747492e1
Binary files /dev/null and b/config/jukebox_music/sounds/porcorosso+3000+5+6.ogg differ
diff --git a/config/jukebox_music/sounds/reik+1990+5+5.ogg b/config/jukebox_music/sounds/reik+1990+5+5.ogg
new file mode 100644
index 000000000000..04f76e92f666
Binary files /dev/null and b/config/jukebox_music/sounds/reik+1990+5+5.ogg differ
diff --git a/config/jukebox_music/sounds/roundabout+2600+5+2.ogg b/config/jukebox_music/sounds/roundabout+2600+5+2.ogg
new file mode 100644
index 000000000000..8fc3dfc3da21
Binary files /dev/null and b/config/jukebox_music/sounds/roundabout+2600+5+2.ogg differ
diff --git a/config/jukebox_music/sounds/serenade+2340+5+29.ogg b/config/jukebox_music/sounds/serenade+2340+5+29.ogg
new file mode 100644
index 000000000000..7dc9b372b365
Binary files /dev/null and b/config/jukebox_music/sounds/serenade+2340+5+29.ogg differ
diff --git a/config/jukebox_music/sounds/universo_sobre_mi+1910+5+33.ogg b/config/jukebox_music/sounds/universo_sobre_mi+1910+5+33.ogg
new file mode 100644
index 000000000000..e5c2b64fd15c
Binary files /dev/null and b/config/jukebox_music/sounds/universo_sobre_mi+1910+5+33.ogg differ
diff --git a/config/jukebox_music/sounds/work_harder+1050+5+7.ogg b/config/jukebox_music/sounds/work_harder+1050+5+7.ogg
new file mode 100644
index 000000000000..2bb229a1113f
Binary files /dev/null and b/config/jukebox_music/sounds/work_harder+1050+5+7.ogg differ