diff --git a/0001-Update-data-wixl.patch b/0001-Update-data-wixl.patch
new file mode 100644
index 0000000..e322a8c
--- /dev/null
+++ b/0001-Update-data-wixl.patch
@@ -0,0 +1,2662 @@
+From 20c4f6234a15694386ab8acb4d6fbbada088d7ef Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
+Date: Sun, 1 Aug 2021 19:47:14 +0400
+Subject: [PATCH] Update data/wixl
+
+Signed-off-by: rpm-build <<rpm-build>>
+---
+ data/wixl/SDL2.wxi                    |  21 ++
+ data/wixl/adwaita-icon-theme.wxi      | 410 +++++++++++++++-----------
+ data/wixl/gdk-pixbuf.wxi              |   2 -
+ data/wixl/gstreamer1-plugins-base.wxi | 273 +++++++++++------
+ data/wixl/gstreamer1.wxi              | 200 +++++++------
+ data/wixl/imath.wxi                   |  19 ++
+ data/wixl/libffi.wxi                  |   2 +-
+ data/wixl/librsvg2.wxi                |   4 -
+ data/wixl/openal-soft.wxi             |  41 ++-
+ data/wixl/openexr.wxi                 |  42 ++-
+ data/wxi-validate.pl                  |   3 +
+ 11 files changed, 612 insertions(+), 405 deletions(-)
+ create mode 100644 data/wixl/SDL2.wxi
+ create mode 100644 data/wixl/imath.wxi
+
+diff --git a/data/wixl/SDL2.wxi b/data/wixl/SDL2.wxi
+new file mode 100644
+index 000000000000..1840dca777bd
+--- /dev/null
++++ b/data/wixl/SDL2.wxi
+@@ -0,0 +1,21 @@
++<?xml version="1.0" encoding="utf-8"?>
++<?require gcc.wxi?>
++<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
++  <Fragment>
++    <DirectoryRef Id="INSTALLDIR">
++      <Directory Id="dir154180F818FEB882010738964BF75EAA" Name="bin">
++        <Component Win64="$(var.Win64)" Id="cmp9859740215BAAB4C68139AEAA268FB88" Guid="*">
++          <File Id="filC48FD02956F0B430EE306F8B4F2905AB" KeyPath="yes" Source="$(var.SourceDir)/bin/SDL2.dll"/>
++        </Component>
++      </Directory>
++    </DirectoryRef>
++  </Fragment>
++  <Fragment>
++    <ComponentGroup Id="CG.SDL2">
++      <ComponentGroupRef Id="CG.gcc"/>
++      <ComponentRef Id="cmp9859740215BAAB4C68139AEAA268FB88"/>
++    </ComponentGroup>
++  </Fragment>
++</Include>
++<!-- generated with msitools 0.101.79-8c74 -->
++<!-- tools/wixl/wixl-heat -var var.SourceDir -prefix /usr/i686-w64-mingw32/sys-root/mingw/ -component-group CG.SDL2 -directory-ref INSTALLDIR -win64 -->
+diff --git a/data/wixl/adwaita-icon-theme.wxi b/data/wixl/adwaita-icon-theme.wxi
+index da03a6963956..107f3c5aa29c 100644
+--- a/data/wixl/adwaita-icon-theme.wxi
++++ b/data/wixl/adwaita-icon-theme.wxi
+@@ -2,11 +2,11 @@
+ <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <Fragment>
+     <DirectoryRef Id="INSTALLDIR">
+-      <Directory Id="dir4DB9A730DA44BFBB15611D3722269D19" Name="share">
+-        <Directory Id="dirB97DBA645E904C3BC5FA528FDE835138" Name="icons">
+-          <Directory Id="dir89F983FF8D85C24BF2C5FDF2B64BF0BB" Name="Adwaita">
+-            <Directory Id="dirCE793963D6FE128B2491431F3B8B9257" Name="16x16">
+-              <Directory Id="dir3E6BD3699ECB167356FFAE0155D48186" Name="actions">
++      <Directory Id="dirD057EEAA5697E9582F6FE41C5AE1AF09" Name="share">
++        <Directory Id="dirB7FFFE592202323741150163A56F718F" Name="icons">
++          <Directory Id="dirCCD8C53C52063ADDB5F41062CDD7C1BC" Name="Adwaita">
++            <Directory Id="dir791A5A2E1100859043FE782E88E9DF7F" Name="16x16">
++              <Directory Id="dir73DCC9749EC588024754BA3E65CEC749" Name="actions">
+                 <Component Win64="$(var.Win64)" Id="cmp2E64AF64601609D2528565D539877B3B" Guid="*">
+                   <File Id="fil6CF1DA3709E43F3F65576B63A5775F1D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/action-unavailable-symbolic.symbolic.png"/>
+                 </Component>
+@@ -82,6 +82,9 @@
+                 <Component Win64="$(var.Win64)" Id="cmp03D082E8AA12B7CCE1A3DAEC007F5C3A" Guid="*">
+                   <File Id="filE3119F4A461D4C70E0E30B40B2ADCE2E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/edit-clear-all-symbolic.symbolic.png"/>
+                 </Component>
++                <Component Win64="$(var.Win64)" Id="cmpE1A8335913EC4BF5C32D0946D3363054" Guid="*">
++                  <File Id="fil01897D158C05AC1152C7359FB1D8E6C9" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/edit-clear-rtl-symbolic.symbolic.png"/>
++                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp5FF00CA6BCFF49C42DB483CF1193FDCB" Guid="*">
+                   <File Id="filA42D6E817A2F277541A2689B6CE85862" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/edit-clear-symbolic-rtl.symbolic.png"/>
+                 </Component>
+@@ -331,8 +334,14 @@
+                 <Component Win64="$(var.Win64)" Id="cmpA8AA5489580F45FB341ABA3627A6FF03" Guid="*">
+                   <File Id="fil4802C59B5440C5107256AE13F1C95393" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/send-to-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp0318D13FE3DED7FCEED845A75D01B994" Guid="*">
+-                  <File Id="fil323034B4E4729F01ECFF80A7822B7773" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/sidebar-hide-symbolic.symbolic.png"/>
++                <Component Win64="$(var.Win64)" Id="cmpD154FF7027B801A1D5C6C3470BC3057F" Guid="*">
++                  <File Id="fil37D8BC0A609979C695401368E68ED672" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/sidebar-show-right-rtl-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmp1AE957A3F346949405B8CC9E42290C70" Guid="*">
++                  <File Id="filED72A4CAD9417262839B134DB5A9C0B7" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/sidebar-show-right-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmpBB51555B19D46AEDD700FA38CE0C8DC0" Guid="*">
++                  <File Id="fil02B2EEF7CFC2F5BBDA371E6F00EB7936" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/sidebar-show-rtl-symbolic.symbolic.png"/>
+                 </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp4C75ADB3F38114D7E53300A1EBB8B36A" Guid="*">
+                   <File Id="fil24A51EB99C7E87926622A6E160AB58A5" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/sidebar-show-symbolic.symbolic.png"/>
+@@ -440,7 +449,7 @@
+                   <File Id="fil87D799A37BD1A687CDE415B1A0402A6D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/actions/zoom-out-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir7077CA879FD5FA50C4AA93F4B05C732C" Name="apps">
++              <Directory Id="dirBC2ED907C322AA87BB3CBBD43CD7E2A6" Name="apps">
+                 <Component Win64="$(var.Win64)" Id="cmp071CF0AEA483229CDABCE7E9F4A452BC" Guid="*">
+                   <File Id="filEFFC6C857C6F1652363F1F0A3BC6EFA8" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/apps/accessories-calculator-symbolic.symbolic.png"/>
+                 </Component>
+@@ -559,7 +568,7 @@
+                   <File Id="fil8300CE083E40743F8EF925402B4B46AA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/apps/web-browser-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir543B91D8D081A8B1FE80645B6D54AEFE" Name="categories">
++              <Directory Id="dirBF449E1953864D452929E03FD7DD5B48" Name="categories">
+                 <Component Win64="$(var.Win64)" Id="cmpFFA7267615980C14EE752744D3E366AF" Guid="*">
+                   <File Id="fil72B94DE36BDE150191FEE633785A44B9" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/categories/applications-engineering-symbolic.symbolic.png"/>
+                 </Component>
+@@ -621,7 +630,7 @@
+                   <File Id="fil91D7EB6F80C173F0FD2EF22253D23A03" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/categories/system-help-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir76D0904C6A2885201A2B51C7B786E3E7" Name="devices">
++              <Directory Id="dir38E749F80AABC48CFF799F170E8E7400" Name="devices">
+                 <Component Win64="$(var.Win64)" Id="cmp01D6B4CA76BFDCF94CF4F8190C29D36F" Guid="*">
+                   <File Id="fil202A95494683ECD280E9781670BF619A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/devices/ac-adapter-symbolic.symbolic.png"/>
+                 </Component>
+@@ -833,7 +842,7 @@
+                   <File Id="fil46FC5B99C8C9BBE21DF9E1DA1DD86A52" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/devices/video-single-display-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir38755457B25E464E388386DCE3F3EBC3" Name="emblems">
++              <Directory Id="dirF1536B834D653A255E5E69CB423534F7" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmpDAC5B355ED423F915C3D81F23ECA6D3C" Guid="*">
+                   <File Id="fil65333E32C853ED684329B84AFC77C7DA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/emblems/emblem-default-symbolic.symbolic.png"/>
+                 </Component>
+@@ -883,7 +892,7 @@
+                   <File Id="filCB00C8473E6D2693676DAED850AF5E74" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/emblems/emblem-videos-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir38A024758DACF50ADF24073F888FFA7C" Name="emotes">
++              <Directory Id="dir3EF832467DAB2A06FEC8222B692B897E" Name="emotes">
+                 <Component Win64="$(var.Win64)" Id="cmp26E8C47AFECB8C79B7195C325E372DF8" Guid="*">
+                   <File Id="filD3201942F2E93C4BE1358D8EBA74027A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/emotes/emote-love-symbolic.symbolic.png"/>
+                 </Component>
+@@ -963,7 +972,7 @@
+                   <File Id="filBFF41D7D1D0DD5B39265003BC76AF899" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/emotes/face-yawn-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir01B9867D731640AE39F0EAB3487BABF1" Name="legacy">
++              <Directory Id="dir00A5398BB39576CCA34A242DAC571CD5" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmp885367883D7D59D1073CF0E2321EFBC2" Guid="*">
+                   <File Id="fil6A83FAC19FA36F047F796028F8755527" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/legacy/ac-adapter.png"/>
+                 </Component>
+@@ -1892,7 +1901,7 @@
+                   <File Id="fil5B0634B66789E2584F4A0F8C8B064397" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/legacy/zoom-out.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir58AD96197D1DE6E6B8961EBFF9AB711D" Name="mimetypes">
++              <Directory Id="dirDC0BCC9A8D01FC01BE5EECD22A0A7FD0" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmp54CF0B43D9E6E0D878B798A5E106982E" Guid="*">
+                   <File Id="fil460EE30F41F70C4B104720F891AC85A1" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/mimetypes/application-certificate-symbolic.symbolic.png"/>
+                 </Component>
+@@ -2035,7 +2044,7 @@
+                   <File Id="filACC2E74F45F67807A6B2ACA280BE033F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/mimetypes/x-package-repository.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir30E85B91D7E9FD49AB669D7F6B6FFFB9" Name="places">
++              <Directory Id="dirF3981799659D0A11D0B5EEECECF01D69" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmp1641CEA43EE62F2BA1BE675FF72688E7" Guid="*">
+                   <File Id="fil28C03D409C49D5BD876C3BD0EE1900A2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/places/folder-documents-symbolic.symbolic.png"/>
+                 </Component>
+@@ -2145,7 +2154,7 @@
+                   <File Id="fil24CCD6CE8E7C688B2FE372FB62CFDACB" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/places/user-trash.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirDE2112445AC53135ABEFBAB61C34D921" Name="status">
++              <Directory Id="dirEFEFD4F21BE4323B620D11C2A50256A7" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmp2734796DA71F8930F42B3F1106F48229" Guid="*">
+                   <File Id="filEDDFF51AC6104AE0D571EC38273AB950" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/status/airplane-mode-symbolic.symbolic.png"/>
+                 </Component>
+@@ -2696,7 +2705,7 @@
+                   <File Id="fil5A2F1AD6C6E108F7A927C93211234B66" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/status/weather-windy-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirA5A3BA376BB13D966BAD08C5AFAA84EE" Name="ui">
++              <Directory Id="dir6ACC49516EB9590D83C722A68D21C821" Name="ui">
+                 <Component Win64="$(var.Win64)" Id="cmp53B82612D2EE2E6EC98A9F0BA6711104" Guid="*">
+                   <File Id="filDC166DB47CC59F37E000FC2D38A8B6B2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/ui/checkbox-checked-symbolic.symbolic.png"/>
+                 </Component>
+@@ -2757,9 +2766,6 @@
+                 <Component Win64="$(var.Win64)" Id="cmpE7D026955FE9E3006EE0B07F2CC7F064" Guid="*">
+                   <File Id="fil4AC3654A928C6FFD19E47B58F74B6151" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/ui/selection-start-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmpFA7DD0D009BCE237AD5A11894577F8FF" Guid="*">
+-                  <File Id="fil7DFBC598A18E8390556593477C0F19D7" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/ui/tab-new-symbolic.symbolic.png"/>
+-                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp249163FAB7360ECE771E3705D32C4DC5" Guid="*">
+                   <File Id="filC3D5053F88C3FBAA22096E7A86A9B79F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/16x16/ui/window-close-symbolic.symbolic.png"/>
+                 </Component>
+@@ -2777,8 +2783,8 @@
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dir44E101027D7FCF4FC40EEC618399B4DC" Name="22x22">
+-              <Directory Id="dir514745F72969326C7ADF8DEAF6EB288A" Name="devices">
++            <Directory Id="dir128EB862146AF3AA86558F6247A2A4F2" Name="22x22">
++              <Directory Id="dirB64DBEF3E647AB53DD6552B9A9AE887E" Name="devices">
+                 <Component Win64="$(var.Win64)" Id="cmp5EBDD77E33A564053F6793CC25A5F354" Guid="*">
+                   <File Id="fil5F2817278E31D35272E60B8CDB2FAB15" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/devices/audio-headphones.png"/>
+                 </Component>
+@@ -2810,7 +2816,7 @@
+                   <File Id="filE01C59DBAC362FFCCD7FC78082CDA477" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/devices/printer.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir61A9A2014B6C543162862ADEAF4212C9" Name="emblems">
++              <Directory Id="dir59A2696C0EDF5BF0859D394732CE3271" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmpE9812EA340FFDC46D1B881CFC9AB88B2" Guid="*">
+                   <File Id="fil9994F8E3063BEE13AFB04B4E7BACCF64" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/emblems/emblem-readonly.png"/>
+                 </Component>
+@@ -2827,7 +2833,7 @@
+                   <File Id="filF511F4A26B177F3AA1FA8CDEB4B9B804" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/emblems/emblem-unreadable.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirC49D8FECA9CFFB4805DF63EE7BE61D71" Name="legacy">
++              <Directory Id="dir2CEF8A587D90097D08A2BC78E44F9D37" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmpBAFCED80D446A35047A0784050326358" Guid="*">
+                   <File Id="fil094FB271FD9A0B7AC50B33DC3840967B" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/legacy/ac-adapter.png"/>
+                 </Component>
+@@ -3723,7 +3729,7 @@
+                   <File Id="fil436E8E989FED6373AD71D0046746DA0D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/legacy/zoom-out.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirAA89775C14AFA327EEF4EBE650D39026" Name="mimetypes">
++              <Directory Id="dir47D0F4ACE412DF81AAEC767AF03515F1" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmpDE6C4B23C2187572D4A0093C5E559080" Guid="*">
+                   <File Id="fil0B80656F6D9278F22C7B97FF42E73A7B" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/mimetypes/application-certificate.png"/>
+                 </Component>
+@@ -3809,7 +3815,7 @@
+                   <File Id="fil38B6A032683850B77746AC44B2DCBD68" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/mimetypes/x-package-repository.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirCAB7628FA1B51C54CF1582A44B824339" Name="places">
++              <Directory Id="dirFCD5B027FD1B03164A6F07F57EA8B6CE" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmp2D946C3DC3CD8A3CE7B33A4D8AD2D4EA" Guid="*">
+                   <File Id="fil4F16063484292D942B1505B244F23C10" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/places/folder-documents.png"/>
+                 </Component>
+@@ -3868,7 +3874,7 @@
+                   <File Id="filD6E68F8FD246567AC0BA3924A63EC5FE" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/places/user-trash.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir9602E0C21046A79E8E084DA3374152CC" Name="status">
++              <Directory Id="dirEF4D2A222746CBD9895503739406E1EC" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmpB66FF71E7D3677766FA8559CB57BA307" Guid="*">
+                   <File Id="filEFBCC21845F9B87ED0896DFA14EAFF96" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/22x22/status/avatar-default.png"/>
+                 </Component>
+@@ -3883,8 +3889,8 @@
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dir8437ED58F9B49658F211CF78AEE0F87E" Name="24x24">
+-              <Directory Id="dir2CEC8AFD230B9A81841BC9145C162D50" Name="actions">
++            <Directory Id="dir1FBFF0ADC94106CA48B6971693DBAE0D" Name="24x24">
++              <Directory Id="dirCD31F5A54CBB32C0B447D7D297D57A92" Name="actions">
+                 <Component Win64="$(var.Win64)" Id="cmp5DEA892770A6F683F5BF472842F4D1F2" Guid="*">
+                   <File Id="fil7F72B21EA9F3F22B1C09B2BF8D44FBB7" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/action-unavailable-symbolic.symbolic.png"/>
+                 </Component>
+@@ -3960,6 +3966,9 @@
+                 <Component Win64="$(var.Win64)" Id="cmpA567D51C1E023FFC7AC64A623AA6FC1B" Guid="*">
+                   <File Id="filFC59E144ACEC736ED562F2326450C629" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/edit-clear-all-symbolic.symbolic.png"/>
+                 </Component>
++                <Component Win64="$(var.Win64)" Id="cmpD2366A4C8F0D497093932473C7F618B2" Guid="*">
++                  <File Id="fil7995B36BDF31C32A774AB38ACF0CD6D4" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/edit-clear-rtl-symbolic.symbolic.png"/>
++                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp25DBB3634DDADBA81A809290C1C874B0" Guid="*">
+                   <File Id="fil8F10E8E0B6B8C8778123145EFBA922F5" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/edit-clear-symbolic-rtl.symbolic.png"/>
+                 </Component>
+@@ -4209,8 +4218,14 @@
+                 <Component Win64="$(var.Win64)" Id="cmpCAC4EAA0E0A77622FADC56D5C8D27212" Guid="*">
+                   <File Id="filD432B57ECC0C426C39F6E92FB7A9F622" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/send-to-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp374A2BDC4F88FFC364B947DEA282A301" Guid="*">
+-                  <File Id="fil55A8A525CCD658EFC63EE88482E24628" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/sidebar-hide-symbolic.symbolic.png"/>
++                <Component Win64="$(var.Win64)" Id="cmp8834F6751082062E05590FD708F37563" Guid="*">
++                  <File Id="filF06D4A3A9A0A05B1082FECE9C536DC8A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/sidebar-show-right-rtl-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmp6477822523DC87E29E37B739A5C153A0" Guid="*">
++                  <File Id="fil050FD3B6A00159B27D9E54A1812FEB3E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/sidebar-show-right-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmpB9D162E5D86BA1CC1AD9E02C6C53E0ED" Guid="*">
++                  <File Id="filF86931421156A0485A730EF4ECC656E4" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/sidebar-show-rtl-symbolic.symbolic.png"/>
+                 </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpACE1B28B3216D8A543CC494F380A3A5F" Guid="*">
+                   <File Id="filCC26F43E3F6BAB5AA9953C28CF87580D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/sidebar-show-symbolic.symbolic.png"/>
+@@ -4318,7 +4333,7 @@
+                   <File Id="filD77ADCC4493C0A9609BF7A40D275751E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/actions/zoom-out-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir22B6CD4141B7EF07EB5875DF49CBB8C7" Name="apps">
++              <Directory Id="dirBADC6817413E1AE877BA99F18E1C71D4" Name="apps">
+                 <Component Win64="$(var.Win64)" Id="cmpF5AD9A0F8B3E5E7D7613853F25E8CF7B" Guid="*">
+                   <File Id="fil46DB7E112393C7C937EF7A67A2BEB52F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/apps/accessories-calculator-symbolic.symbolic.png"/>
+                 </Component>
+@@ -4437,7 +4452,7 @@
+                   <File Id="filF0660271BD348FC2DBF4474BE5292D1B" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/apps/web-browser-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirADDDF22E1E40A0AA456078E8D76DAA18" Name="categories">
++              <Directory Id="dirF93790B788516F24C746A918D32E5FAE" Name="categories">
+                 <Component Win64="$(var.Win64)" Id="cmp633B66D9482C1A75EF01B122F1209585" Guid="*">
+                   <File Id="fil04ACBFE397D2CD8538EA5EC4F876050C" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/categories/applications-engineering-symbolic.symbolic.png"/>
+                 </Component>
+@@ -4499,7 +4514,7 @@
+                   <File Id="fil1BCE558B275C92D0DF7FD954083D7051" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/categories/system-help-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir276F782C3D04C8B0B13383915336C3C7" Name="devices">
++              <Directory Id="dir465367A1D8024832621DDA5C918D52FA" Name="devices">
+                 <Component Win64="$(var.Win64)" Id="cmp1EBE5377FEB85940700217BA08C959F2" Guid="*">
+                   <File Id="fil239297BA14921E7CD6437B1907199EAD" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/devices/ac-adapter-symbolic.symbolic.png"/>
+                 </Component>
+@@ -4708,7 +4723,7 @@
+                   <File Id="fil8DE80F09AC413FD5EBCBA38BDFA351E1" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/devices/video-single-display-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir08F71E5AA8B7B8B1ACDB5B35284259C6" Name="emblems">
++              <Directory Id="dir20B04053A6A9047C2956AB4837BAA1D6" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmp525AD954C3436671A51C78CF5F5E7FF5" Guid="*">
+                   <File Id="fil682731A3502DEA2B38734C408978FFD5" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/emblems/emblem-default-symbolic.symbolic.png"/>
+                 </Component>
+@@ -4758,7 +4773,7 @@
+                   <File Id="fil2F3FBB44740F9E95681478A0097D9CFD" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/emblems/emblem-videos-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir9DF573B307A87B77F00D0355E01C7607" Name="emotes">
++              <Directory Id="dirEB266A412F92177ADAA605B33761C13F" Name="emotes">
+                 <Component Win64="$(var.Win64)" Id="cmp080146148F781C7ECDC3D3B20995336E" Guid="*">
+                   <File Id="filEAAF6764656126DBDF2220C47E2D9FEC" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/emotes/emote-love-symbolic.symbolic.png"/>
+                 </Component>
+@@ -4838,7 +4853,7 @@
+                   <File Id="filB1CFF90645E9AF29D95198E33D29D37E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/emotes/face-yawn-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir2F16062F68B70F7CA4EC3C790D6F9B05" Name="legacy">
++              <Directory Id="dir7382084D21CA4C7F0065D9425B7BC2E9" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmp7693F864147C0B609213D683089B6DF4" Guid="*">
+                   <File Id="filA3B5589DE13F1394E2B64FE8E691842F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/legacy/ac-adapter.png"/>
+                 </Component>
+@@ -5725,7 +5740,7 @@
+                   <File Id="fil8D69CA0CA2CF1009032101869F63C8EA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/legacy/zoom-out.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir4604FA5B8BB00B12589FBFAEC55F50F7" Name="mimetypes">
++              <Directory Id="dir57A4B455B39C3E13E7A34B07B5355F8D" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmpC1D0F7903962F0A8276502503F60ED36" Guid="*">
+                   <File Id="fil9C3A03FB266EAD7A2B04B97571F40798" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/mimetypes/application-certificate-symbolic.symbolic.png"/>
+                 </Component>
+@@ -5868,7 +5883,7 @@
+                   <File Id="filF193CDDEA0C02E5C51B6679AF4602B4D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/mimetypes/x-package-repository.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirEB437DB9A2E6EEF5D58DD46DFC6F08B8" Name="places">
++              <Directory Id="dir29369A575F6CDB936838B91FB9F2660E" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmp65578886F2B25F3BEB5BF0EAAA205454" Guid="*">
+                   <File Id="fil93239871979368040FE7843B34A68338" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/places/folder-documents-symbolic.symbolic.png"/>
+                 </Component>
+@@ -5978,7 +5993,7 @@
+                   <File Id="filF977A1DE719DA3761112BAE0908E4D4B" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/places/user-trash.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirBB8653E133851173E33A8EC2AADBC959" Name="status">
++              <Directory Id="dir80455D9EFB37241BB8B86E333892EA28" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmp0472C09C0A3931704FC260075DBE8736" Guid="*">
+                   <File Id="fil23470523FFFDBDFA37C4D57335BB22DA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/status/airplane-mode-symbolic.symbolic.png"/>
+                 </Component>
+@@ -6529,7 +6544,7 @@
+                   <File Id="filBB3280CB33A28A808181F176F1A45666" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/status/weather-windy-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirBCD3DE289A1AE8AEECB44464A69E76CC" Name="ui">
++              <Directory Id="dir11C92042993E1E92F5AF113C17BE127A" Name="ui">
+                 <Component Win64="$(var.Win64)" Id="cmp9B263CD4ECCF3DA9EBE6605E308E287B" Guid="*">
+                   <File Id="filA0CFC344327561F4F2A563F72CCB8E32" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/ui/checkbox-checked-symbolic.symbolic.png"/>
+                 </Component>
+@@ -6590,9 +6605,6 @@
+                 <Component Win64="$(var.Win64)" Id="cmp402ADDCE55F3827EE38CA3996FFBDAAE" Guid="*">
+                   <File Id="fil6C6773B183A59687F929841ABAF46896" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/ui/selection-start-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp97AB044597B0D5861D68A44767648408" Guid="*">
+-                  <File Id="fil36255691CAD15AFC3C4CB9A0454CEBA6" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/ui/tab-new-symbolic.symbolic.png"/>
+-                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpADDAA22E7A77482B2A183E0C449C04C6" Guid="*">
+                   <File Id="fil19DE24C11A5E05F94E2AB889852C581C" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/24x24/ui/window-close-symbolic.symbolic.png"/>
+                 </Component>
+@@ -6610,8 +6622,8 @@
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dirD86D9297A3EB241A75034CFC69127869" Name="256x256">
+-              <Directory Id="dir05F09AF05719375FD1FAA417A6E8C9D3" Name="legacy">
++            <Directory Id="dirF170F0F608A070E8F11EC2AEE1641C53" Name="256x256">
++              <Directory Id="dir41FAE5C6553F0DEA22072B9529537FEC" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmpD14F6E5763A3950205929896B921203D" Guid="*">
+                   <File Id="fil739C54669C7A29E80FA1A55120257F59" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/256x256/legacy/ac-adapter.png"/>
+                 </Component>
+@@ -7048,36 +7060,24 @@
+                   <File Id="filBE1D56AD2B6B908E33FBFCBFF2BA1485" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/256x256/legacy/web-browser.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir2E003B424A9B9069EAA33A18E103A478" Name="mimetypes">
+-                <Component Win64="$(var.Win64)" Id="cmp84D61C4EF6F18B2037B3F7353B63A6E1" Guid="*">
+-                  <File Id="fil3CF30E1E68D072527C5D89540E2D89E7" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/256x256/mimetypes/application-x-addon.png"/>
+-                </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp7FBB21111E5A83CCBC7171B4A1C06B6A" Guid="*">
+-                  <File Id="fil631B22136DCDEE77869EFE5FAF8DD5AA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/256x256/mimetypes/application-x-firmware.png"/>
+-                </Component>
++              <Directory Id="dir0AFD06B9339C0141AD5866B8ADD9BF53" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmpADF8FFFA2B6BE5B33B6198D0BD1323BD" Guid="*">
+                   <File Id="fil3463D73495FA0C825D53A9F2FD76796E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/256x256/mimetypes/x-package-repository.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir4EDA816E63FF77687480309AFDC00706" Name="places">
+-                <Component Win64="$(var.Win64)" Id="cmpC75C8E4643586201225FA6C6D44B0357" Guid="*">
+-                  <File Id="fil106D85DBF63422F7DE44E547C2C133FE" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/256x256/places/network-server.png"/>
+-                </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp47A6A9FD2E7C4AF715BF5A9522AE89B6" Guid="*">
+-                  <File Id="fil0A6F10A0897EA3E0808B096990112318" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/256x256/places/network-workgroup.png"/>
+-                </Component>
++              <Directory Id="dir8EEF4EF8D17B87A9509D3C2A0467C720" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmpF39065EC230EE5EF97DFB41AEB465491" Guid="*">
+                   <File Id="filC26EDC78E854E400B89A103308BCCB5A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/256x256/places/user-trash.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirD946BE675759A3050136FFF875069A27" Name="status">
++              <Directory Id="dirDF758680175E537D346546EB828F6F7F" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmp64A26F1DB4A837DB72D70CA2BACA4F55" Guid="*">
+                   <File Id="fil4E137DCEEBC32337BB49246429D797B7" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/256x256/status/user-trash-full.png"/>
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dirD3E0A060812A930C0EC7796200374B94" Name="32x32">
+-              <Directory Id="dirCEA6F0FC3D98F4052FCDA11244429640" Name="actions">
++            <Directory Id="dir4B027E2C022ADD40CCD64B477D0265EF" Name="32x32">
++              <Directory Id="dir1FF0A80272543F90024F85F1F7E885A1" Name="actions">
+                 <Component Win64="$(var.Win64)" Id="cmp70328A584E74D3EA4DBD1FC4A174F96D" Guid="*">
+                   <File Id="fil139F5E8F693E6FDE14FCF376075E406A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/action-unavailable-symbolic.symbolic.png"/>
+                 </Component>
+@@ -7153,6 +7153,9 @@
+                 <Component Win64="$(var.Win64)" Id="cmpB8F57E57600262739F9E9208C5565A83" Guid="*">
+                   <File Id="fil65890A7E3FA3E737012CED8EBB696FA6" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/edit-clear-all-symbolic.symbolic.png"/>
+                 </Component>
++                <Component Win64="$(var.Win64)" Id="cmpBEBE279E7CDA77A57D794A7C02434874" Guid="*">
++                  <File Id="filDB42DD80004AE67DB4A0682069D4A0C2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/edit-clear-rtl-symbolic.symbolic.png"/>
++                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp953E709808983446D71F33E1D578E471" Guid="*">
+                   <File Id="fil8B003DF27AB54A1037C68B8CB2422803" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/edit-clear-symbolic-rtl.symbolic.png"/>
+                 </Component>
+@@ -7402,8 +7405,14 @@
+                 <Component Win64="$(var.Win64)" Id="cmp5BED46C02EC1D5075CC41F5B46951B4E" Guid="*">
+                   <File Id="filA735CC50EAF4DD757D9D66A1ADA9A384" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/send-to-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp8DF5AD0FC9746ABEC26E3C617E425D1E" Guid="*">
+-                  <File Id="filBBD05C64CB1F470D4E7DE3909C8C1C7B" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/sidebar-hide-symbolic.symbolic.png"/>
++                <Component Win64="$(var.Win64)" Id="cmpE402DAEC28A0D93D16FEF21FDA40DD54" Guid="*">
++                  <File Id="filE5B6A9756025F631341A43811DE39041" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/sidebar-show-right-rtl-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmp809216680251449C1BC4E9DFF70164A9" Guid="*">
++                  <File Id="fil62266199A74212A3E22675003EC6A7FE" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/sidebar-show-right-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmpE6BC4D8E1580CC7C53B348D60F9DD366" Guid="*">
++                  <File Id="filC3E2EA5B3E403F78E02554310DFD530D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/sidebar-show-rtl-symbolic.symbolic.png"/>
+                 </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp1C8A3DCC4A81F7D77AD2F8127D4B40A1" Guid="*">
+                   <File Id="fil917F88C302EE8F097B79CD8C50321394" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/sidebar-show-symbolic.symbolic.png"/>
+@@ -7511,7 +7520,7 @@
+                   <File Id="fil002B1166ABE72CE0998B2FD30CB5AA1F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/actions/zoom-out-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirCE6F142FF6263E7F51060D1DA649C589" Name="apps">
++              <Directory Id="dir5489D47A82F069FBBECBFCCC29E07FB3" Name="apps">
+                 <Component Win64="$(var.Win64)" Id="cmp577011038D89F228C89477154B73B039" Guid="*">
+                   <File Id="filD2413BDD696FBFF9582C6004468E77CE" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/apps/accessories-calculator-symbolic.symbolic.png"/>
+                 </Component>
+@@ -7630,7 +7639,7 @@
+                   <File Id="fil088DC3211DC0D9C90EBA6A418CA93A88" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/apps/web-browser-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirF3A3447140F66FC9B094991DD0824061" Name="categories">
++              <Directory Id="dir9B7D72D3B1429E7B1CDF10CF2DBA0B4C" Name="categories">
+                 <Component Win64="$(var.Win64)" Id="cmpC4B5E88A24B0C554EBD0D0B283028BAE" Guid="*">
+                   <File Id="fil74AEB5D06FC49C7E1B7064D08CB56F6C" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/categories/applications-engineering-symbolic.symbolic.png"/>
+                 </Component>
+@@ -7692,7 +7701,7 @@
+                   <File Id="fil08C221390714F6F303D2E84FE8529EB6" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/categories/system-help-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirCDC277955DF340A1FBF37340D8680A42" Name="devices">
++              <Directory Id="dir6AE9D2698F8F3681B3D69F16CB39C608" Name="devices">
+                 <Component Win64="$(var.Win64)" Id="cmp7ABEAD8CB5CFC955360E6CFE518F5E2E" Guid="*">
+                   <File Id="fil5C584B1C123934812425B9564A730BA9" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/devices/ac-adapter-symbolic.symbolic.png"/>
+                 </Component>
+@@ -7904,7 +7913,7 @@
+                   <File Id="fil580F5E4B5456190C0948D63AEAD8D9A3" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/devices/video-single-display-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir6B8C9995BAFCB90FA80E13CD94F92171" Name="emblems">
++              <Directory Id="dirE8235469CBB77C11D18EFF895CB7FBDF" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmp9D22B9A6E0F73AFA56762E95349C1239" Guid="*">
+                   <File Id="filE9158396F1D6EA0554B8026C14BC3C10" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/emblems/emblem-default-symbolic.symbolic.png"/>
+                 </Component>
+@@ -7954,7 +7963,7 @@
+                   <File Id="filD34AB319D61FEDA1AA7ED5B93F8C9FA8" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/emblems/emblem-videos-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir4722AEB7F8087AD0EAB938AF28EDBC34" Name="emotes">
++              <Directory Id="dirF331356D454C49127C32AA02C13B5C0C" Name="emotes">
+                 <Component Win64="$(var.Win64)" Id="cmp37FC3D36E6160CFEAE4784AEDB1A26FA" Guid="*">
+                   <File Id="filB2343DB2937631410ED182DD853E6844" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/emotes/emote-love-symbolic.symbolic.png"/>
+                 </Component>
+@@ -8034,7 +8043,7 @@
+                   <File Id="fil485B4C92F1383B76448439E2113F9AC2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/emotes/face-yawn-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirEBA523B340FB3F87CF3FB3E453A62C74" Name="legacy">
++              <Directory Id="dir7F1201BD49401230AD2F654DAFB14BD1" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmp0013781133F264D5467D65A0959E3A50" Guid="*">
+                   <File Id="filE7212610C8731FDD47281B9B86FDE1C0" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/legacy/ac-adapter.png"/>
+                 </Component>
+@@ -8951,7 +8960,7 @@
+                   <File Id="fil4E122A2335CD84014DA2F6AE1E019E04" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/legacy/zoom-out.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir5C22E125299A179FD84FA53200A3178C" Name="mimetypes">
++              <Directory Id="dir51718EF5F1E4673D5C619FAEAB5951BD" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmpB8505E975B3B5BB250BB5D77955D0308" Guid="*">
+                   <File Id="fil0F28204C235B64C4E07AA8CCFF41FE1F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/mimetypes/application-certificate-symbolic.symbolic.png"/>
+                 </Component>
+@@ -9094,7 +9103,7 @@
+                   <File Id="filD83B7ACFFB7E27CF748CAB6DA01FCAC9" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/mimetypes/x-package-repository.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir5DF2140CB58DEFFD65AAA7FDD9B0C0E1" Name="places">
++              <Directory Id="dirFBF8D75C02B02B914F706FD585E333A2" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmp65A18424E418114E7848EAA638191217" Guid="*">
+                   <File Id="fil21ABD6F24EFBB481146BE23000153C48" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/places/folder-documents-symbolic.symbolic.png"/>
+                 </Component>
+@@ -9204,7 +9213,7 @@
+                   <File Id="fil7C8CD7C8F6510AC181A236DE6E2B9A0B" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/places/user-trash.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirC04B1663F2C516C73A35FCBE3E7302A0" Name="status">
++              <Directory Id="dir2FC62E13C56399B4F9FAB7E9C8B62FFF" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmp7E6B4DE21FD240D874975E379A6EB081" Guid="*">
+                   <File Id="fil46B6E062B7EE8EB31536CA3D34626918" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/status/airplane-mode-symbolic.symbolic.png"/>
+                 </Component>
+@@ -9755,7 +9764,7 @@
+                   <File Id="fil1D3E8E776BDE649AC1BB3373A7B9EC3F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/status/weather-windy-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir031CBD9054E9D610E1355F39461BA4EC" Name="ui">
++              <Directory Id="dirAED702CDC3CC0918DF0A2F2D3CDDAF14" Name="ui">
+                 <Component Win64="$(var.Win64)" Id="cmpA1FBAE343FEC79C41542DDA5B9D4CB23" Guid="*">
+                   <File Id="fil0CEEEC066286C16106FF477681A284F8" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/ui/checkbox-checked-symbolic.symbolic.png"/>
+                 </Component>
+@@ -9816,9 +9825,6 @@
+                 <Component Win64="$(var.Win64)" Id="cmp1360979C74352CA7436CF9B71621B83D" Guid="*">
+                   <File Id="fil4D281EBB0BC63C84E71D67183665E3C3" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/ui/selection-start-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmpD363E39DAA2C4B71456176E0F8635581" Guid="*">
+-                  <File Id="filD8522D762936A32501FCFDB535D6D51D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/ui/tab-new-symbolic.symbolic.png"/>
+-                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpF608E9FBFCD7C5CF9A1BCE2A96E2B9FC" Guid="*">
+                   <File Id="fil8296C934D80655528879038671A754BF" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/32x32/ui/window-close-symbolic.symbolic.png"/>
+                 </Component>
+@@ -9836,8 +9842,8 @@
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dir11F7E82AA07DF27586BDE0453E579ABC" Name="48x48">
+-              <Directory Id="dirFDB782AFB91F3A6DBB42280E8568CAA1" Name="actions">
++            <Directory Id="dir6D54C2624F6C651030977783F02E6BAB" Name="48x48">
++              <Directory Id="dirA0438C4C22370C92BA0F3CB798394761" Name="actions">
+                 <Component Win64="$(var.Win64)" Id="cmp5674848C8AAE4170B24BBBAB7D6EB64A" Guid="*">
+                   <File Id="fil9B5147950CB9B606B16F9ED7825FA8D3" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/action-unavailable-symbolic.symbolic.png"/>
+                 </Component>
+@@ -9913,6 +9919,9 @@
+                 <Component Win64="$(var.Win64)" Id="cmp740ADBB3F7EBE4AB4776CB1167999D4E" Guid="*">
+                   <File Id="fil35A9CC4B69953F8FA468807C10FB699F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/edit-clear-all-symbolic.symbolic.png"/>
+                 </Component>
++                <Component Win64="$(var.Win64)" Id="cmp9D023EBCA7079807A681819CF0B238F3" Guid="*">
++                  <File Id="fil6771B103B81860E5F0B85CD0A1DC8FCA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/edit-clear-rtl-symbolic.symbolic.png"/>
++                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp5BE9F9BF308EB51765C70BD9FA1C1C46" Guid="*">
+                   <File Id="filF86C916A70481ED25F13046A4E99AD59" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/edit-clear-symbolic-rtl.symbolic.png"/>
+                 </Component>
+@@ -10162,8 +10171,14 @@
+                 <Component Win64="$(var.Win64)" Id="cmp4B970AC70192A4DD089CAC5528671E4A" Guid="*">
+                   <File Id="fil01966805C923E01B017AA9FDBE3862B3" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/send-to-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp87D55910E3D43A273FA8272447945B65" Guid="*">
+-                  <File Id="fil1E18EE9B8C41A728FB00318137B5CCE0" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/sidebar-hide-symbolic.symbolic.png"/>
++                <Component Win64="$(var.Win64)" Id="cmp4CEF33A73B8BFF5E22E8C7615D6CF360" Guid="*">
++                  <File Id="filD541261C4F2DBD2D75D4DFFE8AD0D5B2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/sidebar-show-right-rtl-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmp61E76D1BF15A1A827AF69B98F3164AF3" Guid="*">
++                  <File Id="filA8E5D20D5DAA07C5131116A9979D1A3A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/sidebar-show-right-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmp4045B92729577963C7A91257EE2D5533" Guid="*">
++                  <File Id="fil5215C3F73A17FC0CBA00FFB1B712BBD1" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/sidebar-show-rtl-symbolic.symbolic.png"/>
+                 </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp47AE23C3423686C2FCC87177A44ED05C" Guid="*">
+                   <File Id="fil2C652AC4DC831273E557CBC305F63644" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/sidebar-show-symbolic.symbolic.png"/>
+@@ -10271,7 +10286,7 @@
+                   <File Id="fil4A42D38AB80BDE069C383AD01A0A8674" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/actions/zoom-out-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirE4B4E8B4E62B9331C4A4E7F77D2BABFC" Name="apps">
++              <Directory Id="dir54F8A31B40AF74E6D8F6D7E4C534A0A8" Name="apps">
+                 <Component Win64="$(var.Win64)" Id="cmpE8E074609C7A999F539A04D0FC4224ED" Guid="*">
+                   <File Id="fil0A45200C1674C89F722FE024489A2F33" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/apps/accessories-calculator-symbolic.symbolic.png"/>
+                 </Component>
+@@ -10390,7 +10405,7 @@
+                   <File Id="filA9C8C97CC935FC4ED8A8E99A2AA2987A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/apps/web-browser-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir7C72FDCDDC96AD171E03A48A55904C3A" Name="categories">
++              <Directory Id="dir6D712DBCE26EF7868508D5912ED95077" Name="categories">
+                 <Component Win64="$(var.Win64)" Id="cmp00CFDA27AEA63D12A01655033335C639" Guid="*">
+                   <File Id="fil69A8E06655607ADBC1702ABB4BF2E98A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/categories/applications-engineering-symbolic.symbolic.png"/>
+                 </Component>
+@@ -10452,7 +10467,7 @@
+                   <File Id="fil29CB6ED0A50B9E2E10E524CB3F6F2293" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/categories/system-help-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirB71642AC0A501E0E498AF509CD19064F" Name="devices">
++              <Directory Id="dirEC791C8259C5AA4A8609D8243978AFD2" Name="devices">
+                 <Component Win64="$(var.Win64)" Id="cmp48E089FC3E2EB26D452417FCB92DBD22" Guid="*">
+                   <File Id="filF2795F3613D5ABBAB4CB53811AA37733" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/devices/ac-adapter-symbolic.symbolic.png"/>
+                 </Component>
+@@ -10664,7 +10679,7 @@
+                   <File Id="fil2754B2487117FC9925F5E0F1A165BC7A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/devices/video-single-display-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir4D71D8EEE336CB985F3E13E544DC5F22" Name="emblems">
++              <Directory Id="dirE671067E514FFBD9568DA2537A424326" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmpB58F77226B558C0474D141DB4A600BE1" Guid="*">
+                   <File Id="filB8680AC4EB9D77815B1DBAB54C633DC2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/emblems/emblem-default-symbolic.symbolic.png"/>
+                 </Component>
+@@ -10714,7 +10729,7 @@
+                   <File Id="fil0F9E2236D5B2CD1655A82E20258EA6D1" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/emblems/emblem-videos-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir71313746E56D9CBB45F96B66740D3C22" Name="emotes">
++              <Directory Id="dirC0DE3D20C2DAB3D51F3DBC7269936F71" Name="emotes">
+                 <Component Win64="$(var.Win64)" Id="cmp46C75E675B2E0E897363D9EB9E2406B5" Guid="*">
+                   <File Id="fil17BF6618EE53F777C6C404687F88F785" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/emotes/emote-love-symbolic.symbolic.png"/>
+                 </Component>
+@@ -10794,7 +10809,7 @@
+                   <File Id="filBB814D5F97E6471AF8710E77114C783D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/emotes/face-yawn-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir0AB237F50C603F6A2E1D8D46FD040E79" Name="legacy">
++              <Directory Id="dirE480B88E3BD27D2E1101AE4124C625ED" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmpCFB3C07222B53D25570E736625157E3D" Guid="*">
+                   <File Id="filE5C97DE2CC4FEACB189C27E87D0617F8" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/legacy/ac-adapter.png"/>
+                 </Component>
+@@ -11714,7 +11729,7 @@
+                   <File Id="fil7F18CD4A002C30FC993EBB9CD19C1F22" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/legacy/zoom-out.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirECB0B540EB827565791D288F9DEC6093" Name="mimetypes">
++              <Directory Id="dirC0E9E8A19AF94163B249DAB3CEE32891" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmpE112D5C953B7F574501B9A46A66628F5" Guid="*">
+                   <File Id="fil5B63933FDF3177CFBBA342B03664B225" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/mimetypes/application-certificate-symbolic.symbolic.png"/>
+                 </Component>
+@@ -11857,7 +11872,7 @@
+                   <File Id="filAAE4A068D75DEC0117AF0D33A3D4CCCF" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/mimetypes/x-package-repository.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir6A17EEEB6FE7B6E437DD3D073FEA861F" Name="places">
++              <Directory Id="dirB18B1854007D0F81C2232B6E02D28957" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmpE3495BD58F466770EFE7026F7D2B29CF" Guid="*">
+                   <File Id="filB0B9141BC2357C389130AA35B40C308C" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/places/folder-documents-symbolic.symbolic.png"/>
+                 </Component>
+@@ -11967,7 +11982,7 @@
+                   <File Id="fil74DC9B4A595A4F92ABB3C8654063CFA2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/places/user-trash.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirD217AB0AB932EABC54429561924033FC" Name="status">
++              <Directory Id="dir463E5C1093AC331E5BD6E31F7D31DF93" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmpFAD532FBF88E5D6264ADC6DC8954E759" Guid="*">
+                   <File Id="fil8C0857C91E67AA11647C598147857915" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/status/airplane-mode-symbolic.symbolic.png"/>
+                 </Component>
+@@ -12518,7 +12533,7 @@
+                   <File Id="filB33A7B1F9029E94B1F540B2EF4701308" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/status/weather-windy-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir568E5190A85B1557FC9754A739FF810D" Name="ui">
++              <Directory Id="dir807BD3A7F3515BC51F6EF890D639CDC9" Name="ui">
+                 <Component Win64="$(var.Win64)" Id="cmp68FAE2E010AF6FA9BF119C11488E2AA7" Guid="*">
+                   <File Id="fil5D6DCB5B3BE37B7589923B5AF0AF090F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/ui/checkbox-checked-symbolic.symbolic.png"/>
+                 </Component>
+@@ -12579,9 +12594,6 @@
+                 <Component Win64="$(var.Win64)" Id="cmp186A14519B5A77EC6A055192605AD15A" Guid="*">
+                   <File Id="filEE07A4539EF23ADA5AA1FE14763B06D3" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/ui/selection-start-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmpBE5DCB3186DE95F6ECF9EA8F1662B831" Guid="*">
+-                  <File Id="filEA815351B3131E637E71BECFB194ADBF" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/ui/tab-new-symbolic.symbolic.png"/>
+-                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp9F606714FE5105691EFD20A1E88FED8B" Guid="*">
+                   <File Id="fil28FF4CECB01D8FA80539E202024B469F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/48x48/ui/window-close-symbolic.symbolic.png"/>
+                 </Component>
+@@ -12599,8 +12611,8 @@
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dir55183555CB21E6611C01700AD4100D28" Name="512x512">
+-              <Directory Id="dirB12408C15CA39D8058101A457A0E4301" Name="devices">
++            <Directory Id="dir0188DEB3C30EDCB702ADD1BD117EFDCA" Name="512x512">
++              <Directory Id="dirA4EA84A264D9492381C6647CC6436CA2" Name="devices">
+                 <Component Win64="$(var.Win64)" Id="cmp5347A3BB72C65D12C90B29218980C66D" Guid="*">
+                   <File Id="filD9FF4360A5EA4B95E3C0170DE61F0BE2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/devices/audio-headphones.png"/>
+                 </Component>
+@@ -12635,7 +12647,7 @@
+                   <File Id="fil404D75D485FFB5F73D3ED35965BD76A8" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/devices/printer.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirD2A6B91D1F24905A26786E7D3BD6031B" Name="emblems">
++              <Directory Id="dirF49A85C4EC163C923391CF5A42182A4F" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmp7C7B3A06AB23C55C17DC8C6C07BBCAB3" Guid="*">
+                   <File Id="fil644A4953E0229DE3054EFA9F6DDD8CAC" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/emblems/emblem-readonly.png"/>
+                 </Component>
+@@ -12652,7 +12664,7 @@
+                   <File Id="filAADF1B7F3B2BE33DAB0D08D2C4DB2A63" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/emblems/emblem-unreadable.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirA6C24B8D9E67E9C3474E8BA5F180DDF6" Name="legacy">
++              <Directory Id="dir744F692682C10B9BDE64DCF8D8FD7127" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmp75428272B467B48C0A49150A3C142FE6" Guid="*">
+                   <File Id="fil493FA1A15766C5F719A8864E24B0C029" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/legacy/accessories-calculator.png"/>
+                 </Component>
+@@ -12726,7 +12738,7 @@
+                   <File Id="fil33D08B1BBBEC6C85DA4D4738F5291D3F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/legacy/utilities-terminal.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirE6731D4B9361ECE04282AEC0FFA6A820" Name="mimetypes">
++              <Directory Id="dir539966CEDDA3DF5269A448B5EA682E58" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmp2614D9EA3C2E24A0A7DFA29F3CE0B09B" Guid="*">
+                   <File Id="fil3C538A85521C704520BF26ABD3F90702" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/mimetypes/application-x-addon.png"/>
+                 </Component>
+@@ -12803,7 +12815,7 @@
+                   <File Id="filB240DF8313DA56426E37E145F84D089F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/mimetypes/x-office-spreadsheet.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirBC7D930181057AEA68A32E0DABCC793D" Name="places">
++              <Directory Id="dir9C0E54586BEC4CDC7BB79DD82D00F048" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmp2FD5025C37E12C7C0FCE1D862D7B9F56" Guid="*">
+                   <File Id="fil21FC3CE0CE59F0076D8971AA63847BFB" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/places/folder-documents.png"/>
+                 </Component>
+@@ -12840,6 +12852,9 @@
+                 <Component Win64="$(var.Win64)" Id="cmpACBF9C4B00927879E822DB45469339E6" Guid="*">
+                   <File Id="filF16D9DF7A5AFCBB437BD39C8B59E7658" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/places/folder.png"/>
+                 </Component>
++                <Component Win64="$(var.Win64)" Id="cmp997F7B5407B00F8E436DE3841F7E211A" Guid="*">
++                  <File Id="filE86E7E1EEFC581DD838E8F77941DE822" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/places/network-server.png"/>
++                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpC972907B1407386AD199D82159668FB6" Guid="*">
+                   <File Id="fil14E19A096294B74472AA2C73013556DC" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/places/network-workgroup.png"/>
+                 </Component>
+@@ -12853,7 +12868,7 @@
+                   <File Id="fil857D10F9CEC0B6A6603D3C707B6369C8" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/places/user-home.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirCB762210107446D6719BC7C9010F847D" Name="status">
++              <Directory Id="dir92F0625F3D87BA39260D614F36762FED" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmp9773ACBB29C45B3D6E094B418434C3B6" Guid="*">
+                   <File Id="fil120F4EAC6CBFC6BB1E9B29C551FE9C5E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/512x512/status/avatar-default.png"/>
+                 </Component>
+@@ -12865,8 +12880,8 @@
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dir62E07CE1B9613FA7D0186CF49469677F" Name="64x64">
+-              <Directory Id="dirDA686C516A504A6E39ADB53787796941" Name="actions">
++            <Directory Id="dirB82DD7650347F2954AD659E9D9CE8157" Name="64x64">
++              <Directory Id="dir20361343D3A9246831A1D7F17C6AFC36" Name="actions">
+                 <Component Win64="$(var.Win64)" Id="cmpF1B6DAE9595D6C6961256A550BA01882" Guid="*">
+                   <File Id="filECEB63D3AF76F500F5D5068CD5A63176" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/action-unavailable-symbolic.symbolic.png"/>
+                 </Component>
+@@ -12942,6 +12957,9 @@
+                 <Component Win64="$(var.Win64)" Id="cmp4F22445BD4A9407AD7C08E48C715D5CB" Guid="*">
+                   <File Id="fil00A399AF81F3E574AA13685BAEE4EF18" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/edit-clear-all-symbolic.symbolic.png"/>
+                 </Component>
++                <Component Win64="$(var.Win64)" Id="cmpF435FE68D3D4F39610A722FF5C898BFD" Guid="*">
++                  <File Id="fil678C409DA01A9241CFBFE97AB1B5B2A1" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/edit-clear-rtl-symbolic.symbolic.png"/>
++                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpBB536B73FAFCB8DC7489DFF3777E87D4" Guid="*">
+                   <File Id="filB7BDE7DCD53BCE1A6B98FBC9EB2D9A7A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/edit-clear-symbolic-rtl.symbolic.png"/>
+                 </Component>
+@@ -13191,8 +13209,14 @@
+                 <Component Win64="$(var.Win64)" Id="cmp93C5A98A91FA88FE1944C2CF5980FE67" Guid="*">
+                   <File Id="filDC63FBC9719F225A49D3B65B95C09C55" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/send-to-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmpEECF1613B1FC9FF818F092B0BB107DC6" Guid="*">
+-                  <File Id="filB5D4E51F1762E09AD8C45081B0A268EC" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/sidebar-hide-symbolic.symbolic.png"/>
++                <Component Win64="$(var.Win64)" Id="cmp16FCE8CF00F1A2CB8490F2D4496CFE41" Guid="*">
++                  <File Id="fil40628F0A95ED73A77AB9ABBC58F3321F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/sidebar-show-right-rtl-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmp965DFC46A4E200B5F07E4736630B5A66" Guid="*">
++                  <File Id="filFBD8A6854D9ED3DD1273FB23D4AC958C" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/sidebar-show-right-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmpC5D589B7CD38E919C06E56DD81569D8F" Guid="*">
++                  <File Id="filC15F76F623FB6438D20F54201BF1F1AB" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/sidebar-show-rtl-symbolic.symbolic.png"/>
+                 </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpDE797E0BAA5D68A125CA68341D4EC13A" Guid="*">
+                   <File Id="fil110B9FE552FF3A47174C34A401855AF2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/sidebar-show-symbolic.symbolic.png"/>
+@@ -13300,7 +13324,7 @@
+                   <File Id="fil6C9874A8E4F80AD46116E81E14736471" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/actions/zoom-out-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir5E29CBC68D0DF8DB4B17B5277772F2A1" Name="apps">
++              <Directory Id="dir43C875F86CEFE72BDEBEA0086343087B" Name="apps">
+                 <Component Win64="$(var.Win64)" Id="cmp30D70CF66F3261F8B305976B9E15352C" Guid="*">
+                   <File Id="fil2FF5763A7D0486BEE66AA4021B2B0486" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/apps/accessories-calculator-symbolic.symbolic.png"/>
+                 </Component>
+@@ -13419,7 +13443,7 @@
+                   <File Id="fil8EC4F1304BFC16B789183F1CEAA785BB" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/apps/web-browser-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir706A49C60C94562C064B88098924B42C" Name="categories">
++              <Directory Id="dirBBEAE858066999EF845C8DF31944EFB9" Name="categories">
+                 <Component Win64="$(var.Win64)" Id="cmp8541E451225BEB998C4D85E5E29282D8" Guid="*">
+                   <File Id="filFBC4143AEACC26DEC78864A62C2B4EFA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/categories/applications-engineering-symbolic.symbolic.png"/>
+                 </Component>
+@@ -13481,7 +13505,7 @@
+                   <File Id="fil8A77E1BFE0CF40E866AF998A381F4ED7" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/categories/system-help-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirDA23049E18DC04DD49C3A98BBABFEB1B" Name="devices">
++              <Directory Id="dir85BB5A54BC0BF2EA4F7C96CDC93B33D0" Name="devices">
+                 <Component Win64="$(var.Win64)" Id="cmpFC2AE2F101EFBD5C510D5C5D705ED13D" Guid="*">
+                   <File Id="filD357DB4C96CAEDB5C5813BF6C1BCEA70" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/devices/ac-adapter-symbolic.symbolic.png"/>
+                 </Component>
+@@ -13663,7 +13687,7 @@
+                   <File Id="filF3035F18805CBE1A53F1BEF105FA8D99" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/devices/video-single-display-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir9E0DE0DE0FDFC07BA70B4C229D3E0CD4" Name="emblems">
++              <Directory Id="dirCE797061C28877A2D50F2A12DC75EC50" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmpE8BBF75F60CD9812B183218B7AB78303" Guid="*">
+                   <File Id="filBAFD69F312D31C0C9BC1D749B111DD9A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/emblems/emblem-default-symbolic.symbolic.png"/>
+                 </Component>
+@@ -13698,7 +13722,7 @@
+                   <File Id="fil0ECE34907B46B8D38612920DE1186341" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/emblems/emblem-videos-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirD2FC9A7C13CFD822CBA8EF1F41CE5F19" Name="emotes">
++              <Directory Id="dir3C000E6CF901E514C7466FE488017F62" Name="emotes">
+                 <Component Win64="$(var.Win64)" Id="cmpF92BC3E28418A49AB83B6EB45A6FFB69" Guid="*">
+                   <File Id="filF8094516797E50D1F4401FDB0F4C9EB0" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/emotes/emote-love-symbolic.symbolic.png"/>
+                 </Component>
+@@ -13778,7 +13802,7 @@
+                   <File Id="fil40F014C787B3E1B78C588F42ABDC4BA5" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/emotes/face-yawn-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir7FCF9992A0B051F1450C21A9292A0104" Name="legacy">
++              <Directory Id="dirCD45F83C2EFE6E58758AD795D571EC5F" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmp4460B113EA8A08F17510ADD48B7B834E" Guid="*">
+                   <File Id="fil444DCBE5060A18B8CC46826D5A7A86B9" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/legacy/battery-caution-charging-symbolic.symbolic.png"/>
+                 </Component>
+@@ -13813,7 +13837,7 @@
+                   <File Id="fil2211714AE3C95E3A72517768559067CC" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/legacy/battery-low-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirD98EE5CAF918C40FE91AE0723DD499BE" Name="mimetypes">
++              <Directory Id="dir7E385375473100C24E1D264DA0842D93" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmp758874A34194E2DB6A73A92F5989B373" Guid="*">
+                   <File Id="fil66A8883AE7E97A535372216356B2C536" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/mimetypes/application-certificate-symbolic.symbolic.png"/>
+                 </Component>
+@@ -13872,7 +13896,7 @@
+                   <File Id="filF1F0C542FA38C788B96E2D9375AEDB58" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/mimetypes/x-office-spreadsheet-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir9250F5565DBBC10E1B1C2996CCECEEEF" Name="places">
++              <Directory Id="dir04907AAD6899DA923D79240225051BE0" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmpABAFC3F1192E24B2C024964262F3114F" Guid="*">
+                   <File Id="fil598D23CD761DA9A87665BC9EA9E1F55E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/places/folder-documents-symbolic.symbolic.png"/>
+                 </Component>
+@@ -13925,7 +13949,7 @@
+                   <File Id="fil04622D15DCC13276A7CF05E0C66391F9" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/places/user-trash-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirA1486097D76DEC7436E608A3DF51F573" Name="status">
++              <Directory Id="dir5FA15D64ED58A5D03CA42DD23AD0A0C5" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmp7516A35081793EDA36E7AB0D38B2898A" Guid="*">
+                   <File Id="fil52E1840EE14B592A192A6021096E67D6" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/status/airplane-mode-symbolic.symbolic.png"/>
+                 </Component>
+@@ -14464,7 +14488,7 @@
+                   <File Id="filDC8FD6C76A38BD91EFD9ED9F8EF24AF2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/status/weather-windy-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirE0C9041B59083AF2F583A2806231C4B5" Name="ui">
++              <Directory Id="dir0B7617DE2F00B4B59688D37A964A6B2B" Name="ui">
+                 <Component Win64="$(var.Win64)" Id="cmp6CF683F6CB7C79B0180FF8FC541ED3E4" Guid="*">
+                   <File Id="filA1ACC9302AFA2E3ACE1633CA37D538C1" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/ui/checkbox-checked-symbolic.symbolic.png"/>
+                 </Component>
+@@ -14525,9 +14549,6 @@
+                 <Component Win64="$(var.Win64)" Id="cmpA115A9FDCC339A3D3877EE0401665A95" Guid="*">
+                   <File Id="fil832F33F3216654B0061FD422322A4680" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/ui/selection-start-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmpD7703EE62BBFE233886092224A33885C" Guid="*">
+-                  <File Id="filAA53FCF59BB22A17D6D10468C50CB9A0" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/ui/tab-new-symbolic.symbolic.png"/>
+-                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp1AF42FB3BCA3995DFD2DB9C8CD1AC717" Guid="*">
+                   <File Id="fil1D7D95A810CDD936A7FBB527EC0B6461" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/64x64/ui/window-close-symbolic.symbolic.png"/>
+                 </Component>
+@@ -14545,8 +14566,8 @@
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dirDA8B16E095EEF71C55B45BDE3559316A" Name="8x8">
+-              <Directory Id="dir17FB8E08CB2BD244972ED810810744AF" Name="emblems">
++            <Directory Id="dirA886ACE6DF81CE7D1C6FAB07C2B86D56" Name="8x8">
++              <Directory Id="dir810F906C110918BE36FB6E8AC8B56AA0" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmp7C5C075AA4A424AE307A54967ED8DF2B" Guid="*">
+                   <File Id="fil79CF8E83335AC55CF0134A5237DFFB33" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/8x8/emblems/emblem-readonly.png"/>
+                 </Component>
+@@ -14563,7 +14584,7 @@
+                   <File Id="filC24F55FF6E2EFD7F5F040540275EC56F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/8x8/emblems/emblem-unreadable.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirE50FFB1D77261213B9098692CECFDEE0" Name="legacy">
++              <Directory Id="dir0EC059829786F78AF402BAC97DC56EE4" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmpFEB37088CB1C61B1BBAEDB7BF9CC0140" Guid="*">
+                   <File Id="fil59C2BE54F3B42685E82CAE5A3B216ABF" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/8x8/legacy/emblem-default.png"/>
+                 </Component>
+@@ -14575,8 +14596,8 @@
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dir82FAD546DD9F0B657268C68530A2B926" Name="96x96">
+-              <Directory Id="dir2B54DC0AE9FBF1A654F38D56C981D1BF" Name="actions">
++            <Directory Id="dir89E2AA9F0DB37863B987A1FB9BF0C0E9" Name="96x96">
++              <Directory Id="dir879EBED7BF8A7EBE714D7501EADD97E5" Name="actions">
+                 <Component Win64="$(var.Win64)" Id="cmpDE88CD67EEB420C423128B9892355CE7" Guid="*">
+                   <File Id="fil1FA8A4B990FAF18987B1125DDE5F3712" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/action-unavailable-symbolic.symbolic.png"/>
+                 </Component>
+@@ -14652,6 +14673,9 @@
+                 <Component Win64="$(var.Win64)" Id="cmp15B909213524D5C6AC69D2691E2C9611" Guid="*">
+                   <File Id="fil1BE0E673EEDE6C0FBFE2FC37EB2520C3" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/edit-clear-all-symbolic.symbolic.png"/>
+                 </Component>
++                <Component Win64="$(var.Win64)" Id="cmpE85013A151768224613B14171E74926E" Guid="*">
++                  <File Id="fil02BD40F50F700F5605E016246B66792D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/edit-clear-rtl-symbolic.symbolic.png"/>
++                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp6846431BDAA2D915E1334944AE82B6F3" Guid="*">
+                   <File Id="filC5672663266B787430F753751618A37B" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/edit-clear-symbolic-rtl.symbolic.png"/>
+                 </Component>
+@@ -14901,8 +14925,14 @@
+                 <Component Win64="$(var.Win64)" Id="cmp82126CD66BB2C06CAE2FD726CE38AA10" Guid="*">
+                   <File Id="filE65C150A2CB853E0514A8154ACADF000" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/send-to-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp2A12C633AED52C7058DC7D8DE069EFD9" Guid="*">
+-                  <File Id="fil1410E0ED88A198D10F003017C5E3B0C8" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/sidebar-hide-symbolic.symbolic.png"/>
++                <Component Win64="$(var.Win64)" Id="cmp47DD5A7349D52E7A38CDD1EE1065E353" Guid="*">
++                  <File Id="fil872C860FE59403832AB0CE5B531C6927" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/sidebar-show-right-rtl-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmp69857CAA3E8C9831D8646603B506C466" Guid="*">
++                  <File Id="fil5BBBB0A6148A295757AE396370FBEF83" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/sidebar-show-right-symbolic.symbolic.png"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmp50E3BC91A908A1EC5CD446A27646074F" Guid="*">
++                  <File Id="fil3553C8C6172B9DB00039D16DE8F6FDF1" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/sidebar-show-rtl-symbolic.symbolic.png"/>
+                 </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpC2AC053B94C4B14F1161F2EB37C954EB" Guid="*">
+                   <File Id="fil715EF2374AF1203040894D79BC20D444" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/sidebar-show-symbolic.symbolic.png"/>
+@@ -15010,7 +15040,7 @@
+                   <File Id="filFC96B98609D1E06E0B829C190EBAF100" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/actions/zoom-out-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir7958FB22A4EB584F6F0025FDCBA18048" Name="apps">
++              <Directory Id="dir3DB295FD0F027757CBD6F5D7879A99D9" Name="apps">
+                 <Component Win64="$(var.Win64)" Id="cmpA9C22D5F1E71F6C98A24CAF3418ABE44" Guid="*">
+                   <File Id="fil6BC1B4229E8F127FBD96A6192475A219" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/apps/accessories-calculator-symbolic.symbolic.png"/>
+                 </Component>
+@@ -15129,7 +15159,7 @@
+                   <File Id="fil67F800DC3269531991AE6C82E5BB6E31" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/apps/web-browser-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirE33CB9C2BF823E4A107D7648A9BEDE5B" Name="categories">
++              <Directory Id="dir1E3F394A0EB14E54030095F8629D8B54" Name="categories">
+                 <Component Win64="$(var.Win64)" Id="cmpA6665A275D156E337E509AE865116E02" Guid="*">
+                   <File Id="fil65BFED66819417919AD039874651236D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/categories/applications-engineering-symbolic.symbolic.png"/>
+                 </Component>
+@@ -15191,7 +15221,7 @@
+                   <File Id="fil1485C258EB1A2B8A7121D1D9DF10FFFC" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/categories/system-help-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir854A0E41E38B5439A3D8D450601C6ED9" Name="devices">
++              <Directory Id="dirAAAD61F8CF61EA794819FB84696CE436" Name="devices">
+                 <Component Win64="$(var.Win64)" Id="cmp79BA86A4EEAE7FDAA7251925EB26A0D5" Guid="*">
+                   <File Id="fil9B5DEBA56B6C612DCD321AB152F86A42" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/devices/ac-adapter-symbolic.symbolic.png"/>
+                 </Component>
+@@ -15373,7 +15403,7 @@
+                   <File Id="filA7929874259314907CD0E433A2445781" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/devices/video-single-display-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir86948691C762CC3138B802F712A8E0F6" Name="emblems">
++              <Directory Id="dir500750AC6675339A6BDB468EC9DC1695" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmpB309C86960EBDCC9568CDCBC93E2B999" Guid="*">
+                   <File Id="filDAB18BCDFBF77B4A6DB3433A64AEACA6" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/emblems/emblem-default-symbolic.symbolic.png"/>
+                 </Component>
+@@ -15408,7 +15438,7 @@
+                   <File Id="fil7BA9380972CC7CA6AD76A6FADD86CB0B" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/emblems/emblem-videos-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir7D2561FDFB6AE40CB82BEE14E37FC948" Name="emotes">
++              <Directory Id="dir45D2C8598C0C0F7DD6B8AE28141A9A28" Name="emotes">
+                 <Component Win64="$(var.Win64)" Id="cmp3A06E55EE80732A4D6713D891ADAA4B3" Guid="*">
+                   <File Id="fil3830A34B0CD94A0932A67561102DA76A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/emotes/emote-love-symbolic.symbolic.png"/>
+                 </Component>
+@@ -15488,7 +15518,7 @@
+                   <File Id="fil52FE219C2128B3EAA51ADF8343FD670A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/emotes/face-yawn-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir79273A64B2B701D9291B33F1135A5054" Name="legacy">
++              <Directory Id="dirE02189F817AB68CE4FE90B5D77EB3373" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmp846566F3568EB21D79474FAAA01AF09F" Guid="*">
+                   <File Id="filAB19FAC0B62A97B1EF75156137E4B52D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/legacy/battery-caution-charging-symbolic.symbolic.png"/>
+                 </Component>
+@@ -15523,7 +15553,7 @@
+                   <File Id="fil5302DDBACC286CC340E60D8E6510EBB1" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/legacy/battery-low-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirAAA91FD485CFC377ED6268364D8E65FE" Name="mimetypes">
++              <Directory Id="dirBE8D62DDE2412A664C1411760FA66EAD" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmpA1DD6688B2294B27A68785AE3C8ADE8D" Guid="*">
+                   <File Id="filC632AE3AD2BFF79F3641B75B38A2F67E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/mimetypes/application-certificate-symbolic.symbolic.png"/>
+                 </Component>
+@@ -15582,7 +15612,7 @@
+                   <File Id="fil47383DCED9EB4809545E0F4895C1659F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/mimetypes/x-office-spreadsheet-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir451D9020AD0DD0BD143910371F03E7D7" Name="places">
++              <Directory Id="dirFB6A1FAE0A44232E045E0723FD70E9D8" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmp5343A2F771838C75CFBF171BDF974695" Guid="*">
+                   <File Id="filE0E2CF8038B51E3781957956AE668266" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/places/folder-documents-symbolic.symbolic.png"/>
+                 </Component>
+@@ -15635,7 +15665,7 @@
+                   <File Id="fil8E991691F7D36FD3F9C527E0E9A19250" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/places/user-trash-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir6EEA55651FBAFDD1F4BB2B53419C138C" Name="status">
++              <Directory Id="dir5910F274F522CEBEAE68E5253DE0A9C7" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmp717CC7143F3EDCBFEAA8D75447DE5751" Guid="*">
+                   <File Id="fil2B04E21436FE81326713AB383B26ABAE" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/status/airplane-mode-symbolic.symbolic.png"/>
+                 </Component>
+@@ -16174,7 +16204,7 @@
+                   <File Id="fil16F559A3942D2FA93AD05CB3F49995A2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/status/weather-windy-symbolic.symbolic.png"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir04E1B03D666838C764000959A594B293" Name="ui">
++              <Directory Id="dir08CD016109E1330550713F99D924B7C3" Name="ui">
+                 <Component Win64="$(var.Win64)" Id="cmp27A083B629B6F3D79180F99D493631EC" Guid="*">
+                   <File Id="fil72EAF5AFD2F1DACE187DCC19214649C0" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/ui/checkbox-checked-symbolic.symbolic.png"/>
+                 </Component>
+@@ -16235,9 +16265,6 @@
+                 <Component Win64="$(var.Win64)" Id="cmpF87FDA72883A8E64737F98849C54C2E9" Guid="*">
+                   <File Id="fil7C5EE986407FB3D6DB948BF80124CAF2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/ui/selection-start-symbolic.symbolic.png"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmpFAC9DB15344B14ACAF72F477305E2864" Guid="*">
+-                  <File Id="fil9652984501B2B3CA02A6351400615EDA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/ui/tab-new-symbolic.symbolic.png"/>
+-                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpB84FDFA868EAE609A6E961B2F113EC75" Guid="*">
+                   <File Id="fil21C75C1F61CE5DEAD27C8CD0FD4F96DC" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/96x96/ui/window-close-symbolic.symbolic.png"/>
+                 </Component>
+@@ -16255,7 +16282,7 @@
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dirE45E51F66B9B18ED7EC5F2327B27A0BC" Name="cursors">
++            <Directory Id="dir966E96210604234767FDEA459DF192C6" Name="cursors">
+               <Component Win64="$(var.Win64)" Id="cmpF56C3335538B6696CE1542F39D87EBC7" Guid="*">
+                 <File Id="fil35CEA8058B6994FE4A0607C6E67D6F8A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/cursors/00008160000006810000408080010102.cur"/>
+               </Component>
+@@ -16629,17 +16656,17 @@
+             <Component Win64="$(var.Win64)" Id="cmp18179DF8515CA425A48ADC6AE2793125" Guid="*">
+               <File Id="filB493C3AEFC743AE57F13120D19E2FA7A" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/index.theme"/>
+             </Component>
+-            <Directory Id="dirDC03AA6CEDC607C8092F1AF8AC29377E" Name="scalable">
++            <Directory Id="dir838F64B8BFFABB3F204E329E5D19D71F" Name="scalable">
+             </Directory>
+-            <Directory Id="dirD02BB33F20EEE93B21939F81CB959BF7" Name="scalable-up-to-32">
+-              <Directory Id="dirC7FD4CE1EFE20DC1FBEC03367728BB59" Name="status">
++            <Directory Id="dir84C707CEBCEC15ED7B9EDE1FED78E8AF" Name="scalable-up-to-32">
++              <Directory Id="dirAF27883E0253096C6F8F3A0EA4CFED37" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmpF6566BDC50402F06ABB7F4542A494AF5" Guid="*">
+                   <File Id="fil0CD9C67F4C997937C0806484E5F59B74" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable-up-to-32/status/process-working-symbolic.svg"/>
+                 </Component>
+               </Directory>
+             </Directory>
+-            <Directory Id="dir1086870D56292CB6C16B65F8F9119A80" Name="scalable">
+-              <Directory Id="dir04428005D0BC232774C475A2429C9DD6" Name="actions">
++            <Directory Id="dirE90477ED0608C1799CCA04121943EB62" Name="scalable">
++              <Directory Id="dirF0DAF00B547312A007A6498087B3333D" Name="actions">
+                 <Component Win64="$(var.Win64)" Id="cmp0AD7757F89078CFD53ABCD595FE5E465" Guid="*">
+                   <File Id="fil2844FBD4888A0F991C95F72E286FA937" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/action-unavailable-symbolic.svg"/>
+                 </Component>
+@@ -16715,6 +16742,9 @@
+                 <Component Win64="$(var.Win64)" Id="cmp7BAE5CE4295F7DBEC93F0F592AAE2E9B" Guid="*">
+                   <File Id="filDF430A3B6C42FAD42A04309F4781B262" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/edit-clear-all-symbolic.svg"/>
+                 </Component>
++                <Component Win64="$(var.Win64)" Id="cmp6190F40680BB9ADAC6D972D3072E1A6B" Guid="*">
++                  <File Id="filC0DE05BED500DC593302DC3F20B4A065" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/edit-clear-rtl-symbolic.svg"/>
++                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpAB8160038FA2DD62AC1B4BBD57BCEEA1" Guid="*">
+                   <File Id="filCA72B9BFA687968836EDB4537D551647" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/edit-clear-symbolic-rtl.svg"/>
+                 </Component>
+@@ -16964,8 +16994,14 @@
+                 <Component Win64="$(var.Win64)" Id="cmpE124124018BA31F0DE78F96D57F117B5" Guid="*">
+                   <File Id="fil2ABAF6F7A0D962B29F0E239713061B85" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/send-to-symbolic.svg"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp2DBCAF169CC9D3848FF0C29BF196CC02" Guid="*">
+-                  <File Id="fil4ECA82939CE4EB8FF006438F07E2D769" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/sidebar-hide-symbolic.svg"/>
++                <Component Win64="$(var.Win64)" Id="cmp44CE99B8AD08F4E3F28FFE9DF863E22B" Guid="*">
++                  <File Id="fil7E50ED4F05559B9BB717E192C328DD76" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/sidebar-show-right-rtl-symbolic.svg"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmp43761F1A02F640B2E4523BCB9044EDFE" Guid="*">
++                  <File Id="fil2DBB84379337309F7B33422D1B3ABA8B" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/sidebar-show-right-symbolic.svg"/>
++                </Component>
++                <Component Win64="$(var.Win64)" Id="cmpC05CE3DBF603670C99DE129090D2F0FA" Guid="*">
++                  <File Id="filA706D72813332D725468404D1295881C" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/sidebar-show-rtl-symbolic.svg"/>
+                 </Component>
+                 <Component Win64="$(var.Win64)" Id="cmpAC42131FD4148FC04C48153C4B29E82C" Guid="*">
+                   <File Id="filEB773D272B9B98A5279660F36EF73283" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/sidebar-show-symbolic.svg"/>
+@@ -17073,7 +17109,7 @@
+                   <File Id="fil26B3235C7D0C0F98C0A4817009F1A42F" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/actions/zoom-out-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirCE71CDAAC57359BBA7192190ADF0326A" Name="apps">
++              <Directory Id="dir27C89F8C5646E6060AA7DA71CF3A851D" Name="apps">
+                 <Component Win64="$(var.Win64)" Id="cmp1D242EAB2AFB02E801945A217908A675" Guid="*">
+                   <File Id="filE1ACD27C1B0C48B005B04CCBA75CCADA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/apps/accessories-calculator-symbolic.svg"/>
+                 </Component>
+@@ -17192,7 +17228,7 @@
+                   <File Id="filD6CAC40727315DAECF03B2A63D69C1D4" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/apps/web-browser-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir4DB8C965DF07103FD3C78FCDD1929111" Name="categories">
++              <Directory Id="dir8940F3D13DFAD0E70FD81CA2F0AF7DFA" Name="categories">
+                 <Component Win64="$(var.Win64)" Id="cmp1DFBED55616E1C9821B9E62754B5D74C" Guid="*">
+                   <File Id="fil8035B3BDF450470FD654B2ADEAE1D1BB" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/categories/applications-engineering-symbolic.svg"/>
+                 </Component>
+@@ -17254,7 +17290,7 @@
+                   <File Id="fil390BA2170003BF11B60EDF9EF79F9741" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/categories/system-help-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir255250A118FB517A8649CED4DE9B38EC" Name="devices">
++              <Directory Id="dirF6B25883D72588E6682E4B0935DDB70C" Name="devices">
+                 <Component Win64="$(var.Win64)" Id="cmp6A02C5B353D52AA4C93A5B0315038B70" Guid="*">
+                   <File Id="fil94616A6EE5E6A90A2AB97C79F3488AB8" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/devices/ac-adapter-symbolic.svg"/>
+                 </Component>
+@@ -17436,7 +17472,7 @@
+                   <File Id="fil4FDA5BFCC76948F460F9E6AE93DB63EC" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/devices/video-single-display-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirB6BBB1D80F77AB40AA1707018B13C74A" Name="emblems">
++              <Directory Id="dir2BF720214796B0742F175B0D5583C6B3" Name="emblems">
+                 <Component Win64="$(var.Win64)" Id="cmpC0EB5D4ED7818D324F1E6CF8DD4C138A" Guid="*">
+                   <File Id="fil9564DB232DC6A556357F62F041F8B956" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/emblems/emblem-default-symbolic.svg"/>
+                 </Component>
+@@ -17471,7 +17507,7 @@
+                   <File Id="fil3ECABB6EAD96495E30E381DC3FEF6A4D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/emblems/emblem-videos-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir4FED3A877B442D7764AC098C895EE939" Name="emotes">
++              <Directory Id="dir34DC5C6B39CA16784B448EEB1B770ECD" Name="emotes">
+                 <Component Win64="$(var.Win64)" Id="cmpC361752FF0DDA70CD5FEF76F3DC59076" Guid="*">
+                   <File Id="filC641A05EA0F48E0845A43EB8EE732695" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/emotes/emote-love-symbolic.svg"/>
+                 </Component>
+@@ -17551,7 +17587,7 @@
+                   <File Id="filC25726500D3CA921950BC64CA25AC337" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/emotes/face-yawn-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir824DDFB3C2E30D12314549DCC8BA7BD4" Name="legacy">
++              <Directory Id="dirB8CDC6C09B9971BC40548CD57E29E766" Name="legacy">
+                 <Component Win64="$(var.Win64)" Id="cmp05B9802F3A8168FB48E26CAD12EF7ECA" Guid="*">
+                   <File Id="fil0D2CEACBE1C92D3D0AC4BD70B9AE37F6" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/legacy/battery-caution-charging-symbolic.svg"/>
+                 </Component>
+@@ -17586,7 +17622,7 @@
+                   <File Id="fil3CACF5B23EE2527145A02EA8766B9467" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/legacy/battery-low-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirA14403B5F5AF249B2BF03CE2A8443412" Name="mimetypes">
++              <Directory Id="dir9B6F90FB81B985AF05D48BB3817E1B6F" Name="mimetypes">
+                 <Component Win64="$(var.Win64)" Id="cmp5ABD7E62D668E03D608C861CA9220BF0" Guid="*">
+                   <File Id="fil406F35A01EBA8EE306AF006EEBDD08CA" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/mimetypes/application-certificate-symbolic.svg"/>
+                 </Component>
+@@ -17645,7 +17681,7 @@
+                   <File Id="fil4D39D1D568D1F85E73FDC5E75B01BABD" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/mimetypes/x-office-spreadsheet-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dirD68B7F08BEE16325D9F4E0BAF2100261" Name="places">
++              <Directory Id="dir1BE0F9011782B16F10173DA461F5477B" Name="places">
+                 <Component Win64="$(var.Win64)" Id="cmpC7E03AE33E4F0BFFD3F0F24EFE3C477C" Guid="*">
+                   <File Id="fil969DEDFC5D15BFB5246BB04984153069" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/places/folder-documents-symbolic.svg"/>
+                 </Component>
+@@ -17698,7 +17734,7 @@
+                   <File Id="fil20387DC99A493BFD0F5971FC97EF700E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/places/user-trash-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir582806444F3F06EE1EA1E01C3ADD34C4" Name="status">
++              <Directory Id="dir868CA18E68FDC068E603ACAF8B19D2AF" Name="status">
+                 <Component Win64="$(var.Win64)" Id="cmpC3325AA7F99D974A412693716EBE4509" Guid="*">
+                   <File Id="fil77BFBD479F6504A681909DF3B34939DB" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/status/airplane-mode-symbolic.svg"/>
+                 </Component>
+@@ -18237,7 +18273,7 @@
+                   <File Id="fil2523EA02534D44649CF61AC1862BD2F2" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/status/weather-windy-symbolic.svg"/>
+                 </Component>
+               </Directory>
+-              <Directory Id="dir9E1ABFBC0DF5E22A30856D33A43D8A86" Name="ui">
++              <Directory Id="dir2C45ACEA3921CCF202558F3A2A323B17" Name="ui">
+                 <Component Win64="$(var.Win64)" Id="cmp95B5BCB49ACC420466654F249579E048" Guid="*">
+                   <File Id="filB2B94C434EB424CA8D081BC053C99A01" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/ui/checkbox-checked-symbolic.svg"/>
+                 </Component>
+@@ -18298,9 +18334,6 @@
+                 <Component Win64="$(var.Win64)" Id="cmpF355D2B88E415E7C175E27EFADC178F8" Guid="*">
+                   <File Id="fil1D0C8D4466BD44D2C6FE06ED492EAF8D" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/ui/selection-start-symbolic.svg"/>
+                 </Component>
+-                <Component Win64="$(var.Win64)" Id="cmp08588BA1D1F09C1A4FFEF964758B0118" Guid="*">
+-                  <File Id="fil8CA3E9913869604366A473C10C7FF112" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/ui/tab-new-symbolic.svg"/>
+-                </Component>
+                 <Component Win64="$(var.Win64)" Id="cmp9AE45555D8ACA7377A8527A997F54D5C" Guid="*">
+                   <File Id="filC8F23DDBFA604D16DDF448401E44E73E" KeyPath="yes" Source="$(var.SourceDir)/share/icons/Adwaita/scalable/ui/window-close-symbolic.svg"/>
+                 </Component>
+@@ -18320,6 +18353,11 @@
+             </Directory>
+           </Directory>
+         </Directory>
++        <Directory Id="dir674FB0FE0902B58E22AF6CFAE007CEE2" Name="pkgconfig">
++          <Component Win64="$(var.Win64)" Id="cmpEB6E66974A248F924ABCF9B0B9DA948F" Guid="*">
++            <File Id="filAC18426A41E32DCF8625A14466EA72E6" KeyPath="yes" Source="$(var.SourceDir)/share/pkgconfig/adwaita-icon-theme.pc"/>
++          </Component>
++        </Directory>
+       </Directory>
+     </DirectoryRef>
+   </Fragment>
+@@ -18350,6 +18388,7 @@
+       <ComponentRef Id="cmp931EB33E0EB01E4592D818E7FBB1036B"/>
+       <ComponentRef Id="cmp0AC3F1F74FA2672A14B08ED38D0072DE"/>
+       <ComponentRef Id="cmp03D082E8AA12B7CCE1A3DAEC007F5C3A"/>
++      <ComponentRef Id="cmpE1A8335913EC4BF5C32D0946D3363054"/>
+       <ComponentRef Id="cmp5FF00CA6BCFF49C42DB483CF1193FDCB"/>
+       <ComponentRef Id="cmp871A986662E5BC513441C29411D8E295"/>
+       <ComponentRef Id="cmp84239E088A1FB4CA7F794839844B357A"/>
+@@ -18433,7 +18472,9 @@
+       <ComponentRef Id="cmp91006A69619A92A69995DFEEDF206EC3"/>
+       <ComponentRef Id="cmpDCF124CB164ED2F6ABB1161726ADFD89"/>
+       <ComponentRef Id="cmpA8AA5489580F45FB341ABA3627A6FF03"/>
+-      <ComponentRef Id="cmp0318D13FE3DED7FCEED845A75D01B994"/>
++      <ComponentRef Id="cmpD154FF7027B801A1D5C6C3470BC3057F"/>
++      <ComponentRef Id="cmp1AE957A3F346949405B8CC9E42290C70"/>
++      <ComponentRef Id="cmpBB51555B19D46AEDD700FA38CE0C8DC0"/>
+       <ComponentRef Id="cmp4C75ADB3F38114D7E53300A1EBB8B36A"/>
+       <ComponentRef Id="cmp9FB76FC69F0EBA227CED5766E2529102"/>
+       <ComponentRef Id="cmp5645658EAA11BD512E26648E878B5DF2"/>
+@@ -19235,7 +19276,6 @@
+       <ComponentRef Id="cmp070D35FE1DAF2705CCBCB777B693D7C9"/>
+       <ComponentRef Id="cmp891061743174980F8258DF9AC9678B67"/>
+       <ComponentRef Id="cmpE7D026955FE9E3006EE0B07F2CC7F064"/>
+-      <ComponentRef Id="cmpFA7DD0D009BCE237AD5A11894577F8FF"/>
+       <ComponentRef Id="cmp249163FAB7360ECE771E3705D32C4DC5"/>
+       <ComponentRef Id="cmp903F32164364A651881D3FB8989A9E08"/>
+       <ComponentRef Id="cmp71788B4CE2CED815C0671632A32854E3"/>
+@@ -19630,6 +19670,7 @@
+       <ComponentRef Id="cmp471E306919A295D52092F7BD5B542F75"/>
+       <ComponentRef Id="cmp1D8230280E8F2EE28704271E63D89CFF"/>
+       <ComponentRef Id="cmpA567D51C1E023FFC7AC64A623AA6FC1B"/>
++      <ComponentRef Id="cmpD2366A4C8F0D497093932473C7F618B2"/>
+       <ComponentRef Id="cmp25DBB3634DDADBA81A809290C1C874B0"/>
+       <ComponentRef Id="cmp1F21649579AE56062920EBCA00E12051"/>
+       <ComponentRef Id="cmpA823D613FAFA4BF40BCBD1774F3C8E5F"/>
+@@ -19713,7 +19754,9 @@
+       <ComponentRef Id="cmp649B2A9AB33FC8851282516AFEEB4C28"/>
+       <ComponentRef Id="cmp10ECD797743BB7D02F819FAAA55A8235"/>
+       <ComponentRef Id="cmpCAC4EAA0E0A77622FADC56D5C8D27212"/>
+-      <ComponentRef Id="cmp374A2BDC4F88FFC364B947DEA282A301"/>
++      <ComponentRef Id="cmp8834F6751082062E05590FD708F37563"/>
++      <ComponentRef Id="cmp6477822523DC87E29E37B739A5C153A0"/>
++      <ComponentRef Id="cmpB9D162E5D86BA1CC1AD9E02C6C53E0ED"/>
+       <ComponentRef Id="cmpACE1B28B3216D8A543CC494F380A3A5F"/>
+       <ComponentRef Id="cmpE695E05831615770BC8F742FDDDB5EAF"/>
+       <ComponentRef Id="cmpB77DF6866CA52186863175D71A8510E1"/>
+@@ -20500,7 +20543,6 @@
+       <ComponentRef Id="cmp4D96185F2CF098FB3276FA0F4070E68D"/>
+       <ComponentRef Id="cmp7958D5791A03B354F2930E4BDADA5D29"/>
+       <ComponentRef Id="cmp402ADDCE55F3827EE38CA3996FFBDAAE"/>
+-      <ComponentRef Id="cmp97AB044597B0D5861D68A44767648408"/>
+       <ComponentRef Id="cmpADDAA22E7A77482B2A183E0C449C04C6"/>
+       <ComponentRef Id="cmp4FF39706197DD9E871078BDB2F6A699A"/>
+       <ComponentRef Id="cmpD12F19280C0D04DBEB1F66FD334F7CFE"/>
+@@ -20651,11 +20693,7 @@
+       <ComponentRef Id="cmpD804F7ABFA988AB432EA4DF3F9A0C6C3"/>
+       <ComponentRef Id="cmp06A0C0658352B862DAB0B53B87C54ADC"/>
+       <ComponentRef Id="cmpCB94C47C7C288D59C5D8C721199A7AFF"/>
+-      <ComponentRef Id="cmp84D61C4EF6F18B2037B3F7353B63A6E1"/>
+-      <ComponentRef Id="cmp7FBB21111E5A83CCBC7171B4A1C06B6A"/>
+       <ComponentRef Id="cmpADF8FFFA2B6BE5B33B6198D0BD1323BD"/>
+-      <ComponentRef Id="cmpC75C8E4643586201225FA6C6D44B0357"/>
+-      <ComponentRef Id="cmp47A6A9FD2E7C4AF715BF5A9522AE89B6"/>
+       <ComponentRef Id="cmpF39065EC230EE5EF97DFB41AEB465491"/>
+       <ComponentRef Id="cmp64A26F1DB4A837DB72D70CA2BACA4F55"/>
+       <ComponentRef Id="cmp70328A584E74D3EA4DBD1FC4A174F96D"/>
+@@ -20683,6 +20721,7 @@
+       <ComponentRef Id="cmp35F51E31F1CF1809C9B95FAB65631B13"/>
+       <ComponentRef Id="cmp609E67258F8303EC9817FAD9F3998A54"/>
+       <ComponentRef Id="cmpB8F57E57600262739F9E9208C5565A83"/>
++      <ComponentRef Id="cmpBEBE279E7CDA77A57D794A7C02434874"/>
+       <ComponentRef Id="cmp953E709808983446D71F33E1D578E471"/>
+       <ComponentRef Id="cmpE2397FAED5F6E0F9545EA217207ED19E"/>
+       <ComponentRef Id="cmp39ACF85E26AEB84A1F2C4F6390987283"/>
+@@ -20766,7 +20805,9 @@
+       <ComponentRef Id="cmp082E996235184BC0040AAFBA9FF35B6F"/>
+       <ComponentRef Id="cmpF87B4594F971058402DE46A0DF46B9A3"/>
+       <ComponentRef Id="cmp5BED46C02EC1D5075CC41F5B46951B4E"/>
+-      <ComponentRef Id="cmp8DF5AD0FC9746ABEC26E3C617E425D1E"/>
++      <ComponentRef Id="cmpE402DAEC28A0D93D16FEF21FDA40DD54"/>
++      <ComponentRef Id="cmp809216680251449C1BC4E9DFF70164A9"/>
++      <ComponentRef Id="cmpE6BC4D8E1580CC7C53B348D60F9DD366"/>
+       <ComponentRef Id="cmp1C8A3DCC4A81F7D77AD2F8127D4B40A1"/>
+       <ComponentRef Id="cmpDF4E7C4C37A17B4ED07C7F0279FEE513"/>
+       <ComponentRef Id="cmp4632BB8B96001FD1999D0FBF18532580"/>
+@@ -21564,7 +21605,6 @@
+       <ComponentRef Id="cmp553EE0FABC40CEC5C2526C6B10E780AD"/>
+       <ComponentRef Id="cmpAF128760FE419E42F21ECFB89469F2EB"/>
+       <ComponentRef Id="cmp1360979C74352CA7436CF9B71621B83D"/>
+-      <ComponentRef Id="cmpD363E39DAA2C4B71456176E0F8635581"/>
+       <ComponentRef Id="cmpF608E9FBFCD7C5CF9A1BCE2A96E2B9FC"/>
+       <ComponentRef Id="cmp97F8A85ADC8A09AD66BB2C3AAD5353C9"/>
+       <ComponentRef Id="cmp9F25FE56D62BC2604CF127C4B4AD0898"/>
+@@ -21595,6 +21635,7 @@
+       <ComponentRef Id="cmpAFF38AD3A9F9CFFDEEFC71161925C96F"/>
+       <ComponentRef Id="cmp3D808492B57BC72EB5AAD26C206FDFE9"/>
+       <ComponentRef Id="cmp740ADBB3F7EBE4AB4776CB1167999D4E"/>
++      <ComponentRef Id="cmp9D023EBCA7079807A681819CF0B238F3"/>
+       <ComponentRef Id="cmp5BE9F9BF308EB51765C70BD9FA1C1C46"/>
+       <ComponentRef Id="cmp1E2B14908AD297A34C55C90674DAC399"/>
+       <ComponentRef Id="cmpD84B5A3A5F3AC9FF957C06E8F04370C0"/>
+@@ -21678,7 +21719,9 @@
+       <ComponentRef Id="cmp58A13FE4E704B8AB18CC4E92255C6F6F"/>
+       <ComponentRef Id="cmp8B64684269D1D30ED74CCBAE50E84355"/>
+       <ComponentRef Id="cmp4B970AC70192A4DD089CAC5528671E4A"/>
+-      <ComponentRef Id="cmp87D55910E3D43A273FA8272447945B65"/>
++      <ComponentRef Id="cmp4CEF33A73B8BFF5E22E8C7615D6CF360"/>
++      <ComponentRef Id="cmp61E76D1BF15A1A827AF69B98F3164AF3"/>
++      <ComponentRef Id="cmp4045B92729577963C7A91257EE2D5533"/>
+       <ComponentRef Id="cmp47AE23C3423686C2FCC87177A44ED05C"/>
+       <ComponentRef Id="cmp818F380480DD576B0B6B6BFB5A967E22"/>
+       <ComponentRef Id="cmp89AB96D07682BB078CDF8412D7A6CD0B"/>
+@@ -22477,7 +22520,6 @@
+       <ComponentRef Id="cmp1489A7603F912BA79E1B056278E2FA0F"/>
+       <ComponentRef Id="cmp4E70B140283CBC4E617AD47D85212967"/>
+       <ComponentRef Id="cmp186A14519B5A77EC6A055192605AD15A"/>
+-      <ComponentRef Id="cmpBE5DCB3186DE95F6ECF9EA8F1662B831"/>
+       <ComponentRef Id="cmp9F606714FE5105691EFD20A1E88FED8B"/>
+       <ComponentRef Id="cmp41DF95F5E1856F0EC46A520FA64FF327"/>
+       <ComponentRef Id="cmpC2CDC5FA0EFD3D6EDBA8EA504E05396C"/>
+@@ -22560,6 +22602,7 @@
+       <ComponentRef Id="cmp22490E676169BC848B896B72CD74A61A"/>
+       <ComponentRef Id="cmp5E1226F18D33E1024B3C86A3ED81BD85"/>
+       <ComponentRef Id="cmpACBF9C4B00927879E822DB45469339E6"/>
++      <ComponentRef Id="cmp997F7B5407B00F8E436DE3841F7E211A"/>
+       <ComponentRef Id="cmpC972907B1407386AD199D82159668FB6"/>
+       <ComponentRef Id="cmpC477995ECFD29B28DA1C38556E49FF4E"/>
+       <ComponentRef Id="cmpBEA6DFFBD4C913D75723FF0CE222BC62"/>
+@@ -22592,6 +22635,7 @@
+       <ComponentRef Id="cmpE8D95DC0115F3385C39CA767AD0F1893"/>
+       <ComponentRef Id="cmpD2AF77B50866BD8065520132576D3EDE"/>
+       <ComponentRef Id="cmp4F22445BD4A9407AD7C08E48C715D5CB"/>
++      <ComponentRef Id="cmpF435FE68D3D4F39610A722FF5C898BFD"/>
+       <ComponentRef Id="cmpBB536B73FAFCB8DC7489DFF3777E87D4"/>
+       <ComponentRef Id="cmp7A09AEB8BAF6CC71B913CA6335BB980B"/>
+       <ComponentRef Id="cmp351F5C6735D36FB2C5B52633A3C87E1A"/>
+@@ -22675,7 +22719,9 @@
+       <ComponentRef Id="cmpC226D7A8F716702F9EE95B0F3E6AB496"/>
+       <ComponentRef Id="cmp2FA3B8A2434EC235E5ADBB4E1AE78142"/>
+       <ComponentRef Id="cmp93C5A98A91FA88FE1944C2CF5980FE67"/>
+-      <ComponentRef Id="cmpEECF1613B1FC9FF818F092B0BB107DC6"/>
++      <ComponentRef Id="cmp16FCE8CF00F1A2CB8490F2D4496CFE41"/>
++      <ComponentRef Id="cmp965DFC46A4E200B5F07E4736630B5A66"/>
++      <ComponentRef Id="cmpC5D589B7CD38E919C06E56DD81569D8F"/>
+       <ComponentRef Id="cmpDE797E0BAA5D68A125CA68341D4EC13A"/>
+       <ComponentRef Id="cmpBF41D6BE6162AF4F23A3A068FF842A20"/>
+       <ComponentRef Id="cmpD46D3F4C41441F71881C739A913A1302"/>
+@@ -23113,7 +23159,6 @@
+       <ComponentRef Id="cmpB186BC1DA4BBBB0CD8E70C17B0ABB78F"/>
+       <ComponentRef Id="cmp867CDF82EBCCBA57DF7D3F841EB6E1ED"/>
+       <ComponentRef Id="cmpA115A9FDCC339A3D3877EE0401665A95"/>
+-      <ComponentRef Id="cmpD7703EE62BBFE233886092224A33885C"/>
+       <ComponentRef Id="cmp1AF42FB3BCA3995DFD2DB9C8CD1AC717"/>
+       <ComponentRef Id="cmp1DAC64B2CF7CDC6B24DB2F51ACA49CFC"/>
+       <ComponentRef Id="cmpBEC4D37B6767BA9F0E1C3A4F6E8BF54B"/>
+@@ -23152,6 +23197,7 @@
+       <ComponentRef Id="cmp97EA0C60556ECB7FD49761E36A0FFA10"/>
+       <ComponentRef Id="cmp6BB6E5F90C0FE2EFD41604A4AD8B9879"/>
+       <ComponentRef Id="cmp15B909213524D5C6AC69D2691E2C9611"/>
++      <ComponentRef Id="cmpE85013A151768224613B14171E74926E"/>
+       <ComponentRef Id="cmp6846431BDAA2D915E1334944AE82B6F3"/>
+       <ComponentRef Id="cmpA0649B16FAA17C05E7F87A21F3EBBF03"/>
+       <ComponentRef Id="cmp1A883166B0FA76160592BB83F329742C"/>
+@@ -23235,7 +23281,9 @@
+       <ComponentRef Id="cmp6BF71220E72FE4FCEF428EF5F12D8225"/>
+       <ComponentRef Id="cmp2C8C1BBBC2E35D371C84FF8257368018"/>
+       <ComponentRef Id="cmp82126CD66BB2C06CAE2FD726CE38AA10"/>
+-      <ComponentRef Id="cmp2A12C633AED52C7058DC7D8DE069EFD9"/>
++      <ComponentRef Id="cmp47DD5A7349D52E7A38CDD1EE1065E353"/>
++      <ComponentRef Id="cmp69857CAA3E8C9831D8646603B506C466"/>
++      <ComponentRef Id="cmp50E3BC91A908A1EC5CD446A27646074F"/>
+       <ComponentRef Id="cmpC2AC053B94C4B14F1161F2EB37C954EB"/>
+       <ComponentRef Id="cmp54565BF7DEDACD81CC6EFFD9117AF80A"/>
+       <ComponentRef Id="cmp1ACE8509A75A8450195ECA62EEEB853E"/>
+@@ -23673,7 +23721,6 @@
+       <ComponentRef Id="cmp363651F5C0A02CCF9973C4BF42D4AF6C"/>
+       <ComponentRef Id="cmpF832D7B38B270DACDAA46094FC11173B"/>
+       <ComponentRef Id="cmpF87FDA72883A8E64737F98849C54C2E9"/>
+-      <ComponentRef Id="cmpFAC9DB15344B14ACAF72F477305E2864"/>
+       <ComponentRef Id="cmpB84FDFA868EAE609A6E961B2F113EC75"/>
+       <ComponentRef Id="cmp9F0812E6CECED2DC44BF3CB73A7679FB"/>
+       <ComponentRef Id="cmp8E2727A719586D5CA09589D93CFEA566"/>
+@@ -23829,6 +23876,7 @@
+       <ComponentRef Id="cmp9A5EF179F2BB755794BD71588BAE92A6"/>
+       <ComponentRef Id="cmp98C86571AA928EF1C488F8C87824A6AB"/>
+       <ComponentRef Id="cmp7BAE5CE4295F7DBEC93F0F592AAE2E9B"/>
++      <ComponentRef Id="cmp6190F40680BB9ADAC6D972D3072E1A6B"/>
+       <ComponentRef Id="cmpAB8160038FA2DD62AC1B4BBD57BCEEA1"/>
+       <ComponentRef Id="cmp30B63318724E54CDA9BEF97A2A767B16"/>
+       <ComponentRef Id="cmpFA364692F56D1E83D613900CFBE868FE"/>
+@@ -23912,7 +23960,9 @@
+       <ComponentRef Id="cmpFE011D034B87DD4A7FD9086F635859A3"/>
+       <ComponentRef Id="cmp358149C54AF64ABF3AD5900C0DE662A8"/>
+       <ComponentRef Id="cmpE124124018BA31F0DE78F96D57F117B5"/>
+-      <ComponentRef Id="cmp2DBCAF169CC9D3848FF0C29BF196CC02"/>
++      <ComponentRef Id="cmp44CE99B8AD08F4E3F28FFE9DF863E22B"/>
++      <ComponentRef Id="cmp43761F1A02F640B2E4523BCB9044EDFE"/>
++      <ComponentRef Id="cmpC05CE3DBF603670C99DE129090D2F0FA"/>
+       <ComponentRef Id="cmpAC42131FD4148FC04C48153C4B29E82C"/>
+       <ComponentRef Id="cmp0418F52665120E42A94349AFD0AE036F"/>
+       <ComponentRef Id="cmp105574423E54C73D76210D6DB970A065"/>
+@@ -24350,14 +24400,14 @@
+       <ComponentRef Id="cmp4664033CA154BA8EAFBD820B25688C42"/>
+       <ComponentRef Id="cmpE5F7075DA407BAB7C52EA0D658010D26"/>
+       <ComponentRef Id="cmpF355D2B88E415E7C175E27EFADC178F8"/>
+-      <ComponentRef Id="cmp08588BA1D1F09C1A4FFEF964758B0118"/>
+       <ComponentRef Id="cmp9AE45555D8ACA7377A8527A997F54D5C"/>
+       <ComponentRef Id="cmp4DDC0F2F6FE848063B49ECC6C53EAE1B"/>
+       <ComponentRef Id="cmpA20632A5D55DF930DF1B5795970A6270"/>
+       <ComponentRef Id="cmpA182AB628465C61AC23C6943617159D4"/>
+       <ComponentRef Id="cmpD4949FC14CB0CC189F481F07C084BD99"/>
++      <ComponentRef Id="cmpEB6E66974A248F924ABCF9B0B9DA948F"/>
+     </ComponentGroup>
+   </Fragment>
+ </Include>
+-<!-- generated with msitools 0.101.15-6b44 -->
+-<!-- build/tools/wixl/wixl-heat -var var.SourceDir -p /usr/i686-w64-mingw32/sys-root/mingw/ -component-group CG.adwaita-icon-theme -directory-ref INSTALLDIR -win64 -->
++<!-- generated with msitools 0.101.79-8c74 -->
++<!-- tools/wixl/wixl-heat -var var.SourceDir -prefix /usr/i686-w64-mingw32/sys-root/mingw/ -component-group CG.adwaita-icon-theme -directory-ref INSTALLDIR -win64 -->
+diff --git a/data/wixl/gdk-pixbuf.wxi b/data/wixl/gdk-pixbuf.wxi
+index 6fb5ee8f02d0..d88aaa5f9baf 100644
+--- a/data/wixl/gdk-pixbuf.wxi
++++ b/data/wixl/gdk-pixbuf.wxi
+@@ -2,7 +2,6 @@
+ <?require glib2.wxi?>
+ <?require libpng.wxi?>
+ <?require libtiff.wxi?>
+-<?require jasper.wxi?>
+ <?require gettext.wxi?>
+ <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <Fragment>
+@@ -744,7 +743,6 @@
+       <ComponentGroupRef Id="CG.glib2"/>
+       <ComponentGroupRef Id="CG.libpng"/>
+       <ComponentGroupRef Id="CG.libtiff"/>
+-      <ComponentGroupRef Id="CG.jasper"/>
+       <ComponentGroupRef Id="CG.gettext"/>
+       <ComponentRef Id="cmp4BF448B47E572302678F2495BDE525FC"/>
+       <ComponentRef Id="cmpF2291AFA90FC22D5216EBABA6781C4DB"/>
+diff --git a/data/wixl/gstreamer1-plugins-base.wxi b/data/wixl/gstreamer1-plugins-base.wxi
+index 479e7b49dbee..c8c48afadf21 100644
+--- a/data/wixl/gstreamer1-plugins-base.wxi
++++ b/data/wixl/gstreamer1-plugins-base.wxi
+@@ -56,290 +56,370 @@
+           <File Id="filD084197A284B069DC169CC8A9FB52E1B" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstvideo-1.0-0.dll"/>
+         </Component>
+       </Directory>
+-      <Directory Id="dir1D78D2308F053D91F1F6156087FF9BA2" Name="share">
+-        <Directory Id="dirCB3D28913FC3EC1FB5893B2F2F049B81" Name="gst-plugins-base">
+-          <Directory Id="dir9E4E3360749FFAD8EA6ECAD3765D77EA" Name="1.0">
++      <Directory Id="dir8F8E08157F02A6A8C67E14F692417771" Name="lib">
++        <Directory Id="dirF490492D9A439F4A6910539A61BDFCDD" Name="gstreamer-1.0">
++          <Component Win64="$(var.Win64)" Id="cmp83D83554A4358898789D9CF48A2B7EE4" Guid="*">
++            <File Id="filCB8355D0A0C6712C44CD42EFC885924B" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstadder.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp577891EDF25587C451F9CD9ADEC17950" Guid="*">
++            <File Id="fil16D9F60F1B301EF89BA2D6461A513179" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstapp.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmpDBE70B8247EC74A22BC700164134F68A" Guid="*">
++            <File Id="filB3E23AED2A7A3998F0AAD03425B5CC68" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstaudioconvert.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp07500373A76F96454696CE265ECFAD06" Guid="*">
++            <File Id="filF66E1EE8D6F38D28B31D5A42C059D1E3" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstaudiomixer.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp4B0C983D765E7C44897E9143F454A027" Guid="*">
++            <File Id="filEE3A7FD73839F0546EC7E3C5CA72D7CF" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstaudiorate.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp8F07634CD23193CA1415D2F0F473FDC3" Guid="*">
++            <File Id="fil48259A14A00CE6800B6C3D390E3D7FB1" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstaudioresample.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp50B21AE554E614DB5F48D218A9CA8876" Guid="*">
++            <File Id="fil1A3511A730D342202C7A48F794BE1177" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstaudiotestsrc.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp918E0AEBA6FC5FF3D5B94A1184C6285C" Guid="*">
++            <File Id="fil2160D9AB4EF76792D436FC9508AF9E55" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstencoding.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmpD029B0CC8D7FA3ED85BC55F7CC66F1D2" Guid="*">
++            <File Id="fil36F0B3F7E24CA4E0815A74AF4DD6155B" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstgio.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmpDC3C8D23DA44D4E108BA37606B9EAB31" Guid="*">
++            <File Id="filDEA101373C7E999111BB1FE77260A360" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstogg.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmpA2B8192EEEF78B543A97E5D912EC6C82" Guid="*">
++            <File Id="fil69E09FE64DFE2193F1F7503A5CBA9BFC" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstopengl.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp184B910CE11310C3F0292C7105C0001A" Guid="*">
++            <File Id="fil693F2015587FF9080A7E258F49673D3F" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstpango.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp97826D40B5CA1C20C850C49045E81A7B" Guid="*">
++            <File Id="fil0E4A2CFFA9622676188F6DC084EB7AE3" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstpbtypes.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmpF0F376CE500E6A1CB87AC8E97F050AC4" Guid="*">
++            <File Id="filB6FC625FFF6FE18DD6D15A5F4051CE15" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstplayback.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp79780757B780A2209DDD2DE99B91B1BD" Guid="*">
++            <File Id="filEDA2BB5671B2D0F0B0F20C57E82CE90D" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstrawparse.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp5DF20F103177948AFF7B0096F978571E" Guid="*">
++            <File Id="filD5B01C67254C412DAEC71A6018C7FC37" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstsubparse.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp1F456AADC83A177EF6CEC3561DB64640" Guid="*">
++            <File Id="filE593C101A9C3F3D6A4197988839242A0" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgsttcp.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp7A7F31F99C8D983361015F66F53729D5" Guid="*">
++            <File Id="filF5D07EB0D6DE4C8820F2212C5951AF5D" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgsttheora.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp0362BEEA68CA040AC08716B2EFEDF866" Guid="*">
++            <File Id="fil7F1228A1DC593AA710A1D84F52C5DA04" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgsttypefindfunctions.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp326A1CB7B30B0369B5D763128FEF6AA0" Guid="*">
++            <File Id="fil03FC748F74F4A1E1B6FC99D4BBC26DB9" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstvideoconvert.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp939D4A839FF9245E8128C96C227184AD" Guid="*">
++            <File Id="fil59357296DEC536D150C6A223E41168BC" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstvideorate.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmpD1B506BFA7D278965D0B90C14B773DD5" Guid="*">
++            <File Id="fil094AEB7EF01020EEC05A6746F472451A" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstvideoscale.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp256474F9561CF046B2E8D62461AAE748" Guid="*">
++            <File Id="fil4576D83D39EF72D7A72327AC5B354DB3" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstvideotestsrc.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp1ADDA32E2430CC624791D894B52532FB" Guid="*">
++            <File Id="fil67D53A8283B866828C5AFCC112DE5B69" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstvolume.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp57B84B5CF0B18E3AA6C1032C62BE91F7" Guid="*">
++            <File Id="fil19144BD28AF088CE3568C7C3E3DFB1E6" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstvorbis.dll"/>
++          </Component>
++        </Directory>
++      </Directory>
++
++      <Directory Id="dirD78538F1FCC5DA55808D48E2CF8DF50A" Name="share">
++        <Directory Id="dirC56763653B0E601E093A315DD0170A43" Name="gst-plugins-base">
++          <Directory Id="dir55708361CE5AD054C48552821CB4514C" Name="1.0">
+             <Component Win64="$(var.Win64)" Id="cmpFDC9AB836FA757756C00DA5738D0CD65" Guid="*">
+               <File Id="filD8FF0A5D7E7A8C3D381C8DB8866AF966" KeyPath="yes" Source="$(var.SourceDir)/share/gst-plugins-base/1.0/license-translations.dict"/>
+             </Component>
+           </Directory>
+         </Directory>
+-        <Directory Id="dir8208A826DA212771BD513D7B5C637A87" Name="locale">
+-          <Directory Id="dir746A05EC26C4514E467EFDFC8DF8DDEA" Name="af">
+-            <Directory Id="dir7446ED069A921A83672883010C43408F" Name="LC_MESSAGES">
++        <Directory Id="dir2192E578AA41620D7A7C0CFA88A2CCA9" Name="locale">
++          <Directory Id="dir08C0C9453CBAE02BA6F2FBAE4D798B19" Name="af">
++            <Directory Id="dirCD89A7F4C1C894521642DF7308D8FE6F" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp23ADDEB3FA6E060D51D929E78F8F4433" Guid="*">
+                 <File Id="fil7B1EF3BEBC15225EE7D26DBF38146794" KeyPath="yes" Source="$(var.SourceDir)/share/locale/af/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir471CF82C97AFD1AFD85ADBB7C8585DE9" Name="az">
+-            <Directory Id="dir1AA51146D047A41C7606EE5A1C2CFBB8" Name="LC_MESSAGES">
++          <Directory Id="dirBA8B82D586B3F14165B11D2BAD8B9103" Name="az">
++            <Directory Id="dirD1A9B8CE5C520A4AC06CA6A80AC8956B" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp374EA0F2F1EB285B7C41F86ECC30424F" Guid="*">
+                 <File Id="fil10AE24A5956CF47E645C4B5AE23D14CB" KeyPath="yes" Source="$(var.SourceDir)/share/locale/az/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir2FAA9DB2820FC968B313AB5D3A859DBA" Name="bg">
+-            <Directory Id="dir6A8A5097D84042696170481532C46A83" Name="LC_MESSAGES">
++          <Directory Id="dirDDABA8B68297250DA35125A22BC16FC4" Name="bg">
++            <Directory Id="dir39AD5882BA1186A78D7E49397E711F12" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp7418F23298408BC36A867911CB19315E" Guid="*">
+                 <File Id="fil5799B452E149CD27C9A659967B82A8E3" KeyPath="yes" Source="$(var.SourceDir)/share/locale/bg/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir1E5B64BF9D64D6F7454EF527CBE14A73" Name="ca">
+-            <Directory Id="dir22EA386EC6E1928EF5E331F012A2699D" Name="LC_MESSAGES">
++          <Directory Id="dirC9F969463587B56960ABD15CA305D52B" Name="ca">
++            <Directory Id="dirA56AAD5DED9F84C2120B6C1AAB13F9D7" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp921042D3361F155F65EEE3D0083EBB8D" Guid="*">
+                 <File Id="filA12A02C80CE551CA0DE0073FAED4D178" KeyPath="yes" Source="$(var.SourceDir)/share/locale/ca/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir7276A4484F7BBBC24D1ABF9CA404C0DA" Name="cs">
+-            <Directory Id="dir6D1AE45C7ED839FD35CEF25A8339066F" Name="LC_MESSAGES">
++          <Directory Id="dirCC9650586F2670286DA84641FDFB01F8" Name="cs">
++            <Directory Id="dirBE7F35391C3026B49FBFC726EF66E204" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp0DCCE6A2EABEF192A08FFA6403FF72B2" Guid="*">
+                 <File Id="fil7644B16BA95334BB200E920B651E3961" KeyPath="yes" Source="$(var.SourceDir)/share/locale/cs/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir04A21960BA96409D4960618C8C0DA491" Name="da">
+-            <Directory Id="dirE3ADEAAF256855D95B14258E8EAC6D59" Name="LC_MESSAGES">
++          <Directory Id="dirACA2863BD420CAC4460074623421F8BB" Name="da">
++            <Directory Id="dir029C40AB6E576636A98A6C543FFC3BEF" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp41FF70F28623C5981423F12A7DE50B1B" Guid="*">
+                 <File Id="filF8481E7A411313E13B95FF13A692039E" KeyPath="yes" Source="$(var.SourceDir)/share/locale/da/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirEB6C40646C3327304537578DFE220483" Name="de">
+-            <Directory Id="dirCD1274C1E8E8F16612B9D3E7D376839F" Name="LC_MESSAGES">
++          <Directory Id="dir5F038D186EA4F44B12E16874555CE285" Name="de">
++            <Directory Id="dir52AC219A5B250410D5412BB146C3A53C" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpEA6BAEA853D2A8FDB759BC752B8D3920" Guid="*">
+                 <File Id="filCD5EA42AD3B4B0E506C9D996A5442463" KeyPath="yes" Source="$(var.SourceDir)/share/locale/de/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirBB22A471A584125CE6FE5502FE05E996" Name="el">
+-            <Directory Id="dirA9FB5281D4C87FDE088FDDB35E18EFDC" Name="LC_MESSAGES">
++          <Directory Id="dirB0E2318E847B18800C0782556698ED60" Name="el">
++            <Directory Id="dirFEFB0FD0FB75B8F21F5692314DB7E3C7" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpF2648C77A2B98310FD660A56946F4F6C" Guid="*">
+                 <File Id="fil35F2E41F36DA0A285FC3E61D810B6D53" KeyPath="yes" Source="$(var.SourceDir)/share/locale/el/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir80C48DB6C5CB2031ADD9B70180F3A50E" Name="en_GB">
+-            <Directory Id="dirA733CB833A9F1B5543695AA17B60B4F4" Name="LC_MESSAGES">
++          <Directory Id="dirEE8AE269015DDE749215000EC79D3443" Name="en_GB">
++            <Directory Id="dirBBFD702EEE8860005F3D6079F7DFABEA" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp424DC15017AFF4D6E3F05736EE159B42" Guid="*">
+                 <File Id="fil1536F9A761A03698005EBD71ACB121F9" KeyPath="yes" Source="$(var.SourceDir)/share/locale/en_GB/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir1C8A5CFB4BD3DFA6EA8EC7A5400C2CE9" Name="eo">
+-            <Directory Id="dir73712D544394B6C72BE3A81513D684A7" Name="LC_MESSAGES">
++          <Directory Id="dir70E94AAF3A8E1A93208CFEB74943881B" Name="eo">
++            <Directory Id="dir563EB7DE8E3D83E116F9B72F56A7E70F" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp00EFA8700D67E5290778634C4EFF7995" Guid="*">
+                 <File Id="fil310D3A34DCD3F1128E37CB68A80C3F27" KeyPath="yes" Source="$(var.SourceDir)/share/locale/eo/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir338666F25915505E61D76DBE141FC405" Name="es">
+-            <Directory Id="dirCEB859BB5E5F63AF982A50FEEE6E9C83" Name="LC_MESSAGES">
++          <Directory Id="dir3AFDEA6CB94F6DA1BE2ACD77BE19105F" Name="es">
++            <Directory Id="dir2BE72CA48AC5C3ECF6A3E99AE367E697" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp667EF377B742674CDA3211669123376D" Guid="*">
+                 <File Id="fil16C38758DB966E518F685E320AD93B97" KeyPath="yes" Source="$(var.SourceDir)/share/locale/es/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir48D0EEF4FD26565869BF827A4356C2A7" Name="eu">
+-            <Directory Id="dir1481416AC9CD72DF12D699734D9BDCE7" Name="LC_MESSAGES">
++          <Directory Id="dirA70DD2A7DE62C3AC8216400DAB28ED39" Name="eu">
++            <Directory Id="dir61ACFCD69433A7FAB854248B85C29684" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpC59F69977B0A224F5E0A07E9C14711FE" Guid="*">
+                 <File Id="fil6BE59E82C082911E462C6064A19B3871" KeyPath="yes" Source="$(var.SourceDir)/share/locale/eu/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirBB3FBDF81DBA75CE87583AC4B8F24F00" Name="fi">
+-            <Directory Id="dirDBB11060BD81712A0B87A33F62181292" Name="LC_MESSAGES">
++          <Directory Id="dir72F8A518229AAEDDB7B82FEC754C4B44" Name="fi">
++            <Directory Id="dir19C3734355B17E9AC27BCAAC6DA22B10" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp1831215F1F0442D01DBCE0C708E2BDA2" Guid="*">
+                 <File Id="fil2847940A2CE7138787506A483BE27815" KeyPath="yes" Source="$(var.SourceDir)/share/locale/fi/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir6FD6393B8E8A0499EB123BEB93FAA4BB" Name="fr">
+-            <Directory Id="dir1885A542255270EBCBA6F0C577D07A41" Name="LC_MESSAGES">
++          <Directory Id="dirFBC17487ADE3C29ADC845A5E64BD54A1" Name="fr">
++            <Directory Id="dir263032898974C2C828ACF2CF3B8D2DBD" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpCE8A25994224AFB249A3D73C3BC24D97" Guid="*">
+                 <File Id="filD8FA258A08D1DB6FFAB9F66ABDDF8245" KeyPath="yes" Source="$(var.SourceDir)/share/locale/fr/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirF2F836CDADF06102EBEBA32B18DB4FA6" Name="fur">
+-            <Directory Id="dir6282D89D8097B1D5070095CA74699B3E" Name="LC_MESSAGES">
++          <Directory Id="dir2A8B1F7E7EEEAAA2EA06B98E255DCF9B" Name="fur">
++            <Directory Id="dirEBD9FD7BDDACF7689D1D031E619FD730" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpCC0284EEB3FC2359892FC2233C752FF2" Guid="*">
+                 <File Id="filF052184D1CE412CA10DDB98780A147AD" KeyPath="yes" Source="$(var.SourceDir)/share/locale/fur/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir92636BADBEF2066B127C17FB2158A435" Name="gl">
+-            <Directory Id="dirFEBE7D9DBD760136BE642D213C6B9ADC" Name="LC_MESSAGES">
++          <Directory Id="dir2820E1B2AF8D22D87C43A354EE418EDB" Name="gl">
++            <Directory Id="dir7210AF8CA05D5EB6D53BD9B0F2B3DABA" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp29740F525EA0C1CF202372532FD9804A" Guid="*">
+                 <File Id="fil0A64F183B86DD0EFA4A344D6D70D9840" KeyPath="yes" Source="$(var.SourceDir)/share/locale/gl/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir43752242D66D00A1835AA6FD663316C0" Name="hr">
+-            <Directory Id="dirE5E756D0401B6F28F4871443A44AFD3E" Name="LC_MESSAGES">
++          <Directory Id="dir1FCFD7FC8EC02BA43849F02B5C8B49BF" Name="hr">
++            <Directory Id="dirF399F5DF6EDCD50C9AC2509494B08316" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpEC30B8184E65209A4B0A65A5DFF21444" Guid="*">
+                 <File Id="fil162AEA6B4710D6184B6747F597E3655C" KeyPath="yes" Source="$(var.SourceDir)/share/locale/hr/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir91A19CFCEB8DC42EBCAC532BD816C2E8" Name="hu">
+-            <Directory Id="dir46E95DAB5FBE92D4378D7C7A23267DFA" Name="LC_MESSAGES">
++          <Directory Id="dirFDFAAFE22DE909657D30880CAB267DA3" Name="hu">
++            <Directory Id="dir64AB617F490313B8C917F41C0E9F7BA6" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpBD081BCE1227E4CB31693E7CD3212195" Guid="*">
+                 <File Id="fil16A0EB0FD98AD141F05CD62FB568B657" KeyPath="yes" Source="$(var.SourceDir)/share/locale/hu/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirEC01CA7E7B20858E4122EE423FB1DAF8" Name="id">
+-            <Directory Id="dir465085AD75D63580D5B84D5E9BB995AE" Name="LC_MESSAGES">
++          <Directory Id="dir4AD2CEB4993246CF4766223C98672EF3" Name="id">
++            <Directory Id="dir789FB60A1271DE0496EA2C1804990A0A" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp26B6F41D3350113058E1071CB8920880" Guid="*">
+                 <File Id="fil31AE1AC4726B29BEDDC892F0D74B0D35" KeyPath="yes" Source="$(var.SourceDir)/share/locale/id/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir798769AB2E690C3D80FBF2276B84D935" Name="it">
+-            <Directory Id="dir083303FBB67A0E1177686DE8DB754515" Name="LC_MESSAGES">
++          <Directory Id="dir5D8D03F374B1F5FB92E9BB3BAC19B0FA" Name="it">
++            <Directory Id="dir9BEF75BE1E9E0E2865F2D5A117F3445D" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpBF99BFB00494EC9CD6D516FE23275757" Guid="*">
+                 <File Id="filE4498AB6A0AF4E471AAE0DEFFC25FDF5" KeyPath="yes" Source="$(var.SourceDir)/share/locale/it/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir0E66EE89BFB0A5B6DE1138A344F72FD0" Name="ja">
+-            <Directory Id="dir3CF513EA8249FDA0B7E73CE5047936E6" Name="LC_MESSAGES">
++          <Directory Id="dirEDBCE39E1984E8548F71B4D3CE19FF5F" Name="ja">
++            <Directory Id="dirAE6F0C5ECE935219A2513F8BC1B6563E" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpBA25083739CE9A26250D2F8C18B155BC" Guid="*">
+                 <File Id="filA72A2538A575A6CBE459289AF20764A2" KeyPath="yes" Source="$(var.SourceDir)/share/locale/ja/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir0BFDCF9A0F0BCD41D9516E2EF296C4A7" Name="lt">
+-            <Directory Id="dir5D4EDC0DC42F2D776680D0570581384F" Name="LC_MESSAGES">
++          <Directory Id="dirD635EC84A29EDA88489578F510CBC18B" Name="lt">
++            <Directory Id="dirD59933FA09071B3EAB0F4D525A8FD3A3" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpC529D7612EB7F66E381B80A99914D946" Guid="*">
+                 <File Id="fil321AEBF011E01F708C335DBB198D9468" KeyPath="yes" Source="$(var.SourceDir)/share/locale/lt/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir832F7118FC7A81C62E21B08079F3749A" Name="lv">
+-            <Directory Id="dirD6BADAE7D26E048E8ED28C019EE39B12" Name="LC_MESSAGES">
++          <Directory Id="dir384B25DEE976B5715786601AE9D12D2A" Name="lv">
++            <Directory Id="dir495403047E87D6163AA22FAEFB82D0A1" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp8177A6B81C2C6AAA5EC614758180EAED" Guid="*">
+                 <File Id="fil643E8403D3BFE5D1762C06B653761846" KeyPath="yes" Source="$(var.SourceDir)/share/locale/lv/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirA0C2ACADC9749AC3F3440263B4CAE175" Name="nb">
+-            <Directory Id="dir9B610CA70CF43C4D56524A40736C7DED" Name="LC_MESSAGES">
++          <Directory Id="dir62B4F3B449C957900A17CE110DC528E2" Name="nb">
++            <Directory Id="dir69A7530454310BCBF9EB7A6B4B69B677" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp6A704FFB4B8CE8E1E813846EAA8F3D22" Guid="*">
+                 <File Id="fil408926F93F031FEE6B62A4F9812DF5CE" KeyPath="yes" Source="$(var.SourceDir)/share/locale/nb/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirB95720CDEE935AAA34644BAD529D4BCE" Name="nl">
+-            <Directory Id="dir2435D7B330C615C3994DA6857BFE4EF5" Name="LC_MESSAGES">
++          <Directory Id="dir2BDD9A702F39F8BA9D4BE772EE1A8F7A" Name="nl">
++            <Directory Id="dir5BA01CE372CFD774EB656721AFD13B2C" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp2DA9EC80DEA9898BC078D037327128BB" Guid="*">
+                 <File Id="filA444763B10D4AC45B1B9375BE7190650" KeyPath="yes" Source="$(var.SourceDir)/share/locale/nl/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir7D5AB04AF37DED375B9BCCB960D6C533" Name="or">
+-            <Directory Id="dirC5620F56AB0D01F382CEF4CD92A04983" Name="LC_MESSAGES">
++          <Directory Id="dirB1A2892A4AF81D49C1924EF694D3AF4E" Name="or">
++            <Directory Id="dirAAC32B76EB2A77BDFD14D7FE64683FF5" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp781E542C40754EB992B07B82EC6909B4" Guid="*">
+                 <File Id="fil6917337DCB358FFA0EAF45E321D0D0F6" KeyPath="yes" Source="$(var.SourceDir)/share/locale/or/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir92F87E3CAF2387A9263B787C54EA532A" Name="pl">
+-            <Directory Id="dir8D0F39874EEA4A9787142B87D361E3A5" Name="LC_MESSAGES">
++          <Directory Id="dirE70FD8F3754498DFD3E9486FEC48312F" Name="pl">
++            <Directory Id="dirAA0D9DDE66291B050CF63547C6A02562" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpA5B91D73EA0BF9C237A91796A0920C6C" Guid="*">
+                 <File Id="fil6FC621A14ABC66AC108DF0E5E3A9960E" KeyPath="yes" Source="$(var.SourceDir)/share/locale/pl/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir4F8B0DBBE29A0A8030BD593DA3F59541" Name="pt_BR">
+-            <Directory Id="dirCFAE42361C3EFA94242502871A505C13" Name="LC_MESSAGES">
++          <Directory Id="dir57C5E270EA9F23CDE65DD2D19F003897" Name="pt_BR">
++            <Directory Id="dirC95FDCC4B7099EE972E78A93940BE878" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpE45597C7D47F0D0DCEA997752804E4D5" Guid="*">
+                 <File Id="fil462BE0C8A7610C0D63F3618B07BF70F4" KeyPath="yes" Source="$(var.SourceDir)/share/locale/pt_BR/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir42BAC64EFDD33C05845252DC058E35B6" Name="ro">
+-            <Directory Id="dir5AB0E694099ABF219D0F6AD6B16D0F68" Name="LC_MESSAGES">
++          <Directory Id="dirB111584B8A41032654F42B4A8565C7C8" Name="ro">
++            <Directory Id="dir518FC03884F92CF46827CDFD0952999B" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp11403B86EED142EF621BB7C51F593B42" Guid="*">
+                 <File Id="filDFE74D998E6BC151F81C0885DA0E35F7" KeyPath="yes" Source="$(var.SourceDir)/share/locale/ro/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir368E73961272B562CDDFB4EA907B3F16" Name="ru">
+-            <Directory Id="dirCE912C77BA8F32D30DED9E849F420AC3" Name="LC_MESSAGES">
++          <Directory Id="dirDBFEF798FD96ED45744E49CCEC169762" Name="ru">
++            <Directory Id="dir61D8ED8FBB10476F6AE9CE050588F984" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpD65E3A83A721660FDD151EB356D69801" Guid="*">
+                 <File Id="filE2FAEC6F5AD33D04FF0B7EFD4E7289D2" KeyPath="yes" Source="$(var.SourceDir)/share/locale/ru/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir4219A9A9BC50DCABCA0F85B60F6EBB76" Name="sk">
+-            <Directory Id="dirA7956DF08991FB1084B08872D3368F3C" Name="LC_MESSAGES">
++          <Directory Id="dir194743073B192316772A2CE5090B580A" Name="sk">
++            <Directory Id="dir5E9B94391ED40EF2415B654A771AC42D" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpE04F2133E5CC98E71E9F4AB95F2C6C34" Guid="*">
+                 <File Id="fil5D952357C7A27D8A740528C8872B24D2" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sk/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirE2C2FB8C9B19283F5041D7C4A28B2012" Name="sl">
+-            <Directory Id="dir33F97D99A0F95502570000DB6863436F" Name="LC_MESSAGES">
++          <Directory Id="dir1099D2622347BDE9519B0C1C1C6DE950" Name="sl">
++            <Directory Id="dir45875115C5F248096EC5658351DAE256" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpE182DC02F70B47A291F2BDB94FFEFD3D" Guid="*">
+                 <File Id="fil34364D10187A4DE929F07E008A397F8B" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sl/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir7503F7E6A5F7E2D4866FB6FBEE688B0D" Name="sq">
+-            <Directory Id="dir15A231545C82CF8CE59B18F637D28B68" Name="LC_MESSAGES">
++          <Directory Id="dirFD27B3F058FAFC0F422CAA1F001E9953" Name="sq">
++            <Directory Id="dir75E4D3142AC6E9D519F70DCE30B081D7" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp6EEB9872AD2091CA059BB04DD2D8B14E" Guid="*">
+                 <File Id="filF15BB02ECCDA9BF3C994C774D8B13EE2" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sq/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir026BE39A508EB0B6067BAB7ACF731357" Name="sr">
+-            <Directory Id="dir72370E759077812469B1C9545C515EB1" Name="LC_MESSAGES">
++          <Directory Id="dirF8740D3772CFB4465673252DB04F1647" Name="sr">
++            <Directory Id="dir53F3153371771701E0BFF687E5E05FE2" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpE6EC87AE877A0218844E903DD337D65C" Guid="*">
+                 <File Id="filC971355A04AD9810A2081551EFD37C57" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sr/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirEAAB9E3F84EB88B2C21CC99C7343070A" Name="sv">
+-            <Directory Id="dir933AFBCD7E75AB358287906474B9D7CA" Name="LC_MESSAGES">
++          <Directory Id="dir4E1B053C6F475337721642A8598AF416" Name="sv">
++            <Directory Id="dir37AF46328A44C802464897DA7ADC3A5C" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpFACC0331731E46825FE9AE48F5E6CD86" Guid="*">
+                 <File Id="fil4D4687B57EAF3BF5BEA465F1CF0F6C97" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sv/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir3D0531F17BCDECD68E233B361EB28A22" Name="tr">
+-            <Directory Id="dir112013310BF1D99C9EED2B31C4AA6C9E" Name="LC_MESSAGES">
++          <Directory Id="dir3D90050B27EBAD716C06553829E12FA7" Name="tr">
++            <Directory Id="dir88E12B850F41CC171160A8847AFE4B60" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp74BB47B5D2F68B02524C9DE40745C713" Guid="*">
+                 <File Id="filF4E59AAFC7D3DA795F491031D2EA7D44" KeyPath="yes" Source="$(var.SourceDir)/share/locale/tr/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirEFA700A0829245C11D5E89EFB2082609" Name="uk">
+-            <Directory Id="dir3A17D91F655618A8590AF5307ACD6252" Name="LC_MESSAGES">
++          <Directory Id="dirB8167787BCB1B5FEA7D0CEDED1C87A4C" Name="uk">
++            <Directory Id="dir7BE1563EE2BB314CB7FE7451FDD2F39A" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp76347650016ECE4BEBF45FD53F7E91AA" Guid="*">
+                 <File Id="fil20092C0C51BD86AEA06301045C487DC4" KeyPath="yes" Source="$(var.SourceDir)/share/locale/uk/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir3EFF44BBF0208EF859C4D77AE6DDCAEB" Name="vi">
+-            <Directory Id="dirD8608289219C8FF85C9D684A4A7412C3" Name="LC_MESSAGES">
++          <Directory Id="dir3E6C5BDDE5AC14EA62EAB5FE9FBB7F06" Name="vi">
++            <Directory Id="dirF2FF39304D3FC8FAD482FE782A1D09C7" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp78C5C7E2CD5A7E17B157698F4A969A55" Guid="*">
+                 <File Id="fil1F7B19D98F7888791B43BB2D9C26370A" KeyPath="yes" Source="$(var.SourceDir)/share/locale/vi/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir4C279A0F376FE48755095637C54638DC" Name="zh_CN">
+-            <Directory Id="dirA94A594AD83072AE6DBBC7803EEC6D30" Name="LC_MESSAGES">
++          <Directory Id="dir48498721863B8D487A42BE5429F68C47" Name="zh_CN">
++            <Directory Id="dirF745C1EFBD19A4799BD3EA2C3E006421" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpC670CA0427A5514BC6BF8F67F67A0E02" Guid="*">
+                 <File Id="fil82190901D9EF1B1B5432F1D9166746E0" KeyPath="yes" Source="$(var.SourceDir)/share/locale/zh_CN/LC_MESSAGES/gst-plugins-base-1.0.mo"/>
+               </Component>
++              </Directory>
+             </Directory>
+           </Directory>
+         </Directory>
+-      </Directory>
+     </DirectoryRef>
+   </Fragment>
+   <Fragment>
+@@ -366,6 +446,31 @@
+       <ComponentRef Id="cmp11240311D897D6EC9606F2CE22746053"/>
+       <ComponentRef Id="cmp93FAE555B2F925E239C97B777E49DB05"/>
+       <ComponentRef Id="cmp64B9B34C8CDDC860E1091D916AD18974"/>
++      <ComponentRef Id="cmp83D83554A4358898789D9CF48A2B7EE4"/>
++      <ComponentRef Id="cmp577891EDF25587C451F9CD9ADEC17950"/>
++      <ComponentRef Id="cmpDBE70B8247EC74A22BC700164134F68A"/>
++      <ComponentRef Id="cmp07500373A76F96454696CE265ECFAD06"/>
++      <ComponentRef Id="cmp4B0C983D765E7C44897E9143F454A027"/>
++      <ComponentRef Id="cmp8F07634CD23193CA1415D2F0F473FDC3"/>
++      <ComponentRef Id="cmp50B21AE554E614DB5F48D218A9CA8876"/>
++      <ComponentRef Id="cmp918E0AEBA6FC5FF3D5B94A1184C6285C"/>
++      <ComponentRef Id="cmpD029B0CC8D7FA3ED85BC55F7CC66F1D2"/>
++      <ComponentRef Id="cmpDC3C8D23DA44D4E108BA37606B9EAB31"/>
++      <ComponentRef Id="cmpA2B8192EEEF78B543A97E5D912EC6C82"/>
++      <ComponentRef Id="cmp184B910CE11310C3F0292C7105C0001A"/>
++      <ComponentRef Id="cmp97826D40B5CA1C20C850C49045E81A7B"/>
++      <ComponentRef Id="cmpF0F376CE500E6A1CB87AC8E97F050AC4"/>
++      <ComponentRef Id="cmp79780757B780A2209DDD2DE99B91B1BD"/>
++      <ComponentRef Id="cmp5DF20F103177948AFF7B0096F978571E"/>
++      <ComponentRef Id="cmp1F456AADC83A177EF6CEC3561DB64640"/>
++      <ComponentRef Id="cmp7A7F31F99C8D983361015F66F53729D5"/>
++      <ComponentRef Id="cmp0362BEEA68CA040AC08716B2EFEDF866"/>
++      <ComponentRef Id="cmp326A1CB7B30B0369B5D763128FEF6AA0"/>
++      <ComponentRef Id="cmp939D4A839FF9245E8128C96C227184AD"/>
++      <ComponentRef Id="cmpD1B506BFA7D278965D0B90C14B773DD5"/>
++      <ComponentRef Id="cmp256474F9561CF046B2E8D62461AAE748"/>
++      <ComponentRef Id="cmp1ADDA32E2430CC624791D894B52532FB"/>
++      <ComponentRef Id="cmp57B84B5CF0B18E3AA6C1032C62BE91F7"/>
+       <ComponentRef Id="cmpFDC9AB836FA757756C00DA5738D0CD65"/>
+       <ComponentRef Id="cmp23ADDEB3FA6E060D51D929E78F8F4433"/>
+       <ComponentRef Id="cmp374EA0F2F1EB285B7C41F86ECC30424F"/>
+@@ -409,5 +514,3 @@
+     </ComponentGroup>
+   </Fragment>
+ </Include>
+-<!-- generated with msitools 0.100.46-5f3f -->
+-<!-- ../../build/tools/wixl/wixl-heat -var var.SourceDir -p /usr/i686-w64-mingw32/sys-root/mingw/ -component-group CG.gstreamer1-plugins-base -directory-ref INSTALLDIR -win64 -->
+diff --git a/data/wixl/gstreamer1.wxi b/data/wixl/gstreamer1.wxi
+index 882e0e1c2526..91c1742705be 100644
+--- a/data/wixl/gstreamer1.wxi
++++ b/data/wixl/gstreamer1.wxi
+@@ -4,7 +4,7 @@
+ <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <Fragment>
+     <DirectoryRef Id="INSTALLDIR">
+-      <Directory Id="dir94EB7964F8CF73C8E75BF63D57996CCA" Name="bin">
++      <Directory Id="dir7EBDD3C5637C995332BEB438F9C4CF1E" Name="bin">
+         <Component Win64="$(var.Win64)" Id="cmp0D8CF9997EEC93FBB904414012FB4514" Guid="*">
+           <File Id="fil2776266507ACD87669D39C8D97965A8D" KeyPath="yes" Source="$(var.SourceDir)/bin/gst-inspect-1.0.exe"/>
+         </Component>
+@@ -33,297 +33,319 @@
+           <File Id="filA2FDE854CD554DFD05120ACD7E86E234" KeyPath="yes" Source="$(var.SourceDir)/bin/libgstreamer-1.0-0.dll"/>
+         </Component>
+       </Directory>
+-      <Directory Id="dir2F98C2AC2235697317A559417B858936" Name="share">
+-        <Directory Id="dir19B39CCA2802E461F84CB8374131A180" Name="locale">
+-          <Directory Id="dir4FCA0AA3450C7DD24E47BD0765882739" Name="af">
+-            <Directory Id="dir632CD5E29F723619FBF92AC575C9F0A8" Name="LC_MESSAGES">
++      <Directory Id="dirB2F735D32F69742F9CCB1F5A8907C042" Name="lib">
++        <Directory Id="dir60BBD2533BA0D419152D3355E05AC9E4" Name="gstreamer-1.0">
++          <Component Win64="$(var.Win64)" Id="cmp0ACFE00C63B8A3232D2DEB869037D87C" Guid="*">
++            <File Id="fil114D395327F4D6569AC02A39DFB1971E" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstcoreelements.dll"/>
++          </Component>
++          <Component Win64="$(var.Win64)" Id="cmp811F5C25B1348DD7A6FFE318E33B2F72" Guid="*">
++            <File Id="filAC3D4D4F8DCE84F82D66194E5E5A9EE1" KeyPath="yes" Source="$(var.SourceDir)/lib/gstreamer-1.0/libgstcoretracers.dll"/>
++          </Component>
++        </Directory>
++      </Directory>
++      <Directory Id="dir1EBE474684D1CA6D6957A950C9672D67" Name="libexec">
++        <Directory Id="dir3248D276B500675FA6695124351B1529" Name="gstreamer-1.0">
++          <Component Win64="$(var.Win64)" Id="cmp3694FB7C618F9AA6A8199B5908839EED" Guid="*">
++            <File Id="fil90E25DCAD861049A2C91C41BE5374EBF" KeyPath="yes" Source="$(var.SourceDir)/libexec/gstreamer-1.0/gst-plugin-scanner.exe"/>
++          </Component>
++        </Directory>
++      </Directory>
++      <Directory Id="dir2D493EC0C690AE59F6E7BF562D9B2E1D" Name="share">
++        <Directory Id="dir1D2293355B054FBF921B7909B2909240" Name="aclocal">
++          <Component Win64="$(var.Win64)" Id="cmp453A7B102CA0C641D11AA1D797111983" Guid="*">
++            <File Id="filFEAD87C5BA0A19A4174FEB4D851A0C04" KeyPath="yes" Source="$(var.SourceDir)/share/aclocal/gst-element-check-1.0.m4"/>
++          </Component>
++        </Directory>
++        <Directory Id="dir969A2801596DDEFF774EFAA74EA00028" Name="locale">
++          <Directory Id="dir87D0A17FA85B6970D3EB3BFF6242212C" Name="af">
++            <Directory Id="dir6CB4635253DEB0988689D3C917BE4A54" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpA4D7E136426B5975933DC66C5BCBE09E" Guid="*">
+                 <File Id="fil896C993CE10319EB1D46694BA5468F6F" KeyPath="yes" Source="$(var.SourceDir)/share/locale/af/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir7FF2A34AD6C3D03CB76B4A330DDC467F" Name="ast">
+-            <Directory Id="dir271630361C0DA83D0FDBE240CF02FB48" Name="LC_MESSAGES">
++          <Directory Id="dir5584933D8E20294F06F6CC13C228FA8B" Name="ast">
++            <Directory Id="dirA78573BABC1DD4B85D5FE1DCA68AD048" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpB90F5D9A90498563029B703ED62FD1D6" Guid="*">
+                 <File Id="fil6AC8F86FAB773256F7C8C9462968EF1C" KeyPath="yes" Source="$(var.SourceDir)/share/locale/ast/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirFBB3E5EB6B6AA14D79C554EE5C613BA6" Name="az">
+-            <Directory Id="dir1D6A7B9069E179D8146723A1ADE933ED" Name="LC_MESSAGES">
++          <Directory Id="dirCD97EF9F507E890C86DF3933BEE2AFBE" Name="az">
++            <Directory Id="dir59BE409952EE5BED46694170895AB181" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp537C4EB805A22DEF6624E00A2C355A53" Guid="*">
+                 <File Id="fil48F096D7288F791224E6C0D5154D7539" KeyPath="yes" Source="$(var.SourceDir)/share/locale/az/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir7CD2762F466B5A88ED04EA594BDE3D1E" Name="be">
+-            <Directory Id="dir5B6EED348DE53B354F1AC165B2015A29" Name="LC_MESSAGES">
++          <Directory Id="dirCD6BD6ED533B4B422B4CAD3B0CD7BD7E" Name="be">
++            <Directory Id="dirAE6208D4AF35C0DA46CF6E08D6A6D02E" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp0A425B426C8444F795CC04F51737818D" Guid="*">
+                 <File Id="filBB3EAF123A4F1F40CBF565971686C4CD" KeyPath="yes" Source="$(var.SourceDir)/share/locale/be/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir6EFCAC3AE9E74F1AB66072D91D57FE41" Name="bg">
+-            <Directory Id="dirBE23940E8D7BE8B5BA917B4AD8279D2B" Name="LC_MESSAGES">
++          <Directory Id="dir6311F92A072268D2D07ACC8BFCD575CE" Name="bg">
++            <Directory Id="dir1E8EF29660EE78E39C1CC582ACB312C3" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp1E2B89E4231BB828CB8D3AAE7991BA93" Guid="*">
+                 <File Id="fil9CDEF657AFF9A2A4350ED9FCAF377870" KeyPath="yes" Source="$(var.SourceDir)/share/locale/bg/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirF177C831DB2AEAFD2CD2927FF700C69A" Name="ca">
+-            <Directory Id="dir89F059285928532A6CD75C022C33ADDA" Name="LC_MESSAGES">
++          <Directory Id="dir5737A451317CAC690FBFD80BBD6B33D8" Name="ca">
++            <Directory Id="dirBE30B777FE5CAED06991D773A22D3819" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp558BB7DB4EE48DD11AE2D138BB688C02" Guid="*">
+                 <File Id="fil253657990A241199BD24F5B976525F3C" KeyPath="yes" Source="$(var.SourceDir)/share/locale/ca/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir8C3E293DC59783210B8DE28D693A387F" Name="cs">
+-            <Directory Id="dir85D66FE6C77A5BC9B9CA60D7995262E9" Name="LC_MESSAGES">
++          <Directory Id="dir79C9EC6F5F2EEED3EFFE787DDD35D277" Name="cs">
++            <Directory Id="dir6AD0ADC0592C7B8574C5B0ADEA223BA2" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp69737864FFEB8F7EEE779B85E04038C0" Guid="*">
+                 <File Id="fil72826C2D3396CEC465532D1C5D51D048" KeyPath="yes" Source="$(var.SourceDir)/share/locale/cs/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir2CC12B819A05A8381F22FFED4C991D7D" Name="da">
+-            <Directory Id="dir9C36934617FC6DEE755139265E272BAB" Name="LC_MESSAGES">
++          <Directory Id="dir294B9A1639B2512F34589C8B2F8C540D" Name="da">
++            <Directory Id="dir7267CC3E82F3A57A68216C967CC5CDE9" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp157256CDCD7F94C2CDD9BC8FC74771B9" Guid="*">
+                 <File Id="fil4476CBFE7ABB7EE52286E0CE24262C27" KeyPath="yes" Source="$(var.SourceDir)/share/locale/da/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirC5403608A5CA5BD39F860DAF89FF5B35" Name="de">
+-            <Directory Id="dir15CB9C0A008C8D634CEF25D9BEE9E173" Name="LC_MESSAGES">
++          <Directory Id="dir8B2789A765F4550792CE3A4466CD4D60" Name="de">
++            <Directory Id="dir5FDBD92D4E84897EEF395A9FBC07E355" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpD63E76DAE6DD2AE11F1AE822C5F1BABF" Guid="*">
+                 <File Id="filED6AB9DB7AE498AEAA3BE42306F681DD" KeyPath="yes" Source="$(var.SourceDir)/share/locale/de/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirE3320B780C3CAD4AD3EA15FA8684F15C" Name="el">
+-            <Directory Id="dir0C097FB27B14A4BA5D3FF5E3DDC2ECC6" Name="LC_MESSAGES">
++          <Directory Id="dir7DDE0C2747D23372842B071327A65240" Name="el">
++            <Directory Id="dir7DA651ECBA29E23574592FC73FA091B9" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpC356B4C8C837127CE93A32ED56DE0041" Guid="*">
+                 <File Id="filE8966D67BE19C9CFB09A9EAF8E822A03" KeyPath="yes" Source="$(var.SourceDir)/share/locale/el/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir65E14DCD9469E34751A069793EA68B18" Name="en_GB">
+-            <Directory Id="dir83295CAF6E428312D454D8AFF8D68F8D" Name="LC_MESSAGES">
++          <Directory Id="dirF1715E1037401D886F3A7EF71FAADD06" Name="en_GB">
++            <Directory Id="dir6221D2F089F26A685594D848B81C6180" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp79BF6BC04DD554DCEB1B16F97540A409" Guid="*">
+                 <File Id="filDE4C6B29C5E2616E6F749AE32A90EDFC" KeyPath="yes" Source="$(var.SourceDir)/share/locale/en_GB/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir54CA202711630580E3D15B4CE421A2F0" Name="eo">
+-            <Directory Id="dir182AA6F085092C120B7BE2E20D2AF53A" Name="LC_MESSAGES">
++          <Directory Id="dirFCE7FD3014344CFC79EEB6CE4254D158" Name="eo">
++            <Directory Id="dirA1028AEA10D75FDF88D36BEC6C2152E8" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp5A0768A58D676E5859C19147E8844B22" Guid="*">
+                 <File Id="fil607EEB57BE4FD30256A0465182582394" KeyPath="yes" Source="$(var.SourceDir)/share/locale/eo/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir9D81F27D242D0CF407F9FF851BA85F77" Name="es">
+-            <Directory Id="dir594517313920B27C7ADFE1F565D4F13D" Name="LC_MESSAGES">
++          <Directory Id="dir6D6418B4F273492FE2086B9AE4AC124C" Name="es">
++            <Directory Id="dir73E539982F8D51BFBD64C464E1073E11" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp7121D061A0BE62FA563D971B7DEAE9F6" Guid="*">
+                 <File Id="fil0D189E4C6F2CA75427716014430E9173" KeyPath="yes" Source="$(var.SourceDir)/share/locale/es/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirC8E28CFA92DB8124795DB66711226074" Name="eu">
+-            <Directory Id="dirB48A1F794EDE09331EABF48DDFA01D8F" Name="LC_MESSAGES">
++          <Directory Id="dirF6D100BA91945A4950A787433DC789EF" Name="eu">
++            <Directory Id="dirBD35E3C3C5B861905D80DB5BD4F62C5A" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp563C8EF17FF7F2BE2900FFB1A3454C27" Guid="*">
+                 <File Id="filB0533EBC2B2FFDA4B2A4EA9112088040" KeyPath="yes" Source="$(var.SourceDir)/share/locale/eu/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir6CD04752A5793CB37755548663EA9028" Name="fi">
+-            <Directory Id="dir9975B83728AFFFF8A37F9EA575BEB321" Name="LC_MESSAGES">
++          <Directory Id="dirA628585E0EE2AE72DB2F360499DC85A2" Name="fi">
++            <Directory Id="dir49B3CA4F6B66EFAA4D0E57410CC90CC7" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp10506DCA3B15E81FACF8EB922CDF1AA4" Guid="*">
+                 <File Id="fil0A9901C78CD448CB6E401E6EF7CD480F" KeyPath="yes" Source="$(var.SourceDir)/share/locale/fi/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir4C82CAAAD8C5A88450ADCB155FB88BBA" Name="fr">
+-            <Directory Id="dir223DBEC5629920A2A7F91DE75FD0FB2E" Name="LC_MESSAGES">
++          <Directory Id="dirFCCA22056E53B5D59428AB7476DF4657" Name="fr">
++            <Directory Id="dir28876CBDE5ABD2BF82B3825E6292E67F" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp76B582737FB9482A8A7D4FD5CAFFABA9" Guid="*">
+                 <File Id="filEB46F424B647C292741335AAC62D717E" KeyPath="yes" Source="$(var.SourceDir)/share/locale/fr/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirD799A3891E9DEEC78AC6B27FEBEAB00E" Name="fur">
+-            <Directory Id="dir8AEF3E620C5E6A4BAD2632EB6FA01ED7" Name="LC_MESSAGES">
++          <Directory Id="dirAF56DC65E84C8E7A3E748EF8F4484EFA" Name="fur">
++            <Directory Id="dirEB8A96B5FDF0CC7AF41B0AB892944089" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp70F367ED0817CC7D60FF88F09A2AE0F1" Guid="*">
+                 <File Id="fil913C1BC82D81D074AD78C5BD78EE3301" KeyPath="yes" Source="$(var.SourceDir)/share/locale/fur/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirAFBF52E2A5453DB8D810A14362250778" Name="gl">
+-            <Directory Id="dir5EEAD1EA0964AA1EFE0CF9AFEB609E4C" Name="LC_MESSAGES">
++          <Directory Id="dirF458E38E8694882573D395F8C502614A" Name="gl">
++            <Directory Id="dirBFC3143F8379328941E9AEC795F6055A" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp7EE39D72DA6F80EC82F83029AEB70C27" Guid="*">
+                 <File Id="filB31244B52B08FB5020A0AD7435FD8513" KeyPath="yes" Source="$(var.SourceDir)/share/locale/gl/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir17EC5AA3C3EA82A95A88E22057605FFA" Name="hr">
+-            <Directory Id="dirD2C28F5B2511D1BFF4819155332BCBD0" Name="LC_MESSAGES">
++          <Directory Id="dir7A4230F7B2167324E805E23E2AC3E3B2" Name="hr">
++            <Directory Id="dirE88A511B757F5946A377151A274767C5" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp4917B2B082082B81458EEF07F0C07562" Guid="*">
+                 <File Id="fil32FC5A42BDD289881E1BCCCA9D65C5DB" KeyPath="yes" Source="$(var.SourceDir)/share/locale/hr/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir8CA0D82C1BFF0306029314F57CF47846" Name="hu">
+-            <Directory Id="dirEC9FAB96CFA26197E3EA01C0F73F6950" Name="LC_MESSAGES">
++          <Directory Id="dir4140E9B3BF09F5095BFE8CEFD93ACF7E" Name="hu">
++            <Directory Id="dirD9DF9DB9BF20467367EC21435E4512F6" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp0684B9B3261F80969148C1B74FD27B32" Guid="*">
+                 <File Id="fil19D43FEE923914B056271C799F53C1DE" KeyPath="yes" Source="$(var.SourceDir)/share/locale/hu/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirC3EDB0772635C733FDD3708CCFA2E107" Name="id">
+-            <Directory Id="dir70D3BB2015139812A3EA6E918367A4E5" Name="LC_MESSAGES">
++          <Directory Id="dirEC5F9EB21FFC12366AF89F9B6A4D314E" Name="id">
++            <Directory Id="dirC9B6342B681580EF986E84A37CEE2FF5" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp08EC05FDAA7C1B0F5A33559F76876803" Guid="*">
+                 <File Id="filB3CCE40EAF4ED685894745C8A20FBC38" KeyPath="yes" Source="$(var.SourceDir)/share/locale/id/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir134F51C2A4D26206F8E08F3FFDC918E0" Name="it">
+-            <Directory Id="dir4475A51D6DE620EF49741D28D891654C" Name="LC_MESSAGES">
++          <Directory Id="dir5543172F161B121833DA849DF31DA291" Name="it">
++            <Directory Id="dir74A68D42E719986DA953C7AA018861BD" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp5E5D61E5583E43EFEDCCA3282B9EB491" Guid="*">
+                 <File Id="fil50C45C9BC7896795F5540C250B4A0EB5" KeyPath="yes" Source="$(var.SourceDir)/share/locale/it/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir5288A464C1DBA453EAC4D76FCCEFD897" Name="ja">
+-            <Directory Id="dir35DE77415FCA71E3F486E5F30491F503" Name="LC_MESSAGES">
++          <Directory Id="dir57694BEE8F514E3C24ED4A662B4C5D17" Name="ja">
++            <Directory Id="dir278DF18CBC9FB8897CBEBA6F391EA9B2" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp2D8DD82A022C3AF733496EEE1736E8A0" Guid="*">
+                 <File Id="filFE4AE315F35B582BE2565A163C774424" KeyPath="yes" Source="$(var.SourceDir)/share/locale/ja/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir76843027F66529ED255C88F104840C5C" Name="lt">
+-            <Directory Id="dirEF0BFD1298FF4C2F322E35CBD76690DE" Name="LC_MESSAGES">
++          <Directory Id="dirA517C75583E03BCD3DF395BACE6278B1" Name="lt">
++            <Directory Id="dirAA638840B03182463FD363541514C9EB" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp650684BFEFB7FE3E3741276942E95F00" Guid="*">
+                 <File Id="filABD87674D62F4459752EA702B500053B" KeyPath="yes" Source="$(var.SourceDir)/share/locale/lt/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirF605A93C43381AFEA6E0607675F10F8A" Name="nb">
+-            <Directory Id="dirAD9BB84F7D762BDABB9FFFAC23D0775D" Name="LC_MESSAGES">
++          <Directory Id="dirEB16BBDF31807187F5064D710E58767C" Name="nb">
++            <Directory Id="dir98454F1B5D6E8312AE45653EF55CF851" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpDC4B788706771B133FB2FDBE7A865489" Guid="*">
+                 <File Id="fil49C956A7D82B19AABC96A064ADD5BBDE" KeyPath="yes" Source="$(var.SourceDir)/share/locale/nb/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir71F46C30B4CA5BF2DB4CBFED38C01898" Name="nl">
+-            <Directory Id="dir62C76134166C2DDD9D5A371D81ACC8BB" Name="LC_MESSAGES">
++          <Directory Id="dir3EB1CF01839618A8D79D72CB71B5A1E6" Name="nl">
++            <Directory Id="dir2FA7211686BE0077C1477E08ED8D79AA" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpD82DC8F2DACA41388EF441739FBFCDFE" Guid="*">
+                 <File Id="fil9D9EC80DB49C5AEBB33E38ED7666F277" KeyPath="yes" Source="$(var.SourceDir)/share/locale/nl/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir2C18B666CC4C9CBEDEE7966E158528E7" Name="pl">
+-            <Directory Id="dir3AFBC6AC04A8D3ED32BDDB5D7DF7238D" Name="LC_MESSAGES">
++          <Directory Id="dir8ED23194D411DA31B06A394CE59C64D1" Name="pl">
++            <Directory Id="dirEDA4F465255F45815B7FC23CDA5B3AE0" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp9BF8F4E397B08F99E442C257FC5480EF" Guid="*">
+                 <File Id="fil34FB61170820F9CD45122D86329E3918" KeyPath="yes" Source="$(var.SourceDir)/share/locale/pl/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirED6C596A36D0DB360A785ADC37B81E98" Name="pt_BR">
+-            <Directory Id="dirD50CE762608A9CF4DA09C5CD96D4513E" Name="LC_MESSAGES">
++          <Directory Id="dir8C123E5FF315A6747170EA4F89002DE9" Name="pt_BR">
++            <Directory Id="dir5970A113500A6C898C855542C223DE01" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpCC2D569788B61E5EDFBC791BFA2E5E9C" Guid="*">
+                 <File Id="fil799626A2D719A1850D7F72971447277D" KeyPath="yes" Source="$(var.SourceDir)/share/locale/pt_BR/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirBAF6A1CEF6866751130BDE4F58CB2A28" Name="ro">
+-            <Directory Id="dir384AF02A412CD20C8DE78F330E6D6FD7" Name="LC_MESSAGES">
++          <Directory Id="dir415C1A7AA7CB3587C4097D8B294E9071" Name="ro">
++            <Directory Id="dir2F7AC3C93BDEF83D30D80AE0EA915C87" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp02CF6C83648A167BFACDD845D429295A" Guid="*">
+                 <File Id="filBDB8D840CC6403069D36DD182CF9B559" KeyPath="yes" Source="$(var.SourceDir)/share/locale/ro/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirA9BFAD20F2DDDEB64ECBAE8B28A32541" Name="ru">
+-            <Directory Id="dir46F0711AE918D89C6613EF65ECFD7600" Name="LC_MESSAGES">
++          <Directory Id="dirBE98ED0BCDD6812BD18346165AE8B772" Name="ru">
++            <Directory Id="dir762825BA97A9F257135474AF888633FA" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp16C854040788383694E6F149DBB02EC7" Guid="*">
+                 <File Id="fil58E24B4A38F746500714643E0E4515E4" KeyPath="yes" Source="$(var.SourceDir)/share/locale/ru/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir99593C54094D54F076CE91F30B45E5D0" Name="rw">
+-            <Directory Id="dir70CFD4D67AD88A48D805EE63C425A28E" Name="LC_MESSAGES">
++          <Directory Id="dir61CE0C89671BE72AE538A53952983E4D" Name="rw">
++            <Directory Id="dir07EB90D2732266D9F4F9AAA4ACC58273" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp84AE4F0B3E93E397E33C6B4F367A9CB3" Guid="*">
+                 <File Id="filF6382D1E575CF2BCDE029A886AF76058" KeyPath="yes" Source="$(var.SourceDir)/share/locale/rw/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir019B16FE5DF0955329004E8D21D9A700" Name="sk">
+-            <Directory Id="dirA4A44F5EA3158150A386311FCEEBB241" Name="LC_MESSAGES">
++          <Directory Id="dir43BF4D064E48DF8751D46540C65664BA" Name="sk">
++            <Directory Id="dir44F4A1ED7777BA30C63DA1667053C715" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp34E3C26B820505C597394233E48035BB" Guid="*">
+                 <File Id="fil32DF170A1F36EC7D9965A1D8010A5C68" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sk/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir7A2AE158102F5F052169E960D823BB2E" Name="sl">
+-            <Directory Id="dir9F789E5EA480F1F742F4AF489495E894" Name="LC_MESSAGES">
++          <Directory Id="dir0DBA2C1AB832829E091234C3F5B08E8E" Name="sl">
++            <Directory Id="dir839994DCC2F797149A4A830D4F0425F5" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp6E05B2F38EC187AD73FA371DCE0035C0" Guid="*">
+                 <File Id="fil76F8DBAAF024ABCE8C38920A73E4C67D" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sl/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirF75E54C8899D32511B5B07F356C9E220" Name="sq">
+-            <Directory Id="dir7E6E0220DB07F8BC92830651637375E4" Name="LC_MESSAGES">
++          <Directory Id="dir6F4DFB481BE71EF54DFC025AE15BDD45" Name="sq">
++            <Directory Id="dir4B2D1A98D1BA6F7FBC5D4773C3917C5F" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp717ADAE327A5A91D9732D72B80F3370B" Guid="*">
+                 <File Id="filAEA2D55D1CF224DCEB8B47ED272D4D66" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sq/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir47DC6B2272E945304C18B9FFBBA6BA45" Name="sr">
+-            <Directory Id="dir4B749983D76D2DF214B17BD210E90CEC" Name="LC_MESSAGES">
++          <Directory Id="dirF2A4866847C920C338C37A7B44AF6A59" Name="sr">
++            <Directory Id="dir63854A4476FA52CCE9CAB47C4CCDDD73" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp127A5ED5CF67DD19DE5942BFF70A2740" Guid="*">
+                 <File Id="fil659545CE85BA78100AA8595C3A54FEDD" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sr/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirA01D2CF0180A2870FCC9BAF8F1B5CA83" Name="sv">
+-            <Directory Id="dirD20623D6451173A312B493E4FF8AAFD7" Name="LC_MESSAGES">
++          <Directory Id="dir83555D80A4098BB72B42E9BE8E8D7433" Name="sv">
++            <Directory Id="dir0AE41D766DCBF83B1977E0EF677AB923" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp62A6BF0D159307D274270ED32D18CDB6" Guid="*">
+                 <File Id="filA3BCF424360BB3C87414A0DF9A93C3A2" KeyPath="yes" Source="$(var.SourceDir)/share/locale/sv/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirAEED25FA20F7227C9B7E02B5DC396563" Name="tr">
+-            <Directory Id="dirBCD427F4C939A554F33A076A3EAC2E14" Name="LC_MESSAGES">
++          <Directory Id="dirEB0C75C3D9E54F355BF3E3B7D75EB5F5" Name="tr">
++            <Directory Id="dir01466BF25E45E9E265BCC0633F9E3347" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp6016BE6BE1F9CBB893BA64988C992C9B" Guid="*">
+                 <File Id="fil201B3D9FBA7610EB8D2A132C999AF380" KeyPath="yes" Source="$(var.SourceDir)/share/locale/tr/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir1FFADD254A185DB568385950F81F232A" Name="uk">
+-            <Directory Id="dir6E291AE90BFB4C5E2EAE100D4565E749" Name="LC_MESSAGES">
++          <Directory Id="dirCFEA54CF09B2C9642091E0AEA9B3892E" Name="uk">
++            <Directory Id="dirD44FFF5020A192AE7C2E84122B59827E" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp5AF3C000E0617AAFA46ABAD09528B814" Guid="*">
+                 <File Id="filA0A93E8911709B438878A582E5A0B7D5" KeyPath="yes" Source="$(var.SourceDir)/share/locale/uk/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dirD185C3B08B95AD9EF41827E58EB61B93" Name="vi">
+-            <Directory Id="dirCDA4416DF7248DF2EC051C81ACB6A712" Name="LC_MESSAGES">
++          <Directory Id="dir19CF716DA72953BCEA85D32C754F86AB" Name="vi">
++            <Directory Id="dir02DF0BE9332992CC005A8E2E233D0B12" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp640437CD605F13C49FE962982466981C" Guid="*">
+                 <File Id="filB420FD3B2EFD41552261ADB863594FF7" KeyPath="yes" Source="$(var.SourceDir)/share/locale/vi/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir488ABB1EBC8AB45C3464B4B2B9921AFF" Name="zh_CN">
+-            <Directory Id="dir550D419DB239DF0B7FBC16F9ACA803BA" Name="LC_MESSAGES">
++          <Directory Id="dir49E2C2C0323621DEA8713277DE1F82D2" Name="zh_CN">
++            <Directory Id="dir76CE00A5D119724E9BDB4004C26D77C8" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmpAA5F14D1F02E2679E79AB018156ADA02" Guid="*">
+                 <File Id="filD827B1E4532FD336D31EC1B9F47B033B" KeyPath="yes" Source="$(var.SourceDir)/share/locale/zh_CN/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
+             </Directory>
+           </Directory>
+-          <Directory Id="dir43BEBA64B3C8724679CE67FEB42780A6" Name="zh_TW">
+-            <Directory Id="dirDBEF4D8E3CF60DF62A292711EF5C4DBF" Name="LC_MESSAGES">
++          <Directory Id="dir8FC256B748A522EF2CB260D4561732E9" Name="zh_TW">
++            <Directory Id="dir741BAAE135706353E3660BD1A5B0B4DE" Name="LC_MESSAGES">
+               <Component Win64="$(var.Win64)" Id="cmp4AD0399BB35367F79F7DD41107DA8DB0" Guid="*">
+                 <File Id="filBC5DC7E36933FC6725C09BE4D2044E88" KeyPath="yes" Source="$(var.SourceDir)/share/locale/zh_TW/LC_MESSAGES/gstreamer-1.0.mo"/>
+               </Component>
++              </Directory>
+             </Directory>
+           </Directory>
+         </Directory>
+-      </Directory>
+     </DirectoryRef>
+   </Fragment>
+   <Fragment>
+@@ -339,6 +361,10 @@
+       <ComponentRef Id="cmp46DB6990FC2740672B3421145559C9BD"/>
+       <ComponentRef Id="cmp5AEB3111ED36D8DF9A4732D4FCD9FB54"/>
+       <ComponentRef Id="cmp9D35809C95F77B45F174A9DAB67E9D04"/>
++      <ComponentRef Id="cmp0ACFE00C63B8A3232D2DEB869037D87C"/>
++      <ComponentRef Id="cmp811F5C25B1348DD7A6FFE318E33B2F72"/>
++      <ComponentRef Id="cmp3694FB7C618F9AA6A8199B5908839EED"/>
++      <ComponentRef Id="cmp453A7B102CA0C641D11AA1D797111983"/>
+       <ComponentRef Id="cmpA4D7E136426B5975933DC66C5BCBE09E"/>
+       <ComponentRef Id="cmpB90F5D9A90498563029B703ED62FD1D6"/>
+       <ComponentRef Id="cmp537C4EB805A22DEF6624E00A2C355A53"/>
+@@ -383,5 +409,3 @@
+     </ComponentGroup>
+   </Fragment>
+ </Include>
+-<!-- generated with msitools 0.100.46-5f3f -->
+-<!-- ../../build/tools/wixl/wixl-heat -var var.SourceDir -p /usr/i686-w64-mingw32/sys-root/mingw/ -component-group CG.gstreamer1 -directory-ref INSTALLDIR -win64 -->
+diff --git a/data/wixl/imath.wxi b/data/wixl/imath.wxi
+new file mode 100644
+index 000000000000..43eb9567acf0
+--- /dev/null
++++ b/data/wixl/imath.wxi
+@@ -0,0 +1,19 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
++  <Fragment>
++    <DirectoryRef Id="INSTALLDIR">
++      <Directory Id="dirDF2FF252C04DE78A678C9C5499754BFF" Name="bin">
++        <Component Win64="$(var.Win64)" Id="cmpBC889D338B69F2FA276BFE0374221241" Guid="*">
++          <File Id="filFFE133719FAB9A9F9CABF171211F6002" KeyPath="yes" Source="$(var.SourceDir)/bin/libImath-3_1.dll"/>
++        </Component>
++      </Directory>
++    </DirectoryRef>
++  </Fragment>
++  <Fragment>
++    <ComponentGroup Id="CG.imath">
++      <ComponentRef Id="cmpBC889D338B69F2FA276BFE0374221241"/>
++    </ComponentGroup>
++  </Fragment>
++</Include>
++<!-- generated with msitools 0.101.79-8c74 -->
++<!-- tools/wixl/wixl-heat -var var.SourceDir -prefix /usr/i686-w64-mingw32/sys-root/mingw/ -component-group CG.imath -directory-ref INSTALLDIR -win64 -->
+diff --git a/data/wixl/libffi.wxi b/data/wixl/libffi.wxi
+index c7e75e325ac5..3b0cf53b901e 100644
+--- a/data/wixl/libffi.wxi
++++ b/data/wixl/libffi.wxi
+@@ -5,7 +5,7 @@
+     <DirectoryRef Id="INSTALLDIR">
+       <Directory Id="dirB37BA35DC0E52FA4D62B8457EA52998D" Name="bin">
+         <Component Win64="$(var.Win64)" Id="cmp4F67E190AA41922A005AF2B11F7D98C7" Guid="*">
+-          <File Id="fil3C28FBAFB6D0436D0420107C1F59E022" KeyPath="yes" Source="$(var.SourceDir)/bin/libffi-6.dll"/>
++          <File Id="fil3C28FBAFB6D0436D0420107C1F59E022" KeyPath="yes" Source="$(var.SourceDir)/bin/libffi-8.dll"/>
+         </Component>
+       </Directory>
+     </DirectoryRef>
+diff --git a/data/wixl/librsvg2.wxi b/data/wixl/librsvg2.wxi
+index d371347f620b..a9e48d222efa 100644
+--- a/data/wixl/librsvg2.wxi
++++ b/data/wixl/librsvg2.wxi
+@@ -11,9 +11,6 @@
+         <Component Win64="$(var.Win64)" Id="cmp81A1C1E9B324ED590B7F766F40A7D5B7" Guid="*">
+           <File Id="fil4B3E8AF8A79891B6BAE94D7DCE1A4694" KeyPath="yes" Source="$(var.SourceDir)/bin/rsvg-convert.exe"/>
+         </Component>
+-        <Component Win64="$(var.Win64)" Id="cmp237C66D7E1EF3D3CAA94A503B0E26CCE" Guid="*">
+-          <File Id="filFA11422A4083722AC98DDEA6F8375693" KeyPath="yes" Source="$(var.SourceDir)/bin/rsvg-view-3.exe"/>
+-        </Component>
+       </Directory>
+       <Directory Id="dir445D749B0ED104613F534DD834B63D9A" Name="lib">
+         <Directory Id="dirE00BC2D7B7738A1AC7641506062BBC57" Name="gdk-pixbuf-2.0">
+@@ -41,7 +38,6 @@
+       <ComponentGroupRef Id="CG.libcroco"/>
+       <ComponentRef Id="cmp9AE88CD731B9D1B84CEA9A38B11CA1F6"/>
+       <ComponentRef Id="cmp81A1C1E9B324ED590B7F766F40A7D5B7"/>
+-      <ComponentRef Id="cmp237C66D7E1EF3D3CAA94A503B0E26CCE"/>
+       <ComponentRef Id="cmp0A65EC77C95F303FDE50FC39AD098AB1"/>
+       <ComponentRef Id="cmp12AB8C70459BB5E6C41D39CF16A6B578"/>
+     </ComponentGroup>
+diff --git a/data/wixl/openal-soft.wxi b/data/wixl/openal-soft.wxi
+index 1ab2850e446b..a220928b6396 100644
+--- a/data/wixl/openal-soft.wxi
++++ b/data/wixl/openal-soft.wxi
+@@ -1,30 +1,29 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <?require gcc.wxi?>
++<?require gcc-c++.wxi?>
++<?require SDL2.wxi?>
+ <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <Fragment>
+     <DirectoryRef Id="INSTALLDIR">
+-      <Directory Id="dir43A9FB7EBE5CDE1AF87D085FF154BBB8" Name="bin">
++      <Directory Id="dirC8389FDBB4A6257013203C24CB0E2DB5" Name="bin">
+         <Component Win64="$(var.Win64)" Id="cmpB5E33E3FD4B087177A0434BFE815AAF6" Guid="*">
+           <File Id="fil12F1EC450118DDF91F61C046A56046F8" KeyPath="yes" Source="$(var.SourceDir)/bin/OpenAL32.dll"/>
+         </Component>
++        <Component Win64="$(var.Win64)" Id="cmp658490EC71731EA2200D38752D85BE27" Guid="*">
++          <File Id="fil950D8DC4E1DF49AA5F83A531695D5D32" KeyPath="yes" Source="$(var.SourceDir)/bin/alloopback.exe"/>
++        </Component>
+         <Component Win64="$(var.Win64)" Id="cmp44C541F9ACA8ED2C066BA40D652CF2BC" Guid="*">
+           <File Id="filABA10A5835BCEF133558C4E5FF46F59D" KeyPath="yes" Source="$(var.SourceDir)/bin/alrecord.exe"/>
+         </Component>
+         <Component Win64="$(var.Win64)" Id="cmpAF821126633DDF42C1B9EC89EABE7B00" Guid="*">
+           <File Id="fil599DDC98F86B2D25B1E5E7884BC7DD8C" KeyPath="yes" Source="$(var.SourceDir)/bin/altonegen.exe"/>
+         </Component>
+-        <Component Win64="$(var.Win64)" Id="cmpA5D9C918FF962618D158206FEA71BC33" Guid="*">
+-          <File Id="filE804C97925740094A0B52BB429DBD2D1" KeyPath="yes" Source="$(var.SourceDir)/bin/bsincgen.exe"/>
+-        </Component>
+-        <Component Win64="$(var.Win64)" Id="cmpD0D15B9425C8B4E410E0BA626BD7850D" Guid="*">
+-          <File Id="fil4BA323174377F363F1EC9DE5678647A4" KeyPath="yes" Source="$(var.SourceDir)/bin/makehrtf.exe"/>
+-        </Component>
+         <Component Win64="$(var.Win64)" Id="cmp0A3C634FCB16350330E4135D5C199FDF" Guid="*">
+           <File Id="fil03556D6F168AF0CE83B9C9094B9C18FC" KeyPath="yes" Source="$(var.SourceDir)/bin/openal-info.exe"/>
+         </Component>
+       </Directory>
+-      <Directory Id="dir27887051D9CAA97180A868142010ADAF" Name="etc">
+-        <Directory Id="dirAA120FBE5F80C0813EE4E3D424805259" Name="openal">
++      <Directory Id="dirDBD2864B3C3FFD1E86261CF2604E3F9C" Name="etc">
++        <Directory Id="dir505C1542BAB4D8F20F377D6ED93EB4C9" Name="openal">
+           <Component Win64="$(var.Win64)" Id="cmp8EB348F915C5896D56835BC9BAB79345" Guid="*">
+             <File Id="fil0A7940318F2FE3060E031BEA13AC48B9" KeyPath="yes" Source="$(var.SourceDir)/etc/openal/alsoft.conf"/>
+           </Component>
+@@ -35,21 +34,21 @@
+           <Component Win64="$(var.Win64)" Id="cmp11A915BA8F368D6E2D544B09847F2C9E" Guid="*">
+             <File Id="filFD30374A44B7EFC7A66F5FCD89727825" KeyPath="yes" Source="$(var.SourceDir)/share/openal/alsoftrc.sample"/>
+           </Component>
+-          <Directory Id="dirF58A5256085247B7ADB84072BCFA412E" Name="hrtf">
+-            <Component Win64="$(var.Win64)" Id="cmp15CB730942AA27841AE05F8D750D7076" Guid="*">
+-              <File Id="fil4A6C4D7DCA1A313C691FF74C18570C9C" KeyPath="yes" Source="$(var.SourceDir)/share/openal/hrtf/default-44100.mhr"/>
+-            </Component>
+-            <Component Win64="$(var.Win64)" Id="cmpEF09EE9DBA57EA4BFF1EE00CD35C55D0" Guid="*">
+-              <File Id="filB5592E96EEDD9657FC1D4103CF480DEC" KeyPath="yes" Source="$(var.SourceDir)/share/openal/hrtf/default-48000.mhr"/>
++          <Directory Id="dir3BB54727308B123DAAE192F80E66499C" Name="hrtf">
++            <Component Win64="$(var.Win64)" Id="cmpA36BD9219C48B21253F66551B287E38F" Guid="*">
++              <File Id="filA107F4CD41D8744FCDBB822F95B96A8E" KeyPath="yes" Source="$(var.SourceDir)/share/openal/hrtf/Default HRTF.mhr"/>
+             </Component>
+           </Directory>
+-          <Directory Id="dir43AD6F6AFFF1DD41A0E1FF522B640B3B" Name="presets">
++          <Directory Id="dir4B13C789A73E2F77C83BA6BBBB295A9D" Name="presets">
+             <Component Win64="$(var.Win64)" Id="cmp9CDAE5DCCA39C25DF272715060C42F91" Guid="*">
+               <File Id="filC93DD5B4813F3504300112E662383A95" KeyPath="yes" Source="$(var.SourceDir)/share/openal/presets/3D7.1.ambdec"/>
+             </Component>
+             <Component Win64="$(var.Win64)" Id="cmpDA8DA322BCC5BE1B4648024BA53AAE78" Guid="*">
+               <File Id="filAC4A9F19BF1806E526BBBBACBF1461B8" KeyPath="yes" Source="$(var.SourceDir)/share/openal/presets/hexagon.ambdec"/>
+             </Component>
++            <Component Win64="$(var.Win64)" Id="cmp02222C78D2EBE4852FD4FD35F2CC06AC" Guid="*">
++              <File Id="fil1A5D3612204B79A67C7C37F67320E387" KeyPath="yes" Source="$(var.SourceDir)/share/openal/presets/itu5.1-nocenter.ambdec"/>
++            </Component>
+             <Component Win64="$(var.Win64)" Id="cmp0843FFBF0FBC74B7821BC3CDDC7928E7" Guid="*">
+               <File Id="filC840CD7AA1AC0D69CF1991782A4A7C56" KeyPath="yes" Source="$(var.SourceDir)/share/openal/presets/itu5.1.ambdec"/>
+             </Component>
+@@ -69,19 +68,19 @@
+   </Fragment>
+   <Fragment>
+     <ComponentGroup Id="CG.openal-soft">
+-      <ComponentGroupRef Id="CG.gcc"/>		  
++      <ComponentGroupRef Id="CG.gcc"/>
++      <ComponentGroupRef Id="CG.gcc-c++"/>
++      <ComponentGroupRef Id="CG.SDL2"/>
+       <ComponentRef Id="cmpB5E33E3FD4B087177A0434BFE815AAF6"/>
++      <ComponentRef Id="cmp658490EC71731EA2200D38752D85BE27"/>
+       <ComponentRef Id="cmp44C541F9ACA8ED2C066BA40D652CF2BC"/>
+       <ComponentRef Id="cmpAF821126633DDF42C1B9EC89EABE7B00"/>
+-      <ComponentRef Id="cmpA5D9C918FF962618D158206FEA71BC33"/>
+-      <ComponentRef Id="cmpD0D15B9425C8B4E410E0BA626BD7850D"/>
+       <ComponentRef Id="cmp0A3C634FCB16350330E4135D5C199FDF"/>
+       <ComponentRef Id="cmp8EB348F915C5896D56835BC9BAB79345"/>
+       <ComponentRef Id="cmp11A915BA8F368D6E2D544B09847F2C9E"/>
+-      <ComponentRef Id="cmp15CB730942AA27841AE05F8D750D7076"/>
+-      <ComponentRef Id="cmpEF09EE9DBA57EA4BFF1EE00CD35C55D0"/>
+       <ComponentRef Id="cmp9CDAE5DCCA39C25DF272715060C42F91"/>
+       <ComponentRef Id="cmpDA8DA322BCC5BE1B4648024BA53AAE78"/>
++      <ComponentRef Id="cmp02222C78D2EBE4852FD4FD35F2CC06AC"/>
+       <ComponentRef Id="cmp0843FFBF0FBC74B7821BC3CDDC7928E7"/>
+       <ComponentRef Id="cmpF832A3425FC57718F5B453EA1F14A864"/>
+       <ComponentRef Id="cmpE17EEACE1A901A94A03D1558BC0B3E7A"/>
+diff --git a/data/wixl/openexr.wxi b/data/wixl/openexr.wxi
+index 76ae82a3ce2e..79b9284b01e7 100644
+--- a/data/wixl/openexr.wxi
++++ b/data/wixl/openexr.wxi
+@@ -1,30 +1,25 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <?require gcc-c++.wxi?>
++<?require imath.wxi?>
+ <?require zlib.wxi?>
+ <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+   <Fragment>
+     <DirectoryRef Id="INSTALLDIR">
+-      <Directory Id="dir6ED2EF968C6DB22E5FCA04A67BFE8444" Name="bin">
+-        <Component Win64="$(var.Win64)" Id="cmpBFAE7A86C533D3BFDEE266089A31F295" Guid="*">
+-          <File Id="fil85774EC973B58F86F73169792E1AD727" KeyPath="yes" Source="$(var.SourceDir)/bin/libHalf-2_5.dll"/>
++      <Directory Id="dir0B857615C9B2C86258E8CF7C6974F9B1" Name="bin">
++        <Component Win64="$(var.Win64)" Id="cmpD06DB6061F9FA030F5A84B640A974E2C" Guid="*">
++          <File Id="filCCEEF63C65F726B1B2609A43920FAD36" KeyPath="yes" Source="$(var.SourceDir)/bin/libIex-3_1.dll"/>
+         </Component>
+-        <Component Win64="$(var.Win64)" Id="cmpF19F43C7580675C06258FB526B94C531" Guid="*">
+-          <File Id="filA061BE0DE6A3B432EE5A966E95A93994" KeyPath="yes" Source="$(var.SourceDir)/bin/libIex-2_5.dll"/>
++        <Component Win64="$(var.Win64)" Id="cmpF382C85C906392EAEE0F8A3187356A4E" Guid="*">
++          <File Id="fil6208B4B4C22784C56395CA036FBC7BCD" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmThread-3_1.dll"/>
+         </Component>
+-        <Component Win64="$(var.Win64)" Id="cmp6A6C82EA53C0EFAE3096326B17E20F67" Guid="*">
+-          <File Id="fil1A5545BC38C3712497EAED13818916FB" KeyPath="yes" Source="$(var.SourceDir)/bin/libIexMath-2_5.dll"/>
++        <Component Win64="$(var.Win64)" Id="cmpD791170731ED456887CF0FBF9E101C2B" Guid="*">
++          <File Id="fil34991156EBD9B579A98112DC98C7CEC6" KeyPath="yes" Source="$(var.SourceDir)/bin/libOpenEXR-3_1.dll"/>
+         </Component>
+-        <Component Win64="$(var.Win64)" Id="cmpEA2481866C2DC47FC14B8C61C647F450" Guid="*">
+-          <File Id="filB4503B1C139FAC100C5432EA4419FCE8" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImf-2_5.dll"/>
++        <Component Win64="$(var.Win64)" Id="cmp8300849796A475BA357F53956C655B7D" Guid="*">
++          <File Id="fil95B939BC488F0139759B1708258D13D5" KeyPath="yes" Source="$(var.SourceDir)/bin/libOpenEXRCore-3_1.dll"/>
+         </Component>
+-        <Component Win64="$(var.Win64)" Id="cmp038AEE460CF570316C22824017BC9F1A" Guid="*">
+-          <File Id="filCC11F0370D6E82A1504E31F5E50D043A" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmImfUtil-2_5.dll"/>
+-        </Component>
+-        <Component Win64="$(var.Win64)" Id="cmp4D54CFA696A2215D6E362F59D43BDBFC" Guid="*">
+-          <File Id="fil1F7FFD91A2597F8D3684EAD65F1D38EE" KeyPath="yes" Source="$(var.SourceDir)/bin/libIlmThread-2_5.dll"/>
+-        </Component>
+-        <Component Win64="$(var.Win64)" Id="cmp0E50E41192530909EB2F68F8446C534C" Guid="*">
+-          <File Id="fil6A80248ABF32FBB8EFABF523E4101DC4" KeyPath="yes" Source="$(var.SourceDir)/bin/libImath-2_5.dll"/>
++        <Component Win64="$(var.Win64)" Id="cmpB99AA8413711B53DB838FC4FCFDAE130" Guid="*">
++          <File Id="filD799F70F1822A396BBDEDF9E062585BC" KeyPath="yes" Source="$(var.SourceDir)/bin/libOpenEXRUtil-3_1.dll"/>
+         </Component>
+       </Directory>
+     </DirectoryRef>
+@@ -32,14 +27,13 @@
+   <Fragment>
+     <ComponentGroup Id="CG.openexr">
+       <ComponentGroupRef Id="CG.gcc-c++"/>
++      <ComponentGroupRef Id="CG.imath"/>
+       <ComponentGroupRef Id="CG.zlib"/>
+-      <ComponentRef Id="cmpBFAE7A86C533D3BFDEE266089A31F295"/>
+-      <ComponentRef Id="cmpF19F43C7580675C06258FB526B94C531"/>
+-      <ComponentRef Id="cmp6A6C82EA53C0EFAE3096326B17E20F67"/>
+-      <ComponentRef Id="cmpEA2481866C2DC47FC14B8C61C647F450"/>
+-      <ComponentRef Id="cmp038AEE460CF570316C22824017BC9F1A"/>
+-      <ComponentRef Id="cmp4D54CFA696A2215D6E362F59D43BDBFC"/>
+-      <ComponentRef Id="cmp0E50E41192530909EB2F68F8446C534C"/>
++      <ComponentRef Id="cmpD06DB6061F9FA030F5A84B640A974E2C"/>
++      <ComponentRef Id="cmpF382C85C906392EAEE0F8A3187356A4E"/>
++      <ComponentRef Id="cmpD791170731ED456887CF0FBF9E101C2B"/>
++      <ComponentRef Id="cmp8300849796A475BA357F53956C655B7D"/>
++      <ComponentRef Id="cmpB99AA8413711B53DB838FC4FCFDAE130"/>
+     </ComponentGroup>
+   </Fragment>
+ </Include>
+diff --git a/data/wxi-validate.pl b/data/wxi-validate.pl
+index c1b328d34865..e285963c8cd9 100755
+--- a/data/wxi-validate.pl
++++ b/data/wxi-validate.pl
+@@ -47,6 +47,7 @@ my %dllgroups;
+ # as dependencies
+ my %dllbuiltin = (
+     "advapi32.dll" => 1,
++    "bcrypt.dll" => 1,
+     "comctl32.dll" => 1,
+     "comdlg32.dll" => 1,
+     "crypt32.dll" => 1,
+@@ -76,7 +77,9 @@ my %dllbuiltin = (
+     "shell32.dll" => 1,
+     "shlwapi.dll" => 1,
+     "user32.dll" => 1,
++    "userenv.dll" => 1,
+     "usp10.dll" => 1,
++    "version.dll" => 1,
+     "winmm.dll" => 1,
+     "winspool.drv" => 1,
+     "wldap32.dll" => 1,
+-- 
+2.34.1.428.gdcc0cd074f0c
+
diff --git a/0001-wxi-update-libffi.patch b/0001-wxi-update-libffi.patch
deleted file mode 100644
index 5979bc1..0000000
--- a/0001-wxi-update-libffi.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7a41039f7a812d176c733fc06d5e7646469f9f47 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
-Date: Sun, 1 Aug 2021 19:47:14 +0400
-Subject: [PATCH] wxi: update libffi
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
----
- data/wixl/libffi.wxi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/wixl/libffi.wxi b/data/wixl/libffi.wxi
-index c7e75e3..3b0cf53 100644
---- a/data/wixl/libffi.wxi
-+++ b/data/wixl/libffi.wxi
-@@ -5,7 +5,7 @@
-     <DirectoryRef Id="INSTALLDIR">
-       <Directory Id="dirB37BA35DC0E52FA4D62B8457EA52998D" Name="bin">
-         <Component Win64="$(var.Win64)" Id="cmp4F67E190AA41922A005AF2B11F7D98C7" Guid="*">
--          <File Id="fil3C28FBAFB6D0436D0420107C1F59E022" KeyPath="yes" Source="$(var.SourceDir)/bin/libffi-6.dll"/>
-+          <File Id="fil3C28FBAFB6D0436D0420107C1F59E022" KeyPath="yes" Source="$(var.SourceDir)/bin/libffi-8.dll"/>
-         </Component>
-       </Directory>
-     </DirectoryRef>
--- 
-2.32.0.264.g75ae10bc75
-
diff --git a/msitools.spec b/msitools.spec
index 589b6c3..a4512d4 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -12,13 +12,13 @@
 
 Name:           msitools
 Version:        0.101.32
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Windows Installer tools
 
 License:        GPLv2+
 URL:            http://ftp.gnome.org/pub/GNOME/sources/%{name}
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}%{?_version_suffix}.tar.xz
-Patch0:         0001-wxi-update-libffi.patch
+Patch0:         0001-Update-data-wixl.patch
 
 Requires:       libgsf >= 1.14.24-2
 
@@ -274,6 +274,9 @@ The libmsi1-devel package includes the header files for libmsi.
 
 
 %changelog
+* Sat Jan 29 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.101.32-3
+- Fix FTBFS. rhbz#2046759
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.101.32-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild