diff --git a/theme/jplayer.js b/theme/jplayer.js
index cf93b37..c086df1 100644
--- a/theme/jplayer.js
+++ b/theme/jplayer.js
@@ -37,7 +37,7 @@
           // Initialise single player
           $(player).jPlayer({
             ready: function() {
-              $(this).jPlayer("setMedia", playerSettings.files);
+              Drupal.jPlayer.setFiles(wrapper, player, 0, playerSettings.autoplay);
               
               // Make sure we pause other players on play
               $(player).bind($.jPlayer.event.play, function() {
diff --git a/theme/jplayer.tpl.php b/theme/jplayer.tpl.php
index 420e4d1..80f543e 100644
--- a/theme/jplayer.tpl.php
+++ b/theme/jplayer.tpl.php
@@ -6,7 +6,7 @@
 ?>
 
 <div class="jp-<?php print $type; if($type == 'video') print ' jp-video-360p'; ?>">
-  <div class="jp-type-playlist">
+  <div class="jp-type-<?php print $mode; ?>">
     <div id="<?php print $player_id; ?>" class="jp-jplayer"></div>
     <div id="<?php print $player_id; ?>_interface" class="jp-interface">
       <?php if ($type == 'video'): ?>