diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml
index c5fd6ed5..5372711c 100644
--- a/.github/workflows/cmake-windows.yml
+++ b/.github/workflows/cmake-windows.yml
@@ -37,10 +37,10 @@ jobs:
 
       - name: Install WiX
         run: |
-          dotnet tool install --global wix --version 4.0.5
-          wix extension -g add WixToolset.UI.wixext/4.0.5
-          wix extension -g add WixToolset.Util.wixext/4.0.5
-          wix extension -g add WixToolset.Bal.wixext/4.0.5
+          dotnet tool install --global wix --version 5.0.0
+          wix extension -g add WixToolset.UI.wixext/5.0.0
+          wix extension -g add WixToolset.Util.wixext/5.0.0
+          wix extension -g add WixToolset.Bal.wixext/5.0.0
         
       - name: Configure
         run: |
diff --git a/README.md b/README.md
index 8592fbb7..8c795ab2 100644
--- a/README.md
+++ b/README.md
@@ -269,10 +269,10 @@ https://github.com/mrts/docker-qt-cmake-gtest-valgrind-ubuntu/blob/master/Docker
 - Download Visual Studio 2019 community installer from https://visualstudio.microsoft.com/ and install _Desktop C++ Development_
 - Install WIX toolset
 
-      dotnet tool install --global wix --version 4.0.5
-      wix extension -g add WixToolset.UI.wixext/4.0.5
-      wix extension -g add WixToolset.Util.wixext/4.0.5
-      wix extension -g add WixToolset.Bal.wixext/4.0.5
+      dotnet tool install --global wix --version 5.0.0
+      wix extension -g add WixToolset.UI.wixext/5.0.0
+      wix extension -g add WixToolset.Util.wixext/5.0.0
+      wix extension -g add WixToolset.Bal.wixext/5.0.0
 
 - Download and install Git for Windows from https://git-scm.com/download/win
 - Download and install CMake from https://cmake.org/download/
