From 04c5730c26874f0fac42cf716313c5d3920e26ef Mon Sep 17 00:00:00 2001
From: Joakim Pettersvold <joakimpokemeg@hotmail.no>
Date: Sat, 13 Oct 2018 22:34:30 +0200
Subject: [PATCH 1/3] Added playlists (and songs), and removed -x protocol on
 playlists maintained by Joakim +JoakimRemixes.m3u +Halloween.m3u
 *JoakimDiverse.m3u(Added songs) *AstridS.m3u(Added songs)

Added JoakimRemixes and Halloween to main.liq (Halloween is commented)
---
 state/liquidsoap/config/main.liq              | 10 ++++
 .../playlists/Joakim/AlternativeJoa.m3u       | 20 ++++---
 .../playlists/Joakim/JoakimDiverse.m3u        | 60 ++++++++++++-------
 .../playlists/Joakim/JoakimRemixes.m3u        |  8 +++
 state/liquidsoap/playlists/Musicals.m3u       | 34 +++++------
 state/liquidsoap/playlists/Soundtracks.m3u    |  2 +-
 .../playlists/artists/ArianaGrande.m3u        |  6 +-
 .../liquidsoap/playlists/artists/AstridS.m3u  | 10 ++--
 .../liquidsoap/playlists/artists/Coldplay.m3u |  8 +--
 .../playlists/artists/DemiLovato.m3u          |  6 +-
 .../playlists/artists/KatyPerry.m3u           | 12 ++--
 .../playlists/artists/SelenaGomez.m3u         | 12 ++--
 .../playlists/artists/ShawnMendes.m3u         |  8 +--
 .../playlists/artists/TaylorSwift.m3u         | 22 +++----
 .../playlists/artists/ZaraLarsson.m3u         |  8 +--
 .../liquidsoap/playlists/events/Halloween.m3u | 12 ++++
 16 files changed, 144 insertions(+), 94 deletions(-)
 create mode 100644 state/liquidsoap/playlists/Joakim/JoakimRemixes.m3u
 create mode 100644 state/liquidsoap/playlists/events/Halloween.m3u

