diff --git a/mozpluggerrc b/mozpluggerrc
index ac853db..5ef9384 100644
--- a/mozpluggerrc
+++ b/mozpluggerrc
@@ -31,11 +31,14 @@ changequote([,])
 
 ### MPlayer
 
-define(MP_CMD,[mplayer -quiet -nojoystick -nofs -zoom -osdlevel 0 $1 </dev/null])
+#define(MP_CMD,[mplayer -quiet -nojoystick -nofs -zoom -osdlevel 0 $1 </dev/null])
+define(MP_CMD,[mpv -really-quiet $1 </dev/null])
 
-define(MP_EMBED,[embed noisy ignore_errors: MP_CMD(-xy $width -wid $window $1)])
+#define(MP_EMBED,[embed noisy ignore_errors: MP_CMD(-xy $width -wid $window $1)])
+define(MP_EMBED,[embed noisy ignore_errors: MP_CMD(--autofit=$width -wid $window $1)])
 
-define(MP_NOEMBED,[noembed noisy ignore_errors maxaspect swallow(MPlayer): MP_CMD($1)])
+#define(MP_NOEMBED,[noembed noisy ignore_errors maxaspect swallow(MPlayer): MP_CMD($1)])
+define(MP_NOEMBED,[noembed noisy ignore_errors maxaspect swallow(mpv): MP_CMD($1)])
 
 # If you want a small controls in top left corner of embedded window when using
 # mplayer then uncomment the first and comment the second below 
@@ -51,9 +54,11 @@ define(MP_VIDEO_PLAYLIST, [fmatch($1) MP_EMBED(-playlist "$file")
 # Special case for Quicktime
 define(MP_LINKS,[stream links noisy ignore_errors: MP_CMD($1)])
 
-define(MP_AUDIO,[mplayer -quiet -nojoystick $1 </dev/null])
+#define(MP_AUDIO,[mplayer -quiet -nojoystick $1 </dev/null])
+define(MP_AUDIO,[mpv -really-quiet $1 </dev/null])
 
-define(MP_AUDIO_STREAM,[controls stream noisy ignore_errors: mplayer -quiet -nojoystick $1 "$file" </dev/null])
+#define(MP_AUDIO_STREAM,[controls stream noisy ignore_errors: mplayer -quiet -nojoystick $1 "$file" </dev/null])
+define(MP_AUDIO_STREAM,[controls stream noisy ignore_errors: mpv -really-quiet $1 "$file" </dev/null])
 
 ### Totem