diff --git a/README.md b/README.md
index 23d3afe..328ed32 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This patcher is designed to simplify the installation steps from this [Gist](htt
 
 ## Supported architectures
 ([check your NAS architecture here](https://github.com/SynoCommunity/spksrc/wiki/Architecture-per-Synology-model))
-- ARMv8 ⚠️ (DSM 7.0 ready but the wrapper could have performances issues on some NAS models)
+- ARMv8 ✅ (DSM 7.0 ready)
 - Old ARM ✅ (DSM 7.0 ready)
 - x64 ✅ (DSM 7.0 ready)
 - x86 ✅ (DSM 7.0 ready)
@@ -27,11 +27,12 @@ This patcher is designed to simplify the installation steps from this [Gist](htt
 - You'll have to re-run the patcher everytime you update VideoStation, Advanced Media Extensions and DSM
 
 ## Usage
-Basic command usage:  
+Basic command:  
 `curl https://raw.githubusercontent.com/AlexPresso/VideoStation-FFMPEG-Patcher/main/patcher.sh | bash`   
 With options:  
 `curl https://raw.githubusercontent.com/AlexPresso/VideoStation-FFMPEG-Patcher/main/patcher.sh | bash -s -- <option>`
 
 | Options | Description |
 | ------ | ----------- |
-| -f | Force patcher to install ffmpeg-wrapper (only usefull on ARMv8 architectures if the default procedure doesn't work)
+| -patch | patch VideoStation and CodecPack |
+| -unpatch | restore VideoStation and CodecPack to default files 
diff --git a/ffmpeg/libavcodec.so.56 b/ffmpeg/libavcodec.so.56
deleted file mode 100644
index dd41058..0000000
Binary files a/ffmpeg/libavcodec.so.56 and /dev/null differ
diff --git a/ffmpeg/libavdevice.so.56 b/ffmpeg/libavdevice.so.56
deleted file mode 100644
index 4a68c79..0000000
Binary files a/ffmpeg/libavdevice.so.56 and /dev/null differ
diff --git a/ffmpeg/libavfilter.so.5 b/ffmpeg/libavfilter.so.5
deleted file mode 100644
index 7987b10..0000000
Binary files a/ffmpeg/libavfilter.so.5 and /dev/null differ
diff --git a/ffmpeg/libavformat.so.56 b/ffmpeg/libavformat.so.56
deleted file mode 100644
index 8e8b137..0000000
Binary files a/ffmpeg/libavformat.so.56 and /dev/null differ
diff --git a/ffmpeg/libavutil.so.54 b/ffmpeg/libavutil.so.54
deleted file mode 100644
index 7f27b28..0000000
Binary files a/ffmpeg/libavutil.so.54 and /dev/null differ
diff --git a/ffmpeg/libpostproc.so.53 b/ffmpeg/libpostproc.so.53
deleted file mode 100644
index cd4726c..0000000
Binary files a/ffmpeg/libpostproc.so.53 and /dev/null differ
diff --git a/ffmpeg/libswresample.so.1 b/ffmpeg/libswresample.so.1
deleted file mode 100644
index e949705..0000000
Binary files a/ffmpeg/libswresample.so.1 and /dev/null differ
diff --git a/ffmpeg/libswscale.so.3 b/ffmpeg/libswscale.so.3
deleted file mode 100644
index d61a3e4..0000000
Binary files a/ffmpeg/libswscale.so.3 and /dev/null differ
diff --git a/motd.txt b/motd.txt
index 32f047f..5152c43 100644
--- a/motd.txt
+++ b/motd.txt
@@ -1,5 +1,5 @@
-Please let me now of any issue you could get, the more architectures the script is tested on, the more stable it will be.
+The patcher was redesigned to include an unpatch procedure.
 
-Some NAS running on ARMv8 architectures can have troubles with the dedicated patch procedures, if the first attempt fails:
-- uninstall + reinstall both VideoStation (keep library) and Advanced Media Extension
-- re-run the script using the -f option (curl https://raw.githubusercontent.com/AlexPresso/VideoStation-FFMPEG-Patcher/main/patcher.sh | bash -s -- -f)
+I'm aware of an issue with HEVC and I'm working on it.
+
+As always, please let me know of any issue you could have.
diff --git a/patcher.sh b/patcher.sh
index 2a4444f..92e329c 100755
--- a/patcher.sh
+++ b/patcher.sh
@@ -1,136 +1,133 @@
 #!/bin/bash
 
 ###############################
-#	LIFECYCLE
+#	VARS
 ###############################
-function welcome_motd() {
-	echo "[INFO] ffmpeg-patcher v1.2"
 
-	motd=$(curl -s -L "https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher/blob/main/motd.txt?raw=true")
+repo_base_url=https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher
+vs_bin_path=/var/packages/VideoStation/target/bin
+cp_bin_path=/var/packages/CodecPack/target/bin
+ffmpeg_bin_path=/var/packages/ffmpeg/target/bin
+libsynovte_path=/var/packages/VideoStation/target/lib/libsynovte.so
+
+###############################
+#	UTILS
+###############################
+
+function log() {
+	echo "[$(date '+%Y-%m-%d %H:%M:%S')] [$1] $2"
+}
+function info() {
+	log "INFO" "$1"
+}
+function error() {
+    log "ERROR" "$1"
+}
+
+function welcome_motd() {
+	info "ffmpeg-patcher v1.5"
+
+	motd=$(curl -s -L "$repo_base_url/blob/main/motd.txt?raw=true")
 	if [ "${#motd}" -ge 1 ]; then
-		echo "[INFO] Message of the day:"
+		log "Message of the day"
 		echo ""
 		echo "$motd"
 		echo ""
 	fi
 }
 
-function save_and_patch() {
-	cp -n /var/packages/VideoStation/target/lib/libsynovte.so /var/packages/VideoStation/target/lib/libsynovte.so.orig
-	chown VideoStation:VideoStation /var/packages/VideoStation/target/lib/libsynovte.so.orig
-
-	sed -i -e 's/eac3/3cae/' -e 's/dts/std/' -e 's/truehd/dheurt/' /var/packages/VideoStation/target/lib/libsynovte.so
-}
-
-function restart_videostation() {
-	if [[ -d /var/packages/CodecPack/target/bin ]]; then
-  		echo "[INFO] Restarting CodecPack..."
+function restart_packages() {
+	if [[ -d $cp_bin_path ]]; then
+		log "INFO" "Restarting CodecPack..."
 		synopkg restart CodecPack
 	fi
 
-	echo "[INFO] Restarting VideoStation..."
+	info "Restarting VideoStation..."
 	synopkg restart VideoStation
 }
 
-function end_patch() {
-	echo ""
-	echo "[SUCCESS] Done patching, you can now enjoy your movies ;) (please add a star to the repo if it worked for you)"
+function check_dependencies() {
+    if [[ ! -d $ffmpeg_bin_path ]]; then
+        error "Missing SynoCommunity ffmpeg package, please install it and re-run the patcher."
+        exit 1
+    fi
 }
 
-
 ################################
 #	PATCH PROCEDURES
 ################################
-function armv8_procedure() {
-	echo "[INFO] Running ARMv8 procedure"
-	echo "[INFO] Saving current ffmpeg as ffmpeg.orig"
-	mv -n /var/packages/VideoStation/target/lib/ffmpeg /var/packages/VideoStation/target/lib/ffmpeg.orig
 
-	echo "[INFO] Downloading patched ffmpeg files to /var/packages/VideoStation/target/lib"
-	echo ""
+function patch() {
+	info "====== Patching procedure ======"
 
-	declare -a ffmpegfiles=(
-		"libavcodec.so.56"
-		"libavdevice.so.56"
-		"libavfilter.so.5"
-		"libavformat.so.56"
-		"libavutil.so.54"
-		"libpostproc.so.53"
-		"libswresample.so.1"
-		"libswscale.so.3"
-	);
+	info "Saving current ffmpeg as ffmpeg.orig"
+	mv -n "$vs_bin_path/ffmpeg" "$vs_bin_path/ffmpeg.orig"
 
-	if [[ ! -d /var/packages/VideoStation/target/lib/ffmpeg ]]; then
-		echo "[INFO] Creating ffmpeg directory"
-		mkdir /var/packages/VideoStation/target/lib/ffmpeg
-	fi
+    info "Downloading ffmpeg's wrapper..."
+    wget -q -O - "$repo_base_url/blob/main/ffmpeg-wrapper.sh?raw=true" > "$vs_bin_path/ffmpeg"
+    chown root:VideoStation "$vs_bin_path/ffmpeg"
+    chmod 750 "$vs_bin_path/ffmpeg"
+    chmod u+s "$vs_bin_path/ffmpeg"
 
-	for file in "${ffmpegfiles[@]}"
-	do
-		echo "[INFO] Downloading $file ..."
-		wget -q -O "/var/packages/VideoStation/target/lib/ffmpeg/$file" "https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher/blob/main/ffmpeg/$file?raw=true"
-	done
-
-	if [[ -d /var/packages/CodecPack/target/lib/ffmpeg27 ]]; then
-		echo "[INFO] Creating symbolic link from CodecPack ffmpeg directory"
-		mv /var/packages/CodecPack/target/lib/ffmpeg27 /var/packages/CodecPack/target/lib/ffmpeg27.orig
-		ln -s /var/packages/VideoStation/target/lib/ffmpeg /var/packages/CodecPack/target/lib/ffmpeg27
-	fi
-
-  	save_and_patch
-  	restart_videostation
-	end_patch
-}
-
-function wrapper_procedure() {
-	echo "[INFO] Running wrapping procedure"
-	echo "[INFO] Saving current ffmpeg as ffmpeg.orig"
-	mv -n /var/packages/VideoStation/target/bin/ffmpeg /var/packages/VideoStation/target/bin/ffmpeg.orig
-
-	echo "[INFO] Downloading ffmpeg-wrapper for VideoStation"
-	wget -q -O - https://github.com/AlexPresso/VideoStation-FFMPEG-Patcher/blob/main/ffmpeg-wrapper.sh?raw=true > /var/packages/VideoStation/target/bin/ffmpeg
-
-  	chown root:VideoStation /var/packages/VideoStation/target/bin/ffmpeg
-  	chmod 750 /var/packages/VideoStation/target/bin/ffmpeg
-  	chmod u+s /var/packages/VideoStation/target/bin/ffmpeg
-
-  	if [[ -d /var/packages/CodecPack/target/bin ]]; then
-		find /var/packages/CodecPack/target/bin/ -type f -name "ffmpeg*" | grep -v ".orig" | while read filename
+	if [[ -d $cp_bin_path ]]; then
+		find $cp_bin_path -type f -name "ffmpeg*" | grep -v ".orig" | while read filename
 		do
-  			echo "[INFO] Patching CodecPack's $filename..."
-			if [[ ! -f "$filename.orig" ]]; then
-				mv "$filename" "$filename.orig"
-			fi
-			if [[ ! -f "$filename" ]]; then
-				ln -s /var/packages/VideoStation/target/bin/ffmpeg "$filename"
-			fi
+			info "Patching CodecPack's $filename"
+
+			mv -n $filename "$filename.orig"
+			ln -s -f "$vs_bin_path/ffmpeg" $filename
 		done
 	fi
 
-  	save_and_patch
-  	restart_videostation
-  	end_patch
+	info "Saving current libsynovte.so as libsynovte.so.orig"
+	cp -n "$libsynovte_path" "$libsynovte_path.orig"
+    chown VideoStation:VideoStation "$libsynovte_path.orig"
+
+	info "Enabling eac3, dts and truehd"
+	sed -i -e 's/eac3/3cae/' -e 's/dts/std/' -e 's/truehd/dheurt/' "$libsynovte_path"
+
+	restart_packages
+
+	echo ""
+	info "Done patching, you can now enjoy your movies ;) (please add a star to the repo if it worked for you)"
 }
 
+function unpatch() {
+	info "====== Unpatch procedure ======"
+
+	info "Restoring libsynovte.so"
+	mv -f "$libsynovte_path.orig" "$libsynovte_path"
+
+	info "Restoring VideoStation's ffmpeg"
+	mv -f "$vs_bin_path/ffmpeg.orig" "$vs_bin_path/ffmpeg"
+
+	if [[ -d $cp_bin_path ]]; then
+		find $cp_bin_path -type f -name "ffmpeg*.orig" | while read filename
+		do
+            info "Restoring CodecPack's $filename"
+            mv -T -f "$filename" "${filename::-5}"
+		done
+	fi
+
+	restart_packages
+
+	echo ""
+    info "unpatch complete"
+}
 
 ################################
 #	ENTRYPOINT
 ################################
 welcome_motd
+arg1=${1:--patch}
 
-forcewrapper=false
+check_dependencies
 
-while getopts "f" option
-do
-	case $option in
-		f)
-			forcewrapper=true
-			;;
-	esac
-done
-
-if [[ $(cat /proc/cpuinfo | grep 'model name' | uniq) =~ "ARMv8" && $forcewrapper == false ]]; then
-  	armv8_procedure
-else
-  	wrapper_procedure
-fi
+case "$arg1" in
+    -unpatch)
+        unpatch
+    ;;
+    -patch)
+        patch
+    ;;
+esac