@@ -288,7 +288,7 @@ https://github.com/mrts/docker-qt-cmake-gtest-valgrind-ubuntu/blob/master/Docker
       .\vcpkg install --recurse --triplet x64-windows --clean-after-build gtest openssl
 
 - Install _Qt_ with the official [_Qt Online Installer_](https://www.qt.io/download-qt-installer),
-  choose _Custom installation > Qt 6.2.4 > MSVC 2019 64-bit_.
+  choose _Custom installation > Qt 6.6.3 > MSVC 2019 64-bit_.
 
 ### macOS
 
diff --git a/install/HyperlinkSidebarTheme.cs.wxl b/install/HyperlinkSidebarTheme.cs.wxl
index 5811a5f4..7e1560ab 100644
--- a/install/HyperlinkSidebarTheme.cs.wxl
+++ b/install/HyperlinkSidebarTheme.cs.wxl
@@ -26,7 +26,7 @@
   <String Id="ProgressCancelButton" Value="&amp;Zrušit" />
   <String Id="ModifyHeader" Value="Upravit instalaci" />
   <String Id="ModifyRepairButton" Value="Op&amp;ravit" />
-  <String Id="ModifyUninstallButton" Value="&amp;Odinstalovat vše" />
+  <String Id="ModifyUninstallButton" Value="&amp;Odinstalovat" />
   <String Id="ModifyCancelButton" Value="&amp;Zavřít" />
   <String Id="SuccessRepairHeader" Value="Oprava byla úspěšně dokončena." />
   <String Id="SuccessUninstallHeader" Value="Odinstalace byla dokončena" />
@@ -46,12 +46,14 @@
   <String Id="FailureRestartText" Value="Abyste dokončili rollback softwaru, musíte restartovat počítač." />
   <String Id="FailureRestartButton" Value="&amp;Restartovat" />
   <String Id="FailureCloseButton" Value="&amp;Zavřít" />
-  <String Id="FilesInUseHeader" Value="Používané soubory" />
+  <String Id="FilesInUseTitle" Value="Používané soubory" />
   <String Id="FilesInUseLabel" Value="Následující aplikace používají soubory, které je třeba aktualizovat:" />
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Close the &amp;applications." />
   <String Id="FilesInUseCloseRadioButton" Value="Zavřete &amp;aplikace a pokuste se je restartovat." />
   <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Nezavírejte aplikace. Bude vyžadován restart." />
-  <String Id="FilesInUseOkButton" Value="&amp;OK" />
-  <String Id="FilesInUseCancelButton" Value="&amp;Zrušit" />
+  <String Id="FilesInUseRetryButton" Value="&amp;Retry" />
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignore" />
+  <String Id="FilesInUseExitButton" Value="E&amp;xit" />
   <String Id="ChangeLogLink"></String>
   <String Id="OptionsCustomizeInstall" Value="Přizpůsobit instalaci" />
   <String Id="chromeplugin" Value="Podpora podepisování Chrome" />
diff --git a/install/HyperlinkSidebarTheme.en.wxl b/install/HyperlinkSidebarTheme.en.wxl
index e476a925..0b5ade2c 100644
--- a/install/HyperlinkSidebarTheme.en.wxl
+++ b/install/HyperlinkSidebarTheme.en.wxl
@@ -26,7 +26,7 @@
   <String Id="ProgressCancelButton" Value="&amp;Cancel" />
   <String Id="ModifyHeader" Value="Modify setup" />
   <String Id="ModifyRepairButton" Value="&amp;Repair" />
-  <String Id="ModifyUninstallButton" Value="&amp;Uninstall all" />
+  <String Id="ModifyUninstallButton" Value="&amp;Uninstall" />
   <String Id="ModifyCancelButton" Value="&amp;Close" />
   <String Id="SuccessRepairHeader" Value="Repair completed successfully." />
   <String Id="SuccessUninstallHeader" Value="Uninstall completed" />
@@ -46,12 +46,14 @@
   <String Id="FailureRestartText" Value="You must restart your computer to complete the rollback of the software." />
   <String Id="FailureRestartButton" Value="&amp;Restart" />
   <String Id="FailureCloseButton" Value="&amp;Close" />
-  <String Id="FilesInUseHeader" Value="Files in use" />
+  <String Id="FilesInUseTitle" Value="Files In Use" />
   <String Id="FilesInUseLabel" Value="The following applications are using files that need to be updated:" />
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Close the &amp;applications." />
   <String Id="FilesInUseCloseRadioButton" Value="Close the &amp;applications and attempt to restart them." />
-  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Do not close the applications. A reboot will be required." />
-  <String Id="FilesInUseOkButton" Value="&amp;OK" />
-  <String Id="FilesInUseCancelButton" Value="&amp;Cancel" />
+  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Do not close applications. A reboot will be required." />
+  <String Id="FilesInUseRetryButton" Value="&amp;Retry" />
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignore" />
+  <String Id="FilesInUseExitButton" Value="E&amp;xit" />
   <String Id="ChangeLogLink"></String>
   <String Id="OptionsCustomizeInstall" Value="Customize install" />
   <String Id="chromeplugin" Value="Chrome signing support" />
diff --git a/install/HyperlinkSidebarTheme.et.wxl b/install/HyperlinkSidebarTheme.et.wxl
index 4436693a..873442ad 100644
--- a/install/HyperlinkSidebarTheme.et.wxl
+++ b/install/HyperlinkSidebarTheme.et.wxl
@@ -26,7 +26,7 @@
   <String Id="ProgressCancelButton" Value="&amp;Katkesta" />
   <String Id="ModifyHeader" Value="Muuda paigaldust" />
   <String Id="ModifyRepairButton" Value="&amp;Paranda" />
-  <String Id="ModifyUninstallButton" Value="&amp;Eemalda kõik" />
+  <String Id="ModifyUninstallButton" Value="&amp;Eemalda" />
   <String Id="ModifyCancelButton" Value="&amp;Sulge" />
   <String Id="SuccessRepairHeader" Value="Tarkvara parandus õnnestus" />
   <String Id="SuccessUninstallHeader" Value="Tarkvara eemaldatud" />
@@ -46,12 +46,14 @@
   <String Id="FailureRestartText" Value="Muudatuste tagasivõtmiseks tuleb arvuti taaskäivitada." />
   <String Id="FailureRestartButton" Value="&amp;Taaskäivita" />
   <String Id="FailureCloseButton" Value="&amp;Sulge" />
-  <String Id="FilesInUseHeader" Value="Failid on kasutuses" />
-  <String Id="FilesInUseLabel" Value="Allnimetatud rakendused kasutavad faile, mida tuleb uuendada." />
+  <String Id="FilesInUseTitle" Value="Failid on kasutuses" />
+  <String Id="FilesInUseLabel" Value="Allnimetatud rakendused kasutavad faile, mida tuleb uuendada:" />
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Close the &amp;applications." />
   <String Id="FilesInUseCloseRadioButton" Value="Sulge &amp;rakendused ja proovi need taaskäivitada." />
   <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Ära sulge rakendusi. Arvuti tuleb taaskäivitada." />
-  <String Id="FilesInUseOkButton" Value="&amp;OK" />
-  <String Id="FilesInUseCancelButton" Value="&amp;Katkesta" />
+  <String Id="FilesInUseRetryButton" Value="&amp;Korda" />
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignoreeri" />
+  <String Id="FilesInUseExitButton" Value="&amp;Sulge" />
   <String Id="ChangeLogLink"></String>
   <String Id="OptionsCustomizeInstall" Value="Kohanda paigaldust" />
   <String Id="chromeplugin" Value="Chrome allkirjastamise tugi" />
diff --git a/install/HyperlinkSidebarTheme.sk.wxl b/install/HyperlinkSidebarTheme.sk.wxl
index c982ec81..fd337639 100644
--- a/install/HyperlinkSidebarTheme.sk.wxl
+++ b/install/HyperlinkSidebarTheme.sk.wxl
@@ -26,7 +26,7 @@
   <String Id="ProgressCancelButton" Value="&amp;Zrušiť" />
   <String Id="ModifyHeader" Value="Upraviť inštaláciu" />
   <String Id="ModifyRepairButton" Value="Op&amp;raviť" />
-  <String Id="ModifyUninstallButton" Value="&amp;Odinštalovať všetko" />
+  <String Id="ModifyUninstallButton" Value="&amp;Odinštalovať" />
   <String Id="ModifyCancelButton" Value="&amp;Zavrieť" />
   <String Id="SuccessRepairHeader" Value="Oprava bola úspešne dokončená." />
   <String Id="SuccessUninstallHeader" Value="Odinštalovanie bolo dokončené" />
@@ -46,12 +46,14 @@
   <String Id="FailureRestartText" Value="Aby ste dokončili rollback softvéru, musíte reštartovať počítač." />
   <String Id="FailureRestartButton" Value="&amp;Reštartovať" />
   <String Id="FailureCloseButton" Value="&amp;Zavrieť" />
-  <String Id="FilesInUseHeader" Value="Používané súbory" />
+  <String Id="FilesInUseTitle" Value="Používané súbory" />
   <String Id="FilesInUseLabel" Value="Nasledujúce aplikácie používajú súbory, ktoré je potrebné aktualizovať:" />
+  <String Id="FilesInUseNetfxCloseRadioButton" Value="Close the &amp;applications." />
   <String Id="FilesInUseCloseRadioButton" Value="Zatvorte &amp;aplikácie a pokúste sa ich reštartovať." />
   <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Nezatvárajte aplikácie. Bude vyžadovaný reštart." />
-  <String Id="FilesInUseOkButton" Value="&amp;OK" />
-  <String Id="FilesInUseCancelButton" Value="&amp;Zrušiť" />
+  <String Id="FilesInUseRetryButton" Value="&amp;Retry" />
+  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignore" />
+  <String Id="FilesInUseExitButton" Value="E&amp;xit" />
   <String Id="ChangeLogLink"></String>
   <String Id="OptionsCustomizeInstall" Value="Prispôsobiť inštaláciu" />
   <String Id="chromeplugin" Value="Podpora podpisovania Chrome" />
diff --git a/install/WixUI_Minimal.wxs b/install/WixUI_Minimal.wxs
index b987542d..43475915 100644
--- a/install/WixUI_Minimal.wxs
+++ b/install/WixUI_Minimal.wxs
@@ -56,7 +56,7 @@ Patch dialog sequence:
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" />
 
             <InstallUISequence>
-                <Show Dialog="WelcomeDlg" Before="WelcomeDlg2" Condition="Installed AND PATCH" />
+                <Show Dialog="override WelcomeDlg" Before="WelcomeDlg2" Condition="Installed AND PATCH" />
             </InstallUISequence>
 
             <Property Id="ARPNOMODIFY" Value="1" />
diff --git a/install/plugins.wxs b/install/plugins.wxs
index edd295ef..67a8f80d 100644
--- a/install/plugins.wxs
+++ b/install/plugins.wxs
@@ -36,7 +36,7 @@
     <Chain>
       <MsiPackage Id="WebEID" InstallCondition="VersionNT64" ForcePerMachine="yes"
           SourceFile="$(var.webeid).qt.msi" Compressed="yes">
-        <MsiProperty Name="APPLICATIONFOLDER" Value="[ProgramFiles64Folder]Web eID" />
+        <MsiProperty Name="INSTALLFOLDER" Value="[ProgramFiles64Folder]Web eID" />
         <MsiProperty Name="CHROMEINSTALL" Value="[ChromeSupport]" />
         <MsiProperty Name="CHROMEPOLICY" Value="[ForceChromeExtensionActivation]" />
         <MsiProperty Name="EDGEINSTALL" Value="[EdgeSupport]" />
diff --git a/install/web-eid.wxs b/install/web-eid.wxs
index 0c6c28d2..52bd5678 100644
--- a/install/web-eid.wxs
+++ b/install/web-eid.wxs
@@ -28,7 +28,6 @@
     <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
     <Icon Id="web_eid.exe" SourceFile="$(var.app_path)" />
     <Property Id="ARPPRODUCTICON" Value="web_eid.exe" />
-    <Property Id="APPLICATIONNAME" Value="web-eid" />
     <Property Id="CHROMEINSTALL" Value="1" />
     <Property Id="CHROMEPOLICY" Value="0" />
     <Property Id="EDGEINSTALL" Value="1" />
@@ -70,29 +69,39 @@
     </InstallExecuteSequence>
 
     <StandardDirectory Id="ProgramFiles6432Folder">
-      <Directory Id="APPLICATIONFOLDER" Name="Web eID">
-        <Component Id="Application" Guid="9b61583c-308f-435d-b221-c2f250271c7c">
-          <File Source="$(var.app_path)" KeyPath="yes" />
+      <Directory Id="INSTALLFOLDER" Name="Web eID">
+        <File Source="$(var.app_path)" />
 <?ifdef var.qt_path ?>
-          <File Source="$(var.VCPATH)\msvcp140$(var.qt_suffix).dll" />
-          <File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll" />
-<?if $(sys.BUILDARCH) = x64 ?>
-          <File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll" />
-          <File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll" />
-          <File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll" />
+        <File Source="$(var.VCPATH)\msvcp140$(var.qt_suffix).dll" />
+        <File Source="$(var.VCPATH)\msvcp140_1$(var.qt_suffix).dll" />
+        <File Source="$(var.VCPATH)\msvcp140_2$(var.qt_suffix).dll" />
+        <File Source="$(var.VCPATH)\vcruntime140$(var.qt_suffix).dll" />
+<?if $(sys.BUILDARCH) != x86 ?>
+        <File Source="$(var.VCPATH)\vcruntime140_1$(var.qt_suffix).dll" />
 <?endif?>
-          <File Source="$(var.ssl_path)\libcrypto-3$(var.ssl_suffix).dll" />
-          <File Source="$(var.ssl_path)\libssl-3$(var.ssl_suffix).dll" />
-          <File Source="$(var.qt_path)\Qt6Core$(var.qt_suffix).dll" />
-          <File Source="$(var.qt_path)\Qt6Gui$(var.qt_suffix).dll" />
-          <File Source="$(var.qt_path)\Qt6Network$(var.qt_suffix).dll" />
-          <File Source="$(var.qt_path)\Qt6Svg$(var.qt_suffix).dll" />
-          <File Source="$(var.qt_path)\Qt6Widgets$(var.qt_suffix).dll" />
-          <File Source="$(var.qt_path)\D3DCompiler_47.dll" />
-          <File Source="$(var.qt_path)\opengl32sw.dll" />
-          <File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll" />
+        <File Source="$(var.ssl_path)\libcrypto-3$(var.ssl_suffix).dll" />
+        <File Source="$(var.ssl_path)\libssl-3$(var.ssl_suffix).dll" />
+        <File Source="$(var.qt_path)\Qt6Core$(var.qt_suffix).dll" />
+        <File Source="$(var.qt_path)\Qt6Gui$(var.qt_suffix).dll" />
+        <File Source="$(var.qt_path)\Qt6Network$(var.qt_suffix).dll" />
+        <File Source="$(var.qt_path)\Qt6Svg$(var.qt_suffix).dll" />
+        <File Source="$(var.qt_path)\Qt6Widgets$(var.qt_suffix).dll" />
+        <File Source="$(var.qt_path)\D3DCompiler_47.dll" />
+        <File Source="$(var.qt_path)\opengl32sw.dll" />
+        <File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll" />
+        <Directory Id="platforms" Name="platforms">
+          <File Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
+        </Directory>
+        <Directory Id="styles" Name="styles">
+          <File Source="$(var.qt_path)\..\plugins\styles\qwindowsvistastyle$(var.qt_suffix).dll" />
+        </Directory>
+        <Directory Id="imageformats" Name="imageformats">
+          <File Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
+        </Directory>
+        <Directory Id="tls" Name="tls">
+          <File Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
+        </Directory>
 <?endif?>
-        </Component>
         <Component Id="ChromeEdge" Transitive="yes" Condition="(CHROMEINSTALL = 1 OR EDGEINSTALL = 1)">
           <File Source="$(var.json)" />
           <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]eu.webeid.json"
