diff --git a/src/Greenshot.Addon.Box/FodyWeavers.xml b/src/Greenshot.Addon.Box/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.Box/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Box/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Box/FodyWeavers.xsd b/src/Greenshot.Addon.Box/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Box/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
index 4c92e96ce..d3cdb8695 100644
--- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
+++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
@@ -44,13 +44,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.Confluence/FodyWeavers.xml b/src/Greenshot.Addon.Confluence/FodyWeavers.xml
index 06305152a..a211be444 100644
--- a/src/Greenshot.Addon.Confluence/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Confluence/FodyWeavers.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <Costura IncludeDebugSymbols='false'>
-        <IncludeAssemblies>
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Costura IncludeDebugSymbols="false">
+    <IncludeAssemblies>
             Dapplo.Confluence
             Dapplo.HttpExtensions.JsonSimple
         </IncludeAssemblies>
-    </Costura>
-	<AutoProperties />
+  </Costura>
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Confluence/FodyWeavers.xsd b/src/Greenshot.Addon.Confluence/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Confluence/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
index 7eeabed04..23bfb8a48 100644
--- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
+++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
@@ -51,13 +51,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Dapplo.Confluence" Version="0.8.14" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.Dropbox/FodyWeavers.xml b/src/Greenshot.Addon.Dropbox/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.Dropbox/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Dropbox/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Dropbox/FodyWeavers.xsd b/src/Greenshot.Addon.Dropbox/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Dropbox/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
index 28f9794a4..8e3b61c34 100644
--- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
+++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
@@ -46,13 +46,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.ExternalCommand/FodyWeavers.xml b/src/Greenshot.Addon.ExternalCommand/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.ExternalCommand/FodyWeavers.xml
+++ b/src/Greenshot.Addon.ExternalCommand/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.ExternalCommand/FodyWeavers.xsd b/src/Greenshot.Addon.ExternalCommand/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.ExternalCommand/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
index 267c3cfc2..c4918d830 100644
--- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
+++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
@@ -38,11 +38,11 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="CliWrap" Version="2.1.0" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.Flickr/FodyWeavers.xml b/src/Greenshot.Addon.Flickr/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.Flickr/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Flickr/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Flickr/FodyWeavers.xsd b/src/Greenshot.Addon.Flickr/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Flickr/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
index d05a80acb..cd3848308 100644
--- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
+++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
@@ -46,11 +46,11 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.GooglePhotos/FodyWeavers.xml b/src/Greenshot.Addon.GooglePhotos/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.GooglePhotos/FodyWeavers.xml
+++ b/src/Greenshot.Addon.GooglePhotos/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.GooglePhotos/FodyWeavers.xsd b/src/Greenshot.Addon.GooglePhotos/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.GooglePhotos/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
index 3146812cf..c593e5d88 100644
--- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
+++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
@@ -46,11 +46,11 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.Imgur/FodyWeavers.xml b/src/Greenshot.Addon.Imgur/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.Imgur/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Imgur/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Imgur/FodyWeavers.xsd b/src/Greenshot.Addon.Imgur/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Imgur/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
index 321d9452c..1200a05c0 100644
--- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
+++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
@@ -46,15 +46,15 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="MahApps.Metro" Version="1.6.5" />
+    <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
   </ItemGroup>
 </Project>
diff --git a/src/Greenshot.Addon.Jira/FodyWeavers.xml b/src/Greenshot.Addon.Jira/FodyWeavers.xml
index 3610b174d..f13eee787 100644
--- a/src/Greenshot.Addon.Jira/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Jira/FodyWeavers.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <Costura IncludeDebugSymbols='false'>
-        <IncludeAssemblies>
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Costura IncludeDebugSymbols="false">
+    <IncludeAssemblies>
             Dapplo.Jira
         </IncludeAssemblies>
-    </Costura>
-    <AutoProperties />
+  </Costura>
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Jira/FodyWeavers.xsd b/src/Greenshot.Addon.Jira/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Jira/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
index 8f8789981..3a8b7b6ca 100644
--- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
+++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
@@ -48,14 +48,14 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Utils" Version="1.1.9" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="Dapplo.Jira" Version="0.8.7" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xml b/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xml
+++ b/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xsd b/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.LegacyEditor/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
index 0afe9b0af..846d7fb2c 100644
--- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
+++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
@@ -133,12 +133,12 @@
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
     <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.Lutim/FodyWeavers.xml b/src/Greenshot.Addon.Lutim/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.Lutim/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Lutim/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Lutim/FodyWeavers.xsd b/src/Greenshot.Addon.Lutim/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Lutim/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