diff --git a/state/liquidsoap/config/main.liq b/state/liquidsoap/config/main.liq
index c1af105..b34d776 100644
--- a/state/liquidsoap/config/main.liq
+++ b/state/liquidsoap/config/main.liq
@@ -84,6 +84,7 @@ live = audio_to_stereo(
 # Joakim
 JoakimDiverse		= "/playlists/Joakim/JoakimDiverse.m3u"
 AlternativeJoa		= "/playlists/Joakim/AlternativeJoa.m3u"
+JoakimRemixes		= "/playlists/Joakim/JoakimRemixes.m3u"
 
 # Daniel
 DanAwesome		= "/playlists/Daniel/Dan - awesome.m3u"
@@ -106,6 +107,9 @@ ZaraLarsson		= "/playlists/artists/ZaraLarsson.m3u"
 Musicals		= "/playlists/Musicals.m3u"
 Soundtracks		= "/playlists/Soundtracks.m3u"
 
+#Events
+Halloween		= "/playlists/events/Halloween.m3u"
+
 ## END PLAYLISTS
 
 
@@ -160,6 +164,12 @@ count = count + list.length(playlist.parse(Musicals))
 randomsong = random(weights=[list.length(playlist.parse(Soundtracks)), count], [playlist(Soundtracks), randomsong])
 count = count + list.length(playlist.parse(Soundtracks))
 
+randomsong = random(weights=[list.length(playlist.parse(JoakimRemixes)), count], [playlist(JoakimRemixes), randomsong]) 
+count = count + list.length(playlist.parse(JoakimRemixes))
+
+### randomsong = random(weights=[list.length(playlist.parse(Halloween)), count], [playlist(Halloween), randomsong]) 
+### count = count + list.length(playlist.parse(Halloween))
+
 
 randomsong = audio_to_stereo(randomsong)
 
diff --git a/state/liquidsoap/playlists/Joakim/AlternativeJoa.m3u b/state/liquidsoap/playlists/Joakim/AlternativeJoa.m3u
index 315c608..f728308 100644
--- a/state/liquidsoap/playlists/Joakim/AlternativeJoa.m3u
+++ b/state/liquidsoap/playlists/Joakim/AlternativeJoa.m3u
@@ -1,18 +1,20 @@
 #EXTINF:274,Alone
-ffmpeg2wav:youtube-dl-x:OBs1Fb8adGQ
+ffmpeg2wav:youtube-dl:OBs1Fb8adGQ
 #EXTINF:234,Summer
-ffmpeg2wav:youtube-dl-x:jzSbO9jAyGo
+ffmpeg2wav:youtube-dl:jzSbO9jAyGo
 #EXTINF:180,Moving On
-ffmpeg2wav:youtube-dl-x:u8v0s_Npum8
+ffmpeg2wav:youtube-dl:u8v0s_Npum8
 #EXTINF:178,Find Me
-ffmpeg2wav:youtube-dl-x:0skBKGhS5w0
+ffmpeg2wav:youtube-dl:0skBKGhS5w0
 #EXTINF:195,Fly (ft. Leah Culver)
-ffmpeg2wav:youtube-dl-x:oxmF4bULw8U
+ffmpeg2wav:youtube-dl:oxmF4bULw8U
 #EXTINF:210,Blocks
-ffmpeg2wav:youtube-dl-x:DFIisYFvFxs
+ffmpeg2wav:youtube-dl:DFIisYFvFxs
 #EXTINF:191,You & Me
-ffmpeg2wav:youtube-dl-x:xQJpC_kP_5M
+ffmpeg2wav:youtube-dl:xQJpC_kP_5M
 #EXTINF:202,To the Stars
-ffmpeg2wav:youtube-dl-x:O9xU_ZMHxpc
+ffmpeg2wav:youtube-dl:O9xU_ZMHxpc
 #EXTINF:206,Adventure Time
-ffmpeg2wav:youtube-dl-x:238oqfxEzI8
+ffmpeg2wav:youtube-dl:238oqfxEzI8
+#EXTINF:174,[Happy Hardcore] - nanobii - Rainbow Road [Monstercat Release]
+ffmpeg2wav:youtube-dl:a0Aauep0VWs
diff --git a/state/liquidsoap/playlists/Joakim/JoakimDiverse.m3u b/state/liquidsoap/playlists/Joakim/JoakimDiverse.m3u
index 416654d..bc0ce2c 100644
--- a/state/liquidsoap/playlists/Joakim/JoakimDiverse.m3u
+++ b/state/liquidsoap/playlists/Joakim/JoakimDiverse.m3u
@@ -1,44 +1,60 @@
 #EXTINF:230,Fake It
-ffmpeg2wav:youtube-dl-x:Uj5yJPXf19U
+ffmpeg2wav:youtube-dl:Uj5yJPXf19U
 #EXTINF:144,Immortalized
-ffmpeg2wav:youtube-dl-x:lotiDMbS8Q8
+ffmpeg2wav:youtube-dl:lotiDMbS8Q8
 #EXTINF:197,Gabriel Rios - Gold (Thomas Jack Radio Edit)
-ffmpeg2wav:youtube-dl-x:V4SkIxrYPPU
+ffmpeg2wav:youtube-dl:V4SkIxrYPPU
 #EXTINF:201,Rett Sted Rett Tid
-ffmpeg2wav:youtube-dl-x:iwIzBuZ-wIU
+ffmpeg2wav:youtube-dl:iwIzBuZ-wIU
 #EXTINF:191,High Hopes
-ffmpeg2wav:youtube-dl-x:GJY8OMJXRAk
+ffmpeg2wav:youtube-dl:GJY8OMJXRAk
 #EXTINF:173,Arigato
-ffmpeg2wav:youtube-dl-x:evyPn_zSkGI
+ffmpeg2wav:youtube-dl:evyPn_zSkGI
 #EXTINF:235,I Need Your Love
-ffmpeg2wav:youtube-dl-x:USqra5JF0cU
+ffmpeg2wav:youtube-dl:USqra5JF0cU
 #EXTINF:217,Havana
-ffmpeg2wav:youtube-dl-x:mJLDjIWuPXU
+ffmpeg2wav:youtube-dl:mJLDjIWuPXU
 #EXTINF:227,Never Be the Same
-ffmpeg2wav:youtube-dl-x:dVvHXYOxJCQ
+ffmpeg2wav:youtube-dl:dVvHXYOxJCQ
 #EXTINF:212,Darkside
-ffmpeg2wav:youtube-dl-x:AO09xzvlpoI
+ffmpeg2wav:youtube-dl:AO09xzvlpoI
 #EXTINF:195,Simple
-ffmpeg2wav:youtube-dl-x:SU_-h2fdKuE
+ffmpeg2wav:youtube-dl:SU_-h2fdKuE
 #EXTINF:203,FRIENDS
-ffmpeg2wav:youtube-dl-x:_BxLHfR_WtQ
+ffmpeg2wav:youtube-dl:_BxLHfR_WtQ
 #EXTINF:187,2002
-ffmpeg2wav:youtube-dl-x:ee2mcqcGL_c
+ffmpeg2wav:youtube-dl:ee2mcqcGL_c
 #EXTINF:257,Counting Stars
-ffmpeg2wav:youtube-dl-x:ORSC0msUBZ0
+ffmpeg2wav:youtube-dl:ORSC0msUBZ0
 #EXTINF:208,I'm Gonna Show You Crazy
-ffmpeg2wav:youtube-dl-x:dQsdbuMJQik
+ffmpeg2wav:youtube-dl:dQsdbuMJQik
 #EXTINF:196,In the Name of Love
-ffmpeg2wav:youtube-dl-x:4u4d4GWdpo8
+ffmpeg2wav:youtube-dl:4u4d4GWdpo8
 #EXTINF:238,Kids
-ffmpeg2wav:youtube-dl-x:F_Z_m261aZM
+ffmpeg2wav:youtube-dl:F_Z_m261aZM
 #EXTINF:181,Schedules
-ffmpeg2wav:youtube-dl-x:n8Ik2YwBP2M
+ffmpeg2wav:youtube-dl:n8Ik2YwBP2M
 #EXTINF:185,Favela
-ffmpeg2wav:youtube-dl-x:V8zAjcUU0Lw
+ffmpeg2wav:youtube-dl:V8zAjcUU0Lw
 #EXTINF:220,Say Love
-ffmpeg2wav:youtube-dl-x:ws5MjNc0194
+ffmpeg2wav:youtube-dl:ws5MjNc0194
 #EXTINF:258,Hei Erna
-ffmpeg2wav:youtube-dl-x:aLSHyEC1xMA
+ffmpeg2wav:youtube-dl:aLSHyEC1xMA
 #EXTINF:312,Stolen Dance
-ffmpeg2wav:youtube-dl-x:e04ecXBnCog
+ffmpeg2wav:youtube-dl:e04ecXBnCog
+#EXTINF:142,James Hype - More Than Friends (ft. Kelli-Leigh)
+ffmpeg2wav:youtube-dl:IIsWmB28AdM
+#EXTINF:207,Happy Now
+ffmpeg2wav:youtube-dl:xo4T7qXxGsA
+#EXTINF:163,Loud Luxury ft. Brando - Body
+ffmpeg2wav:youtube-dl:7zbNK3sp7Dw
+#EXTINF:240,Diamond Heart
+ffmpeg2wav:youtube-dl:mKqms-KnzU0
+#EXTINF:202,Sigala - Sweet Lovin' (feat Bryn Christopher) [with download link]
+ffmpeg2wav:youtube-dl:Cg1Lr8vpwQw
+#EXTINF:191,No Thanks
+ffmpeg2wav:youtube-dl:7qGu4KNUj9k
+#EXTINF:188,Sweet but Psycho
+ffmpeg2wav:youtube-dl:dXJHDhKJ9Dw
+#EXTINF:194,Sucker Punch
+ffmpeg2wav:youtube-dl:SzbAs19m8ro
diff --git a/state/liquidsoap/playlists/Joakim/JoakimRemixes.m3u b/state/liquidsoap/playlists/Joakim/JoakimRemixes.m3u
new file mode 100644
index 0000000..5c4d1bb
--- /dev/null
+++ b/state/liquidsoap/playlists/Joakim/JoakimRemixes.m3u
@@ -0,0 +1,8 @@
+#EXTINF:233,nanobii - Go The Distance (feat. Lindsey Marie)
+ffmpeg2wav:youtube-dl:7-vBjfM6KAA
+#EXTINF:136,**POOR UNFORTUNATE SOULS REMIX DJ SLYNX** (Promo Sample not full song)
+ffmpeg2wav:youtube-dl:6E-dtnksKNs
+#EXTINF:152,Undertale - Tem Shop (Ben Briggs Glitch Hop Remix!) - GameChops
+ffmpeg2wav:youtube-dl:Gu8A8uWAJaA
+#EXTINF:205,[Electro Swing] A Friend Like Me (Sim Gretina Remix)
+ffmpeg2wav:youtube-dl:yW0QKrvJPaU
diff --git a/state/liquidsoap/playlists/Musicals.m3u b/state/liquidsoap/playlists/Musicals.m3u
index 017a741..4904956 100644
--- a/state/liquidsoap/playlists/Musicals.m3u
+++ b/state/liquidsoap/playlists/Musicals.m3u
@@ -1,34 +1,34 @@
 #EXTINF:173,Candy Store - Heathers: The Musical +LYRICS
-ffmpeg2wav:youtube-dl-x:BQOoTX1Nxx8
+ffmpeg2wav:youtube-dl:BQOoTX1Nxx8
 #EXTINF:171,Freeze Your Brain - Heathers: The Musical +LYRICS
-ffmpeg2wav:youtube-dl-x:GAOxJv96VE8
+ffmpeg2wav:youtube-dl:GAOxJv96VE8
 #EXTINF:203,Dead Girl Walking - Heathers: The Musical +LYRICS
-ffmpeg2wav:youtube-dl-x:3EyDyxGZn_Y
+ffmpeg2wav:youtube-dl:3EyDyxGZn_Y
 #EXTINF:198,mulan -  I'll make a man out of you lyrics
-ffmpeg2wav:youtube-dl-x:Jbp52Z9jRg0
+ffmpeg2wav:youtube-dl:Jbp52Z9jRg0
 #EXTINF:204,Under the Sea (Remastered 2014)
-ffmpeg2wav:youtube-dl-x:YV6uW1tT3KY
+ffmpeg2wav:youtube-dl:YV6uW1tT3KY
 #EXTINF:141,Hercules OST - 09 - Zero To Hero
-ffmpeg2wav:youtube-dl-x:7AMaXJGTvOA
+ffmpeg2wav:youtube-dl:7AMaXJGTvOA
 #EXTINF:291,Poor Unfortunate Souls (from "The Little Mermaid")
-ffmpeg2wav:youtube-dl-x:85MYKE-NPLc
+ffmpeg2wav:youtube-dl:85MYKE-NPLc
 #EXTINF:270,A Million Dreams
-ffmpeg2wav:youtube-dl-x:58hX4fF-F04
+ffmpeg2wav:youtube-dl:58hX4fF-F04
 #EXTINF:302,The Greatest Show
-ffmpeg2wav:youtube-dl-x:vhxSCA8dpY4
+ffmpeg2wav:youtube-dl:vhxSCA8dpY4
 #EXTINF:214,The Other Side
-ffmpeg2wav:youtube-dl-x:i5qYmB0JZt4
+ffmpeg2wav:youtube-dl:i5qYmB0JZt4
 #EXTINF:208,Never Enough
-ffmpeg2wav:youtube-dl-x:OPetRH5R3tg
+ffmpeg2wav:youtube-dl:OPetRH5R3tg
 #EXTINF:218,Rewrite The Stars
-ffmpeg2wav:youtube-dl-x:m6JZnqvOnXs
+ffmpeg2wav:youtube-dl:m6JZnqvOnXs
 #EXTINF:212,Make You Believe
-ffmpeg2wav:youtube-dl-x:VBMpdeQnNp0
+ffmpeg2wav:youtube-dl:VBMpdeQnNp0
 #EXTINF:236,Run This Town
-ffmpeg2wav:youtube-dl-x:AvwYN7OL4A8
+ffmpeg2wav:youtube-dl:AvwYN7OL4A8
 #EXTINF:221,Bless Myself
-ffmpeg2wav:youtube-dl-x:nPgE9O8B2qA
+ffmpeg2wav:youtube-dl:nPgE9O8B2qA
 #EXTINF:194,Go the Distance
-ffmpeg2wav:youtube-dl-x:BvKNePELD2k
+ffmpeg2wav:youtube-dl:BvKNePELD2k
 #EXTINF:224,Defying Gravity (Dance Mix)
-ffmpeg2wav:youtube-dl-x:EwK40XAN7CM
+ffmpeg2wav:youtube-dl:EwK40XAN7CM
diff --git a/state/liquidsoap/playlists/Soundtracks.m3u b/state/liquidsoap/playlists/Soundtracks.m3u
index fc218d9..879cd20 100644
--- a/state/liquidsoap/playlists/Soundtracks.m3u
+++ b/state/liquidsoap/playlists/Soundtracks.m3u
@@ -1,2 +1,2 @@
 #EXTINF:175,Concerning Hobbits
-ffmpeg2wav:youtube-dl-x:CL_3mlOPnGI
+ffmpeg2wav:youtube-dl:CL_3mlOPnGI
diff --git a/state/liquidsoap/playlists/artists/ArianaGrande.m3u b/state/liquidsoap/playlists/artists/ArianaGrande.m3u
index f95aaa9..fce7760 100644
--- a/state/liquidsoap/playlists/artists/ArianaGrande.m3u
+++ b/state/liquidsoap/playlists/artists/ArianaGrande.m3u
@@ -1,6 +1,6 @@
 #EXTINF:206,no tears left to cry
-ffmpeg2wav:youtube-dl-x:vZi3AHnb8b4
+ffmpeg2wav:youtube-dl:vZi3AHnb8b4
 #EXTINF:215,Break Free
-ffmpeg2wav:youtube-dl-x:by0-_qQvWqI
+ffmpeg2wav:youtube-dl:by0-_qQvWqI
 #EXTINF:197,One Last Time
-ffmpeg2wav:youtube-dl-x:H3_sDJd8qI4
+ffmpeg2wav:youtube-dl:H3_sDJd8qI4
diff --git a/state/liquidsoap/playlists/artists/AstridS.m3u b/state/liquidsoap/playlists/artists/AstridS.m3u
index 06a9044..e3b51bf 100644
--- a/state/liquidsoap/playlists/artists/AstridS.m3u
+++ b/state/liquidsoap/playlists/artists/AstridS.m3u
@@ -1,8 +1,10 @@
 #EXTINF:208,Paper Thin
-ffmpeg2wav:youtube-dl-x:gSo7GV1pDWg
+ffmpeg2wav:youtube-dl:gSo7GV1pDWg
 #EXTINF:185,Think Before I Talk
-ffmpeg2wav:youtube-dl-x:7CJt9uW0-2o
+ffmpeg2wav:youtube-dl:7CJt9uW0-2o
 #EXTINF:212,Breathe
-ffmpeg2wav:youtube-dl-x:MLbowjqaZr0
+ffmpeg2wav:youtube-dl:MLbowjqaZr0
 #EXTINF:211,Such A Boy
-ffmpeg2wav:youtube-dl-x:sz9XguOcHzk
+ffmpeg2wav:youtube-dl:sz9XguOcHzk
+#EXTINF:211,Running Out
+ffmpeg2wav:youtube-dl:347HaItFoQI
diff --git a/state/liquidsoap/playlists/artists/Coldplay.m3u b/state/liquidsoap/playlists/artists/Coldplay.m3u
index b3ae5c7..a8f1dde 100644
--- a/state/liquidsoap/playlists/artists/Coldplay.m3u
+++ b/state/liquidsoap/playlists/artists/Coldplay.m3u
@@ -1,8 +1,8 @@
 #EXTINF:279,Paradise
-ffmpeg2wav:youtube-dl-x:Q0TEUMPIhk8
+ffmpeg2wav:youtube-dl:Q0TEUMPIhk8
 #EXTINF:264,Adventure Of A Lifetime
-ffmpeg2wav:youtube-dl-x:XsMpXczOIPs
+ffmpeg2wav:youtube-dl:XsMpXczOIPs
 #EXTINF:221,Coldplay - Hymn For The Weekend (Lyrics)
-ffmpeg2wav:youtube-dl-x:g8xIoipyjzo
+ffmpeg2wav:youtube-dl:g8xIoipyjzo
 #EXTINF:242,Viva La Vida
-ffmpeg2wav:youtube-dl-x:zOQ4ld6NsXE
+ffmpeg2wav:youtube-dl:zOQ4ld6NsXE
diff --git a/state/liquidsoap/playlists/artists/DemiLovato.m3u b/state/liquidsoap/playlists/artists/DemiLovato.m3u
index e7c5c67..aaf01c1 100644
--- a/state/liquidsoap/playlists/artists/DemiLovato.m3u
+++ b/state/liquidsoap/playlists/artists/DemiLovato.m3u
@@ -1,6 +1,6 @@
 #EXTINF:223,Solo (feat. Demi Lovato)
-ffmpeg2wav:youtube-dl-x:GvdKeZO8IzM
+ffmpeg2wav:youtube-dl:GvdKeZO8IzM
 #EXTINF:226,Let It Go
-ffmpeg2wav:youtube-dl-x:c8aensboOGA
+ffmpeg2wav:youtube-dl:c8aensboOGA
 #EXTINF:204,Sorry Not Sorry
-ffmpeg2wav:youtube-dl-x:HyaQl_9mFAU
+ffmpeg2wav:youtube-dl:HyaQl_9mFAU
diff --git a/state/liquidsoap/playlists/artists/KatyPerry.m3u b/state/liquidsoap/playlists/artists/KatyPerry.m3u
index 4e806dd..9c7ea77 100644
--- a/state/liquidsoap/playlists/artists/KatyPerry.m3u
+++ b/state/liquidsoap/playlists/artists/KatyPerry.m3u
@@ -1,12 +1,12 @@
 #EXTINF:242,Katy Perry - Last Friday Night - Audio
-ffmpeg2wav:youtube-dl-x:od6c8G3-r8Y
+ffmpeg2wav:youtube-dl:od6c8G3-r8Y
 #EXTINF:227,Katy Perry - Wide Awake (Lyric Video)
-ffmpeg2wav:youtube-dl-x:-3D5FwwtNVM
+ffmpeg2wav:youtube-dl:-3D5FwwtNVM
 #EXTINF:229,Unconditionally
-ffmpeg2wav:youtube-dl-x:d0hfMzfk64M
+ffmpeg2wav:youtube-dl:d0hfMzfk64M
 #EXTINF:238,Chained to the Rhythm (feat. Skip Marley)
-ffmpeg2wav:youtube-dl-x:Y2evCkaWaLE
+ffmpeg2wav:youtube-dl:Y2evCkaWaLE
 #EXTINF:204,This Is How We Do
-ffmpeg2wav:youtube-dl-x:tfh6fFpQKVA
+ffmpeg2wav:youtube-dl:tfh6fFpQKVA
 #EXTINF:223,Hot N Cold
-ffmpeg2wav:youtube-dl-x:CuSVYLb_ooo
+ffmpeg2wav:youtube-dl:CuSVYLb_ooo
diff --git a/state/liquidsoap/playlists/artists/SelenaGomez.m3u b/state/liquidsoap/playlists/artists/SelenaGomez.m3u
index 35f838c..d8384f2 100644
--- a/state/liquidsoap/playlists/artists/SelenaGomez.m3u
+++ b/state/liquidsoap/playlists/artists/SelenaGomez.m3u
@@ -1,12 +1,12 @@
 #EXTINF:210,Back To You
-ffmpeg2wav:youtube-dl-x:miUhh2fKVYE
+ffmpeg2wav:youtube-dl:miUhh2fKVYE
 #EXTINF:229,Same Old Love
-ffmpeg2wav:youtube-dl-x:sfdWh0gLItk
+ffmpeg2wav:youtube-dl:sfdWh0gLItk
 #EXTINF:218,Kill Em With Kindness
-ffmpeg2wav:youtube-dl-x:S744V05cpI8
+ffmpeg2wav:youtube-dl:S744V05cpI8
 #EXTINF:227,The Heart Wants What It Wants
-ffmpeg2wav:youtube-dl-x:2Aa06S5vFWg
+ffmpeg2wav:youtube-dl:2Aa06S5vFWg
 #EXTINF:189,Love You Like A Love Song
-ffmpeg2wav:youtube-dl-x:Wv2ey4FpZeE
+ffmpeg2wav:youtube-dl:Wv2ey4FpZeE
 #EXTINF:210,Slow Down
-ffmpeg2wav:youtube-dl-x:N-MBk3EeRfQ
+ffmpeg2wav:youtube-dl:N-MBk3EeRfQ
diff --git a/state/liquidsoap/playlists/artists/ShawnMendes.m3u b/state/liquidsoap/playlists/artists/ShawnMendes.m3u
index 7239be5..1f38a3a 100644
--- a/state/liquidsoap/playlists/artists/ShawnMendes.m3u
+++ b/state/liquidsoap/playlists/artists/ShawnMendes.m3u
@@ -1,8 +1,8 @@
 #EXTINF:207,Stitches
-ffmpeg2wav:youtube-dl-x:GntxbUgCgdk
+ffmpeg2wav:youtube-dl:GntxbUgCgdk
 #EXTINF:199,There's Nothing Holdin' Me Back
-ffmpeg2wav:youtube-dl-x:KCqEBTDthrE
+ffmpeg2wav:youtube-dl:KCqEBTDthrE
 #EXTINF:188,Treat You Better
-ffmpeg2wav:youtube-dl-x:P2szbE3uZnI
+ffmpeg2wav:youtube-dl:P2szbE3uZnI
 #EXTINF:224,I Know What You Did Last Summer
-ffmpeg2wav:youtube-dl-x:JVqDfs6uNGg
+ffmpeg2wav:youtube-dl:JVqDfs6uNGg
diff --git a/state/liquidsoap/playlists/artists/TaylorSwift.m3u b/state/liquidsoap/playlists/artists/TaylorSwift.m3u
index 1cc4970..6e9f4db 100644
--- a/state/liquidsoap/playlists/artists/TaylorSwift.m3u
+++ b/state/liquidsoap/playlists/artists/TaylorSwift.m3u
@@ -1,22 +1,22 @@
 #EXTINF:232,Blank Space
-ffmpeg2wav:youtube-dl-x:UkpFHwqaJYE
+ffmpeg2wav:youtube-dl:UkpFHwqaJYE
 #EXTINF:212,Bad Blood
-ffmpeg2wav:youtube-dl-x:kQCOAz5lHxA
+ffmpeg2wav:youtube-dl:kQCOAz5lHxA
 #EXTINF:221,Wildest Dreams
-ffmpeg2wav:youtube-dl-x:FzGYJ4dqEmg
+ffmpeg2wav:youtube-dl:FzGYJ4dqEmg
 #EXTINF:220,I Knew You Were Trouble
-ffmpeg2wav:youtube-dl-x:WG4zi7c0xQ8
+ffmpeg2wav:youtube-dl:WG4zi7c0xQ8
 #EXTINF:193,We Are Never Ever Getting Back Together
-ffmpeg2wav:youtube-dl-x:HX_ME76vTQA
+ffmpeg2wav:youtube-dl:HX_ME76vTQA
 #EXTINF:212,Look What You Made Me Do
-ffmpeg2wav:youtube-dl-x:FCkFGAiIJIw
+ffmpeg2wav:youtube-dl:FCkFGAiIJIw
 #EXTINF:238,Mean
-ffmpeg2wav:youtube-dl-x:RlWSxkIFUUc
+ffmpeg2wav:youtube-dl:RlWSxkIFUUc
 #EXTINF:232,Delicate
-ffmpeg2wav:youtube-dl-x:-drlH9mAphk
+ffmpeg2wav:youtube-dl:-drlH9mAphk
 #EXTINF:235,Love Story
-ffmpeg2wav:youtube-dl-x:nmlQIVDo3oo
+ffmpeg2wav:youtube-dl:nmlQIVDo3oo
 #EXTINF:232,22
-ffmpeg2wav:youtube-dl-x:SGx7MJ2W_Pk
+ffmpeg2wav:youtube-dl:SGx7MJ2W_Pk
 #EXTINF:219,Shake It Off
-ffmpeg2wav:youtube-dl-x:R8UZQIBjUhI
+ffmpeg2wav:youtube-dl:R8UZQIBjUhI
diff --git a/state/liquidsoap/playlists/artists/ZaraLarsson.m3u b/state/liquidsoap/playlists/artists/ZaraLarsson.m3u
index cb3fe95..d0ad638 100644
--- a/state/liquidsoap/playlists/artists/ZaraLarsson.m3u
+++ b/state/liquidsoap/playlists/artists/ZaraLarsson.m3u
@@ -1,8 +1,8 @@
 #EXTINF:213,Never Forget You
-ffmpeg2wav:youtube-dl-x:ogKU5EQ0Wn0
+ffmpeg2wav:youtube-dl:ogKU5EQ0Wn0
 #EXTINF:212,Symphony (feat. Zara Larsson)
-ffmpeg2wav:youtube-dl-x:T83vkwePnc8
+ffmpeg2wav:youtube-dl:T83vkwePnc8
 #EXTINF:201,Lush Life
-ffmpeg2wav:youtube-dl-x:RG-D4bcg54s
+ffmpeg2wav:youtube-dl:RG-D4bcg54s
 #EXTINF:227,I Would Like
-ffmpeg2wav:youtube-dl-x:xPaYCOkDIfM
+ffmpeg2wav:youtube-dl:xPaYCOkDIfM
diff --git a/state/liquidsoap/playlists/events/Halloween.m3u b/state/liquidsoap/playlists/events/Halloween.m3u
new file mode 100644
index 0000000..3960b3a
--- /dev/null
+++ b/state/liquidsoap/playlists/events/Halloween.m3u
@@ -0,0 +1,12 @@
+#EXTINF:72,I Put A Spell On You - Hocus Pocus (No Dialouge)
+ffmpeg2wav:youtube-dl:VLY0gZSZXB4
+#EXTINF:131,Hocus Pocus Intrada Soundtrack - 21 Sarah's Theme - Sarah Jessica Parker
+ffmpeg2wav:youtube-dl:zXOanpUa6Xg
+#EXTINF:152,This Is Halloween (Trap Remix)
+ffmpeg2wav:youtube-dl:aUjmuVOYWZU
+#EXTINF:197,The Nightmare Before Christmas Soundtrack #03 This is Halloween
+ffmpeg2wav:youtube-dl:VnyigpFSai4
+#EXTINF:203,LOOK WHAT YOU MADE ME BREW - A Disney Villains /Taylor Swift Unexpected Musical
+ffmpeg2wav:youtube-dl:p43vsrE2a90
+#EXTINF:230,Spooky Scary Skeletons (Remix) - Extended Mix
+ffmpeg2wav:youtube-dl:q6-ZGAGcJrk

From 0a919ca6176cbb10311b531f5e1e83f5f26487e1 Mon Sep 17 00:00:00 2001
From: Joakim Pettersvold <joakimpokemeg@hotmail.no>
Date: Mon, 15 Oct 2018 06:26:12 +0000
Subject: [PATCH 2/3] Uncomments Halloween in main.liq for halloween event The
 event is real!!!!

---
 state/liquidsoap/config/main.liq | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/state/liquidsoap/config/main.liq b/state/liquidsoap/config/main.liq
index b34d776..258de37 100644
--- a/state/liquidsoap/config/main.liq
+++ b/state/liquidsoap/config/main.liq
@@ -167,8 +167,8 @@ count = count + list.length(playlist.parse(Soundtracks))
 randomsong = random(weights=[list.length(playlist.parse(JoakimRemixes)), count], [playlist(JoakimRemixes), randomsong]) 
 count = count + list.length(playlist.parse(JoakimRemixes))
 
-### randomsong = random(weights=[list.length(playlist.parse(Halloween)), count], [playlist(Halloween), randomsong]) 
-### count = count + list.length(playlist.parse(Halloween))
+randomsong = random(weights=[list.length(playlist.parse(Halloween)), count], [playlist(Halloween), randomsong]) 
+count = count + list.length(playlist.parse(Halloween))
 
 
 randomsong = audio_to_stereo(randomsong)

From 801fb3b39187ae7f4b5b1aa20b46b3df1f0138fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99@gmail.com>
Date: Mon, 15 Oct 2018 19:00:03 +0200
Subject: [PATCH 3/3] conservative try

---
 state/liquidsoap/config/main.liq | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/state/liquidsoap/config/main.liq b/state/liquidsoap/config/main.liq
index 258de37..483a011 100644
--- a/state/liquidsoap/config/main.liq
+++ b/state/liquidsoap/config/main.liq
@@ -113,62 +113,62 @@ Halloween		= "/playlists/events/Halloween.m3u"
 ## END PLAYLISTS
 
 
-randomsong = playlist(JoakimDiverse)
+randomsong = random(playlist(conservative=true, JoakimDiverse))
 count = list.length(playlist.parse(JoakimDiverse))
 
-randomsong = random(weights=[list.length(playlist.parse(AlternativeJoa)), count], [playlist(AlternativeJoa), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(AlternativeJoa)), count], [playlist(conservative=true, AlternativeJoa), randomsong])
 count = count + list.length(playlist.parse(AlternativeJoa))
 
