diff --git a/.SRCINFO b/.SRCINFO
index d27d4eb500f2..70773ffeaa45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = hugin-messenger-bin
 	pkgdesc = The new version of the private messaging desktop application powered by the Kryptokrona Blockchain.(Prebuilt version.Use system-wide electron)
-	pkgver = 1.0.5
+	pkgver = 1.0.6
 	pkgrel = 1
 	url = https://hugin.chat/
 	arch = x86_64
 	license = GPL-3.0-only
 	depends = electron30
-	provides = hugin-messenger=1.0.5
+	provides = hugin-messenger=1.0.6
 	conflicts = hugin-messenger
-	source = hugin-messenger-1.0.5.deb::https://github.com/kryptokrona/hugin-desktop/releases/download/1.0.5/hugin-messenger_1.0.5_amd64.deb
+	source = hugin-messenger-1.0.6.deb::https://github.com/kryptokrona/hugin-desktop/releases/download/1.0.6/hugin-messenger_1.0.6_amd64.deb
 	source = hugin-messenger.sh
-	sha256sums = 2585eeb1c860d9fd2bd03f2c4aac26a0cb8ee02cbb3e8aeeca0d76a2ec07f46a
-	sha256sums = 291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980
+	sha256sums = 6170403fef43fe0de1fe9fc3ce6a365c146040d3489ab1040ee886d4b90823bc
+	sha256sums = f2fe8c189974ffb9d445e9a42bd4f1d5b60185607c3fcafae79ab44be224e013
 
 pkgname = hugin-messenger-bin
diff --git a/PKGBUILD b/PKGBUILD
index 0dda3e56376a..8c78d4e7efac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=hugin-messenger-bin
 _pkgname='Hugin Messenger'
-pkgver=1.0.5
+pkgver=1.0.6
 _electronversion=30
 pkgrel=1
 pkgdesc="The new version of the private messaging desktop application powered by the Kryptokrona Blockchain.(Prebuilt version.Use system-wide electron)"
@@ -18,8 +18,12 @@ source=(
     "${pkgname%-bin}-${pkgver}.deb::${_ghurl}/releases/download/${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('2585eeb1c860d9fd2bd03f2c4aac26a0cb8ee02cbb3e8aeeca0d76a2ec07f46a'
-            '291f50480f5a61bc9c68db7d44cd0412071128706baa868a9cb854f8779a1980')
+sha256sums=('6170403fef43fe0de1fe9fc3ce6a365c146040d3489ab1040ee886d4b90823bc'
+            'f2fe8c189974ffb9d445e9a42bd4f1d5b60185607c3fcafae79ab44be224e013')
+_get_electron_version() {
+    _electronversion="$(strings "${srcdir}/opt/${_pkgname}/${pkgname%-bin}" | grep '^Chrome/[0-9.]* Electron/[0-9]' | cut -d'/' -f3 | cut -d'.' -f1)"
+    echo -e "The electron version is: \033[1;31m${_electronversion}\033[0m"
+}
 prepare() {
     sed -i -e "
         s/@electronversion@/${_electronversion}/g
@@ -29,6 +33,7 @@ prepare() {
         s/@options@/env ELECTRON_OZONE_PLATFORM_HINT=auto/g
     " "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data."*
+    _get_electron_version
     sed -i -e "
         s/\"\/opt\/${_pkgname}\/${pkgname%-bin}\"/${pkgname%-bin}/g
         s/Utility/Network/g
diff --git a/hugin-messenger.sh b/hugin-messenger.sh
index 40e422ca2ee7..ec374bdf116d 100644
--- a/hugin-messenger.sh
+++ b/hugin-messenger.sh
@@ -1,29 +1,39 @@
 #!/bin/bash
-set -o pipefail
+set -e
 _APPDIR="/usr/lib/@appname@"
 _RUNNAME="${_APPDIR}/@runname@"
-_CFGDIR="@cfgdirname@/"
 _OPTIONS="@options@"
 export PATH="${_APPDIR}:${PATH}"
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
 export ELECTRON_IS_DEV=0
 export ELECTRON_FORCE_IS_PACKAGED=true
 export ELECTRON_DISABLE_SECURITY_WARNINGS=true
-export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@"
 export NODE_ENV=production
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
-export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf"
-declare -a _USER_FLAGS
+_FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf"
+declare -a flags
 if [[ -f "${_FLAGS_FILE}" ]]; then
-    while read -r line; do
-        if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
-            _USER_FLAGS+=("${line}")
-        fi
-    done < "${_FLAGS_FILE}"
+    mapfile -t < "${_FLAGS_FILE}"
 fi
-cd "${_APPDIR}" || { echo "Failed to change directory to ${_APPDIR}"; exit 1; }
+for line in "${MAPFILE[@]}"; do
+    if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then
+        flags+=("${line}")
+    fi
+done
+_WAYLAND_OPTION=false
+for arg in "$@"; do
+    if [[ "${arg}" == "--wayland" ]]; then
+        _WAYLAND_OPTION=true
+        break
+    fi
+done
+if [[ "${_WAYLAND_OPTION}" == true ]]; then
+    echo "Forcing Wayland"
+    flags+=("--enable-features=UseOzonePlatform,WaylandWindowDecorations,VaapiVideoDecodeLinuxGL" "--ozone-platform=wayland")
+fi
+cd "${_APPDIR}"
 if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
-    exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${flags[@]}" "${_USER_FLAGS}" "$@" || exit $?
 else
-    exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@"
+    exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${flags[@]}" "${_USER_FLAGS}" "$@" || exit $?
 fi
\ No newline at end of file