diff --git a/appveyor.yml b/appveyor.yml
index 40723cec..215ea5b7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,14 @@
-image: Visual Studio 2019
+image: Visual Studio 2022x
 
 version: 3.24.{build}.0
 
 clone_folder: c:\projects\ditto
+
+branches:
+  only:
+    - appveyor
+
+skip_branch_with_pr: false    
     
 install:
 - set INNO_SETUP_PATH=C:\Program Files (x86)\Inno Setup 6
@@ -11,8 +17,9 @@ install:
     
 environment:
   VERSION_FILENAME: 3_24_%APPVEYOR_BUILD_NUMBER%_0  
-  CHOCO_API_KEY:
-    secure: ZeAW38gXYNcJmxTOEGhA1RC5XzmJVvxVM8bsCCARnbYHEDmtQiRZxV4G+/KY4wW9
+  VERSION_DOT_FILENAME: 3.24.%APPVEYOR_BUILD_NUMBER%.0  
+#  CHOCO_API_KEY:
+#    secure: ZeAW38gXYNcJmxTOEGhA1RC5XzmJVvxVM8bsCCARnbYHEDmtQiRZxV4G+/KY4wW9
 #  APPVEYOR_RDP_PASSWORD: Letmein1!
 
 #init:
@@ -43,57 +50,59 @@ after_build:
   - 7z a DittoSetup\output\DittoDebug_%VERSION_FILENAME%.7z *.pdb -r
   - 7z a DittoSetup\output\DittoDebug_%VERSION_FILENAME%.7z *.map -r
   
-  - appveyor AddMessage -Category Information "Building ditto choco"
-  - ps: (Get-Content 'DittoSetup\Chocolatey\ditto.nuspec' -Raw).Replace("%version%", "$($env:APPVEYOR_BUILD_VERSION)") | Out-File 'DittoSetup\Chocolatey\ditto.nuspec'
-  - copy DittoSetup\output\DittoSetup_%VERSION_FILENAME%.exe DittoSetup\Chocolatey\DittoSetup_%VERSION_FILENAME%.exe
-  - copy DittoSetup\output\DittoSetup_64bit_%VERSION_FILENAME%.exe DittoSetup\Chocolatey\DittoSetup_64bit_%VERSION_FILENAME%.exe
-  - cd DittoSetup\Chocolatey
-  - choco pack     
-  - choco push --key %CHOCO_API_KEY% --source https://push.chocolatey.org/
-  - cd ..
-  - cd ..
-  
-  - appveyor AddMessage -Category Information "Building ditto choco.install"
-  - ps: (Get-Content 'DittoSetup\Chocolatey.install\ditto.nuspec' -Raw).Replace("%version%", "$($env:APPVEYOR_BUILD_VERSION)") | Out-File 'DittoSetup\Chocolatey.install\ditto.nuspec'
-  - copy DittoSetup\output\DittoSetup_%VERSION_FILENAME%.exe DittoSetup\Chocolatey.install\DittoSetup_%VERSION_FILENAME%.exe
-  - copy DittoSetup\output\DittoSetup_64bit_%VERSION_FILENAME%.exe DittoSetup\Chocolatey.install\DittoSetup_64bit_%VERSION_FILENAME%.exe
-  - cd DittoSetup\Chocolatey.install
-  - choco pack     
-  - choco push --key %CHOCO_API_KEY% --source https://push.chocolatey.org/
-  - cd ..
-  - cd ..
-  
-  - appveyor AddMessage -Category Information "Building ditto choco.portable"
-  - ps: (Get-Content 'DittoSetup\Chocolatey.portable\ditto.nuspec' -Raw).Replace("%version%", "$($env:APPVEYOR_BUILD_VERSION)") | Out-File 'DittoSetup\Chocolatey.portable\ditto.nuspec'
-  - copy DittoSetup\output\DittoPortable_%VERSION_FILENAME%.zip DittoSetup\Chocolatey.portable\DittoPortable_%VERSION_FILENAME%.zip
-  - copy DittoSetup\output\DittoPortable_64bit_%VERSION_FILENAME%.zip DittoSetup\Chocolatey.portable\DittoPortable_64bit_%VERSION_FILENAME%.zip
-  - cd DittoSetup\Chocolatey.portable
-  - choco pack     
-  - choco push --key %CHOCO_API_KEY% --source https://push.chocolatey.org/
-  - cd ..
-  - cd ..
-
-  - appveyor AddMessage -Category Information "Building appx"
-  - 7z x DittoSetup\output\DittoPortable_%VERSION_FILENAME%.zip -oDittoSetup\appx -r
-  - ps: (Get-Content 'DittoSetup\appx\appxmanifest.xml' -Raw).Replace("%version%", "$($env:APPVEYOR_BUILD_VERSION)") | Out-File 'DittoSetup\appx\appxmanifest.xml'  
-  - cd DittoSetup\appx
-  - makeappx.exe pack /f files.ini /p Ditto_%VERSION_FILENAME%.appx
-  - signtool.exe sign -f my.pfx -fd SHA256 -v Ditto_%VERSION_FILENAME%.appx
-  - cd ..
-  - cd ..
-  - copy DittoSetup\appx\Ditto_%VERSION_FILENAME%.appx DittoSetup\Output\Ditto_%VERSION_FILENAME%.appx
+#  - appveyor AddMessage -Category Information "Building ditto choco"
+#  - ps: (Get-Content 'DittoSetup\Chocolatey\ditto.nuspec' -Raw).Replace("%version%", "$($env:APPVEYOR_BUILD_VERSION)") | Out-File 'DittoSetup\Chocolatey\ditto.nuspec'
+#  - copy DittoSetup\output\DittoSetup_%VERSION_FILENAME%.exe DittoSetup\Chocolatey\tools\DittoSetup_%VERSION_FILENAME%.exe
+#  - copy DittoSetup\output\DittoSetup_64bit_%VERSION_FILENAME%.exe DittoSetup\Chocolatey\tools\DittoSetup_64bit_%VERSION_FILENAME%.exe
+#  - cd DittoSetup\Chocolatey
+#  - choco pack     
+#  - choco push --key %CHOCO_API_KEY% --source https://push.chocolatey.org/
+#  - cd ..
+#  - cd ..
+#  
+#  - appveyor AddMessage -Category Information "Building ditto choco.install"
+#  - ps: (Get-Content 'DittoSetup\Chocolatey.install\ditto.nuspec' -Raw).Replace("%version%", "$($env:APPVEYOR_BUILD_VERSION)") | Out-File 'DittoSetup\Chocolatey.install\ditto.nuspec'
+#  - copy DittoSetup\output\DittoSetup_%VERSION_FILENAME%.exe DittoSetup\Chocolatey.install\tools\DittoSetup_%VERSION_FILENAME%.exe
+#  - copy DittoSetup\output\DittoSetup_64bit_%VERSION_FILENAME%.exe DittoSetup\Chocolatey.install\tools\DittoSetup_64bit_%VERSION_FILENAME%.exe
+#  - cd DittoSetup\Chocolatey.install
+#  - choco pack     
+#  - choco push --key %CHOCO_API_KEY% --source https://push.chocolatey.org/
+#  - cd ..
+#  - cd ..
+#  
+#  - appveyor AddMessage -Category Information "Building ditto choco.portable"
+#  - ps: (Get-Content 'DittoSetup\Chocolatey.portable\ditto.nuspec' -Raw).Replace("%version%", "$($env:APPVEYOR_BUILD_VERSION)") | Out-File 'DittoSetup\Chocolatey.portable\ditto.nuspec'
+#  - copy DittoSetup\output\DittoPortable_%VERSION_FILENAME%.zip DittoSetup\Chocolatey.portable\tools\DittoPortable_%VERSION_FILENAME%.zip
+#  - copy DittoSetup\output\DittoPortable_64bit_%VERSION_FILENAME%.zip DittoSetup\Chocolatey.portable\tools\DittoPortable_64bit_%VERSION_FILENAME%.zip
+#  - cd DittoSetup\Chocolatey.portable
+#  - choco pack     
+#  - choco push --key %CHOCO_API_KEY% --source https://push.chocolatey.org/
+#  - cd ..
+#  - cd ..
+#
+#  - appveyor AddMessage -Category Information "Building appx"
+#  - 7z x DittoSetup\output\DittoPortable_%VERSION_FILENAME%.zip -oDittoSetup\appx -r
+#  - ps: (Get-Content 'DittoSetup\appx\appxmanifest.xml' -Raw).Replace("%version%", "$($env:APPVEYOR_BUILD_VERSION)") | Out-File 'DittoSetup\appx\appxmanifest.xml'  
+#  - cd DittoSetup\appx
+#  - makeappx.exe pack /f files.ini /p Ditto_%VERSION_FILENAME%.appx
+#  - signtool.exe sign -f my.pfx -fd SHA256 -v Ditto_%VERSION_FILENAME%.appx
+#  - cd ..
+#  - cd ..
+#  - copy DittoSetup\appx\Ditto_%VERSION_FILENAME%.appx DittoSetup\Output\Ditto_%VERSION_FILENAME%.appx
 