-randomsong = random(weights=[list.length(playlist.parse(DanAwesome)), count], [playlist(DanAwesome), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(DanAwesome)), count], [playlist(conservative=true, DanAwesome), randomsong])
 count = count + list.length(playlist.parse(DanAwesome))
 
-randomsong = random(weights=[list.length(playlist.parse(DanDontStarve1)), count], [playlist(DanDontStarve1), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(DanDontStarve1)), count], [playlist(conservative=true, DanDontStarve1), randomsong])
 count = count + list.length(playlist.parse(DanDontStarve1))
 
-randomsong = random(weights=[list.length(playlist.parse(DanDubstepThingies)), count], [playlist(DanDubstepThingies), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(DanDubstepThingies)), count], [playlist(conservative=true, DanDubstepThingies), randomsong])
 count = count + list.length(playlist.parse(DanDubstepThingies))
 
-randomsong = random(weights=[list.length(playlist.parse(DanEdgyMusicYT)), count], [playlist(DanEdgyMusicYT), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(DanEdgyMusicYT)), count], [playlist(conservative=true, DanEdgyMusicYT), randomsong])
 count = count + list.length(playlist.parse(DanEdgyMusicYT))
 
-randomsong = random(weights=[list.length(playlist.parse(DanElectronicRealMusic)), count], [playlist(DanElectronicRealMusic), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(DanElectronicRealMusic)), count], [playlist(conservative=true,DanElectronicRealMusic), randomsong])
 count = count + list.length(playlist.parse(DanElectronicRealMusic))
 
-randomsong = random(weights=[list.length(playlist.parse(TaylorSwift)), count], [playlist(TaylorSwift), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(TaylorSwift)), count], [playlist(conservative=true, TaylorSwift), randomsong])
 count = count + list.length(playlist.parse(TaylorSwift))
 
-randomsong = random(weights=[list.length(playlist.parse(AstridS)), count], [playlist(AstridS), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(AstridS)), count], [playlist(conservative=true, AstridS), randomsong])
 count = count + list.length(playlist.parse(AstridS))
 
-randomsong = random(weights=[list.length(playlist.parse(Coldplay)), count], [playlist(Coldplay), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(Coldplay)), count], [playlist(conservative=true, Coldplay), randomsong])
 count = count + list.length(playlist.parse(Coldplay))
 
-randomsong = random(weights=[list.length(playlist.parse(DemiLovato)), count], [playlist(DemiLovato), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(DemiLovato)), count], [playlist(conservative=true, DemiLovato), randomsong])
 count = count + list.length(playlist.parse(DemiLovato))
 
-randomsong = random(weights=[list.length(playlist.parse(KatyPerry)), count], [playlist(KatyPerry), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(KatyPerry)), count], [playlist(conservative=true, KatyPerry), randomsong])
 count = count + list.length(playlist.parse(KatyPerry))
 