@@ -103,28 +112,6 @@
           <RegistryValue Root="HKLM" Type="string" Value="[APPLICATIONFOLDER]eu.webeid.firefox.json"
             Key="SOFTWARE\Mozilla\NativeMessagingHosts\eu.webeid" />
         </Component>
-<?ifdef var.qt_path ?>
-        <Directory Id="platforms" Name="platforms">
-          <Component Id="qwindows.dll">
-            <File Source="$(var.qt_path)\..\plugins\platforms\qwindows$(var.qt_suffix).dll" />
-          </Component>
-        </Directory>
-        <Directory Id="styles" Name="styles">
-          <Component Id="qwindowsvistastyle.dll">
-            <File Source="$(var.qt_path)\..\plugins\styles\qwindowsvistastyle$(var.qt_suffix).dll" />
-          </Component>
-        </Directory>
-        <Directory Id="imageformats" Name="imageformats">
-          <Component Id="imageformats.dll">
-            <File Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
-          </Component>
-        </Directory>
-        <Directory Id="tls" Name="tls">
-          <Component Id="qopensslbackend.dll">
-            <File Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
-          </Component>
-        </Directory>
-<?endif?>
       </Directory>
       <Component Id="Chrome" Transitive="yes" Condition="(CHROMEINSTALL = 1)" Bitness="always32">
         <RegistryValue Root="HKLM" Type="string" Name="update_url"