-artifacts:
-  - path: DittoSetup\output\DittoSetup_%VERSION_FILENAME%.exe
-    name: Ditto Setup
-  - path: DittoSetup\output\DittoSetup_64bit_%VERSION_FILENAME%.exe
-    name: Ditto Setup 64bit
-  - path: DittoSetup\output\DittoPortable_%VERSION_FILENAME%.zip
-    name: Ditto Portable
-  - path: DittoSetup\output\DittoPortable_64bit_%VERSION_FILENAME%.zip
-    name: Ditto Portable 64bit
-  - path: DittoSetup\output\DittoDebug_%VERSION_FILENAME%.7z
-    name: Ditto Debug
-  - path: DittoSetup\output\Ditto_%VERSION_FILENAME%.appx
-    name: Ditto appx
+#artifacts:
+#  - path: DittoSetup\output\DittoSetup_%VERSION_FILENAME%.exe
+#    name: Ditto Setup
+#  - path: DittoSetup\output\DittoSetup_64bit_%VERSION_FILENAME%.exe
+#    name: Ditto Setup 64bit
+#  - path: DittoSetup\output\DittoPortable_%VERSION_FILENAME%.zip
+#    name: Ditto Portable
+#  - path: DittoSetup\output\DittoPortable_64bit_%VERSION_FILENAME%.zip
+#    name: Ditto Portable 64bit
+#  - path: DittoSetup\output\DittoDebug_%VERSION_FILENAME%.7z
+#    name: Ditto Debug
+#  - path: DittoSetup\output\Ditto_%VERSION_FILENAME%.appx
+#    name: Ditto appx
+#  - path: DittoSetup\Chocolatey\ditto.%VERSION_DOT_FILENAME%-beta.nupkg
+#    name: Ditto Choco