-randomsong = random(weights=[list.length(playlist.parse(SelenaGomez)), count], [playlist(SelenaGomez), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(SelenaGomez)), count], [playlist(conservative=true, SelenaGomez), randomsong])
 count = count + list.length(playlist.parse(SelenaGomez))
 
-randomsong = random(weights=[list.length(playlist.parse(ShawnMendes)), count], [playlist(ShawnMendes), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(ShawnMendes)), count], [playlist(conservative=true, ShawnMendes), randomsong])
 count = count + list.length(playlist.parse(ShawnMendes))
 
-randomsong = random(weights=[list.length(playlist.parse(ZaraLarsson)), count], [playlist(ZaraLarsson), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(ZaraLarsson)), count], [playlist(conservative=true, ZaraLarsson), randomsong])
 count = count + list.length(playlist.parse(ZaraLarsson))
 
-randomsong = random(weights=[list.length(playlist.parse(Musicals)), count], [playlist(Musicals), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(Musicals)), count], [playlist(conservative=true, Musicals), randomsong])
 count = count + list.length(playlist.parse(Musicals))
 
-randomsong = random(weights=[list.length(playlist.parse(Soundtracks)), count], [playlist(Soundtracks), randomsong])
+randomsong = random(weights=[list.length(playlist.parse(Soundtracks)), count], [playlist(conservative=true, Soundtracks), randomsong])
 count = count + list.length(playlist.parse(Soundtracks))
 