index 7bf3fc45b..9da6b1d88 100644
--- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
+++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
@@ -46,13 +46,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-	<PackageReference Include="MahApps.Metro" Version="1.6.5" />
-    <PackageReference Include="Fody" Version="3.2.17">
+	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.OCR/FodyWeavers.xml b/src/Greenshot.Addon.OCR/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.OCR/FodyWeavers.xml
+++ b/src/Greenshot.Addon.OCR/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.OCR/FodyWeavers.xsd b/src/Greenshot.Addon.OCR/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.OCR/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
index 8b40bc513..8f9aa2db0 100644
--- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
+++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
@@ -38,10 +38,10 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.Office/FodyWeavers.xml b/src/Greenshot.Addon.Office/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.Office/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Office/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Office/FodyWeavers.xsd b/src/Greenshot.Addon.Office/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Office/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
index e47084b1c..11faf18d1 100644
--- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
+++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
@@ -45,8 +45,8 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" />
     <PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000" />
@@ -54,7 +54,7 @@
     <PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1017" />
     <PackageReference Include="Microsoft.Office.Interop.Word" Version="15.0.4797.1003" />
     <PackageReference Include="MicrosoftOfficeCore" Version="15.0.0" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.OneDrive/FodyWeavers.xml b/src/Greenshot.Addon.OneDrive/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.OneDrive/FodyWeavers.xml
+++ b/src/Greenshot.Addon.OneDrive/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.OneDrive/FodyWeavers.xsd b/src/Greenshot.Addon.OneDrive/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.OneDrive/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
index 2e94f8e20..596209c87 100644
--- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
+++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
@@ -46,13 +46,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-	<PackageReference Include="MahApps.Metro" Version="1.6.5" />
-    <PackageReference Include="Fody" Version="3.2.17">
+	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.Photobucket/FodyWeavers.xml b/src/Greenshot.Addon.Photobucket/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.Photobucket/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Photobucket/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Photobucket/FodyWeavers.xsd b/src/Greenshot.Addon.Photobucket/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Photobucket/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
index 7ddbe8311..5a6467858 100644
--- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
+++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
@@ -46,11 +46,11 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.Tfs/FodyWeavers.xml b/src/Greenshot.Addon.Tfs/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot.Addon.Tfs/FodyWeavers.xml
+++ b/src/Greenshot.Addon.Tfs/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Tfs/FodyWeavers.xsd b/src/Greenshot.Addon.Tfs/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addon.Tfs/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
index 3b8496371..a6829fcae 100644
--- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
+++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
@@ -46,13 +46,13 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
-	<PackageReference Include="MahApps.Metro" Version="1.6.5" />
-    <PackageReference Include="Fody" Version="3.2.17">
+	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
index 7a883c1ed..4fe039cbb 100644
--- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
+++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
@@ -50,8 +50,8 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Greenshot.Addons/FodyWeavers.xml b/src/Greenshot.Addons/FodyWeavers.xml
index 1d219da8e..7f5a26669 100644
--- a/src/Greenshot.Addons/FodyWeavers.xml
+++ b/src/Greenshot.Addons/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot.Addons/FodyWeavers.xsd b/src/Greenshot.Addons/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot.Addons/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj
index 9b238867e..acb753936 100644
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@@ -43,15 +43,14 @@
   
   <ItemGroup>
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
-    <PackageReference Include="ControlzEx" Version="3.0.2.4" />
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
-      <Version>1.2.2</Version>
+      <Version>1.2.5</Version>
     </PackageReference>
     <PackageReference Include="Dapplo.CaliburnMicro.Toasts">
-      <Version>1.2.2</Version>
+      <Version>1.2.5</Version>
     </PackageReference>
     <PackageReference Include="Dapplo.CaliburnMicro.Translations">
-      <Version>1.2.2</Version>
+      <Version>1.2.5</Version>
     </PackageReference>
     <PackageReference Include="Dapplo.HttpExtensions">
       <Version>0.9.15</Version>
@@ -68,12 +67,12 @@
     <PackageReference Include="Dapplo.Windows.Icons">
       <Version>0.7.24</Version>
     </PackageReference>
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="MahApps.Metro.IconPacks">
-      <Version>2.3.0</Version>
+      <Version>3.0.0-alpha0088</Version>
     </PackageReference>
     <PackageReference Include="Svg">
       <Version>2.3.0</Version>
diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
index 2678e701a..817f65404 100644
--- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj
+++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
@@ -29,7 +29,7 @@
   
   <ItemGroup>
     <PackageReference Include="Dapplo.CaliburnMicro.Translations">
-      <Version>1.2.2</Version>
+      <Version>1.2.5</Version>
     </PackageReference>
     <PackageReference Include="Svg">
       <Version>2.3.0</Version>
diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj
index cd891f370..df3e00d78 100644
--- a/src/Greenshot.Tests/Greenshot.Tests.csproj
+++ b/src/Greenshot.Tests/Greenshot.Tests.csproj
@@ -69,7 +69,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.2" />
     <PackageReference Include="CommandLineParser" Version="2.3.0" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2">
diff --git a/src/Greenshot/Configuration/IMetroConfiguration.cs b/src/Greenshot/Configuration/IMetroConfiguration.cs
index 400da3848..cea89ffdc 100644
--- a/src/Greenshot/Configuration/IMetroConfiguration.cs
+++ b/src/Greenshot/Configuration/IMetroConfiguration.cs
@@ -1,16 +1,40 @@
-using System.ComponentModel;
+#region Greenshot GNU General Public License
+
+// Greenshot - a free and open source screenshot tool
+// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
+// 
+// For more information see: http://getgreenshot.org/
+// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 1 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using System.ComponentModel;
 using Dapplo.CaliburnMicro.Metro;
+using Dapplo.CaliburnMicro.Metro.Configuration;
 using Dapplo.Config.Ini;
 
 namespace Greenshot.Configuration
 {
     [IniSection("Metro")]
-    public interface IMetroConfiguration : IIniSection
+    public interface IMetroConfiguration : IIniSection, IMetroUiConfiguration
     {
-        [DefaultValue(Themes.BaseLight)]
-        Themes Theme { get; set; }
+        [DefaultValue(Themes.Light)]
+        new Themes Theme { get; set; }
 
-        [DefaultValue(ThemeAccents.Orange)]
-        ThemeAccents ThemeAccent { get; set; }
+        [DefaultValue(ThemeAccents.Olive)]
+        new ThemeAccents ThemeAccent { get; set; }
     }
 }
diff --git a/src/Greenshot/FodyWeavers.xml b/src/Greenshot/FodyWeavers.xml
index c7704e778..7f5a26669 100644
--- a/src/Greenshot/FodyWeavers.xml
+++ b/src/Greenshot/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-    <AutoProperties />
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <AutoProperties />
 </Weavers>
\ No newline at end of file
diff --git a/src/Greenshot/FodyWeavers.xsd b/src/Greenshot/FodyWeavers.xsd
new file mode 100644
index 000000000..061979a03
--- /dev/null
+++ b/src/Greenshot/FodyWeavers.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuild.  -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="AutoProperties" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification on the target assembly after all weavers have been finished.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 189857fc5..2cc9058ff 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -80,11 +80,11 @@
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
     <PackageReference Include="CommandLineParser" Version="2.3.0" />
     <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.2" />
-    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.5" />
+    <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
@@ -92,12 +92,12 @@
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" />
     <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.24" />
-    <PackageReference Include="Fody" Version="3.2.17">
+    <PackageReference Include="Fody" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="gong-wpf-dragdrop" Version="2.0.0-alpha0099" />
-    <PackageReference Include="MahApps.Metro.IconPacks" Version="2.3.0" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0088" />
     <PackageReference Include="Svg" Version="2.3.0" />
   </ItemGroup>
   
diff --git a/src/Greenshot/Ui/Configuration/ViewModels/UiConfigViewModel.cs b/src/Greenshot/Ui/Configuration/ViewModels/UiConfigViewModel.cs
index 35e614aa4..676016190 100644
--- a/src/Greenshot/Ui/Configuration/ViewModels/UiConfigViewModel.cs
+++ b/src/Greenshot/Ui/Configuration/ViewModels/UiConfigViewModel.cs
@@ -99,8 +99,7 @@ namespace Greenshot.Ui.Configuration.ViewModels
         {
             // Manually commit
             MetroConfiguration.CommitTransaction();
-            MetroWindowManager.ChangeTheme(MetroConfiguration.Theme);
-            MetroWindowManager.ChangeThemeAccent(MetroConfiguration.ThemeAccent);
+            MetroWindowManager.ChangeTheme(MetroConfiguration.Theme, MetroConfiguration.ThemeAccent);
 
             CoreConfiguration.CommitTransaction();
             // TODO: Fix