@@ -155,21 +142,5 @@
           Value="gnmckgbandlkacikdndelhfghdejfido" />
       </Component>
     </StandardDirectory>
-
-    <Feature Id="Install" Level="1" Title="Web eID" Display="expand" ConfigurableDirectory="APPLICATIONFOLDER">
-      <ComponentRef Id="Application" />
-      <ComponentRef Id="ChromeEdge" />
-      <ComponentRef Id="Chrome" />
-      <ComponentRef Id="ChromePolicy" />
-      <ComponentRef Id="Edge" />
-      <ComponentRef Id="EdgePolicy" />
-      <ComponentRef Id="Firefox" />
-<?ifdef var.qt_path ?>
-      <ComponentRef Id="qwindows.dll" />
-      <ComponentRef Id="qwindowsvistastyle.dll" />
-      <ComponentRef Id="imageformats.dll" />
-      <ComponentRef Id="qopensslbackend.dll" />
-<?endif?>
-    </Feature>
   </Package>
 </Wix>
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 5bfd90b3..a9d4091f 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -50,11 +50,14 @@ if(WIN32)
         WORKING_DIRECTORY $<TARGET_FILE_DIR:web-eid>
     )
     add_custom_target(bundle DEPENDS installer
-        COMMAND wix.exe build -nologo
+        COMMAND dotnet new tool-manifest --force -v q
+        COMMAND dotnet tool install wix --version 4.0.5 -v q
+        COMMAND dotnet wix extension add WixToolset.Util.wixext/4.0.5
+        COMMAND dotnet wix extension add WixToolset.Bal.wixext/4.0.5
+        COMMAND dotnet wix build -nologo -d MSI_VERSION=${PROJECT_VERSION}
             -ext WixToolset.Bal.wixext
             -ext WixToolset.Util.wixext
-            -d webeid="${BASE_FILE}"
-            -d MSI_VERSION=${PROJECT_VERSION}
+            -d "webeid=${BASE_FILE}"
             -d path="${CMAKE_SOURCE_DIR}/install"
             "${CMAKE_SOURCE_DIR}/install/plugins.wxs"
             -o "${BASE_FILE}.exe"