-randomsong = random(weights=[list.length(playlist.parse(JoakimRemixes)), count], [playlist(JoakimRemixes), randomsong]) 
+randomsong = random(weights=[list.length(playlist.parse(JoakimRemixes)), count], [playlist(conservative=true, JoakimRemixes), randomsong]) 
 count = count + list.length(playlist.parse(JoakimRemixes))
 
-randomsong = random(weights=[list.length(playlist.parse(Halloween)), count], [playlist(Halloween), randomsong]) 
-count = count + list.length(playlist.parse(Halloween))
+#randomsong = random(weights=[list.length(playlist.parse(Halloween)), count], [playlist(conservative=true, Halloween), randomsong]) 
+#count = count + list.length(playlist.parse(Halloween))
 
 
 randomsong = audio_to_stereo(randomsong)
@@ -179,8 +179,8 @@ requests = audio_to_stereo(drop_video(request.queue(id="request")))
 mix = blank()
 mix = fallback(track_sensitive=false, [randomsong, mix])
 mix = fallback(track_sensitive=true, transitions=[crossfade], [requests,mix])
-mix = normalize(mix)
 mix = fallback(track_sensitive=false, transitions=[crossfade], [live, mix])
+mix = normalize(mix)
 
 # OUTPUTS
 output.icecast(