diff --git a/pypo/install/pypo-install.py b/pypo/install/pypo-install.py
index 9c42ab011..07cb43cd9 100644
--- a/pypo/install/pypo-install.py
+++ b/pypo/install/pypo-install.py
@@ -79,14 +79,8 @@ try:
   create_path(BASE_PATH+"cache")
   create_path(BASE_PATH+"files")
   create_path(BASE_PATH+"tmp")
-  create_path(BASE_PATH+"files/basic")
-  create_path(BASE_PATH+"files/fallback")
-  create_path(BASE_PATH+"files/jingles")
   create_path(BASE_PATH+"archive")
-  
-  print "Copying pypo files"
-  shutil.copy("%s/../scripts/silence.mp3"%current_script_dir, BASE_PATH+"files/basic")
-  
+    
   if platform.architecture()[0] == '64bit':
       print "Installing 64-bit liquidsoap binary"
       shutil.copy("%s/../liquidsoap/liquidsoap64"%current_script_dir, "%s/../liquidsoap/liquidsoap"%current_script_dir)
diff --git a/pypo/scripts/ls_script.liq b/pypo/scripts/ls_script.liq
index a35495839..20e49c35c 100644
--- a/pypo/scripts/ls_script.liq
+++ b/pypo/scripts/ls_script.liq
@@ -24,7 +24,7 @@ server.register(namespace="vars", "show_name", fun (s) -> begin show_name := s s
 server.register(namespace="vars", "station_name", fun (s) -> begin station_name := s s end)
 
 
-default = single(conservative=true, "/opt/pypo/files/basic/silence.mp3")
+default = single(audio_to_stereo("/opt/pypo/bin/files/sleeper_03.mp3"))
 default = rewrite_metadata([("artist","Airtime"), ("title", "offline")],default)
 
 s = fallback(track_sensitive=false, [queue, default])
@@ -69,6 +69,10 @@ if output_icecast_mp3 then
 end
 
 if output_icecast_vorbis then
+    #remove metadata from ogg source and merge tracks to fix bug
+    #with vlc and mplayer disconnecting at the end of every track
+    #silence = add(normalize=false,[blank(), audio_to_stereo(single("/opt/pypo/bin/files/sleeper_03.mp3"))])
+    ogg_s = add(normalize=false,[blank(),s])
 	out_vorbis = output.icecast(%vorbis,
 			host = icecast_host, port = icecast_port,
 			password = icecast_pass, mount = mount_point_vorbis,
@@ -78,5 +82,5 @@ if output_icecast_vorbis then
 			url = icecast_url,
 			description = icecast_description,
 			genre = icecast_genre,
-			s)
+			ogg_s)
 end
diff --git a/pypo/scripts/silence.mp3 b/pypo/scripts/silence.mp3
deleted file mode 100644
index 374dfe286..000000000
Binary files a/pypo/scripts/silence.mp3 and /dev/null differ