diff --git a/.gitignore b/.gitignore
index 339fd72..39fdfbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ immersive-data
 .ytdl_preload/
 .ytdl-preload/
 scripts/anilistUpdater/anilistToken.txt
+.watch-later
+state
diff --git a/mac.conf b/mac.conf
index 94b9cf9..e8f8f06 100644
--- a/mac.conf
+++ b/mac.conf
@@ -193,7 +193,7 @@ profile=gpu-hq
 # GPU OPTIONS
 vo=gpu-next
 # hwdec=nvdec-copy
-hwdec=auto-safe
+hwdec=videotoolbox
 scale=bicubic
 dscale=bicubic
 cscale=bicubic
@@ -207,6 +207,15 @@ input-ipc-server=/tmp/mpvsocket
 ontop=yes
 
 ao=coreaudio
+save-position-on-quit
+watch-later-dir="~~.watch-later"
+resume-playback=yes
+save-watch-history
+watch-history-path="~~state/watch_history.jsonl"
+vd-lavc-threads=0
+gpu-api=vulkan
+gpu-context=macvk
+opengl-pbo=yes
 
 [svp]
 input-ipc-server=/tmp/mpvsocket     # Receives input from SVP
diff --git a/mpv.conf b/mpv.conf
index 5578f0e..7ca0bae 100644
--- a/mpv.conf
+++ b/mpv.conf
@@ -36,12 +36,9 @@ profile=high-quality
 blend-subtitles=video
 # GPU OPTIONS
 vo=gpu-next
-hwdec=nvdec-copy
+hwdec=nvdec
 gpu-api=vulkan
-# scale=bicubic
-# scale=ewa_lanczos
-# scale-blur=0.981251
-# dscale=bicubic
+scale=ewa_lanczossharp
 dscale=catmull_rom
 cscale=bicubic
 tscale=oversample
@@ -66,6 +63,14 @@ cscale-antiring=0.5
 # gpu-context=wayland
 # profile=opengl-hq
 
+gpu-context=waylandvk
+gpu-api=vulkan
+vulkan-swap-mode=mailbox
+swapchain-depth=2
+vulkan-async-compute=no
+vd-lavc-threads=0
+opengl-pbo=yes
+vd-lavc-film-grain=gpu
 
 input-ipc-server=/tmp/mpvsocket
 # ao=pule,pipewire
@@ -92,6 +97,12 @@ screenshot-sw=no
 screenshot-directory="/truenas/sudacode/pictures/mpv"
 screenshot-template="%f-%wH.%wM.%wS.%wT-#%#00n"
 
+save-position-on-quit
+watch-later-dir="~~.watch-later"
+resume-playback=yes
+save-watch-history
+watch-history-path="~~state/watch_history.jsonl"
+
 [hdr]
 target-colorspace-hint=yes
 gpu-api=vulkan