From 90fc53ce0081a265edd0b86645e6b3f6f274a03b Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Sat, 8 Jul 2023 23:18:53 +0200
Subject: [PATCH 01/69] potential solution for #31?

---
 EnvyUpdate/Properties/AssemblyInfo.cs |  4 +--
 EnvyUpdate/Util.cs                    | 52 ++++++++++++++++-----------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index a45fa1a..2659d08 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.18")]
-[assembly: AssemblyFileVersion("2.18")]
+[assembly: AssemblyVersion("2.19")]
+[assembly: AssemblyFileVersion("2.19")]
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index dd84e97..328a24d 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -153,28 +153,38 @@ namespace EnvyUpdate
 
             Debug.LogToFile("INFO Got Nvidia GPU list.");
             if (xmlcontent == null)
-                Debug.LogToFile("WARN GPU list is NULL! This is a possible error source.");
-
-            XDocument xDoc = XDocument.Parse(xmlcontent);
-            string gpuName = GetGPUName(true);
-
-            switch (IDtype)
             {
-                case "psid":
-                    id = GetValueFromName(xDoc, gpuName, true);
-                    Debug.LogToFile("INFO Got psid: " + id);
-                    break;
-                case "pfid":
-                    id = GetValueFromName(xDoc, gpuName, false);
-                    Debug.LogToFile("INFO Got pfid: " + id);
-                    break;
-                case "osid":
-                    id = GetOSID();
-                    Debug.LogToFile("INFO Got osid: " + id);
-                    break;
-                default:
-                    Debug.LogToFile("WARN GetIDs was called, but nothing was specified.");
-                    break;
+                Debug.LogToFile("WARN GPU list is NULL! This is a possible error source.");
+                switch (IDtype)
+                {
+                    case "osid":
+                        id = GetOSID();
+                        Debug.LogToFile("WARN Ignore previous warning, just getting osid.");
+                        Debug.LogToFile("INFO Got osid: " + id);
+                        break;
+                    default:
+                        Debug.LogToFile("WARN GetIDs was called, but nothing was specified.");
+                        break;
+                }
+            }
+            else
+            {
+                XDocument xDoc = XDocument.Parse(xmlcontent);
+                string gpuName = GetGPUName(true);
+                switch (IDtype)
+                {
+                    case "psid":
+                        id = GetValueFromName(xDoc, gpuName, true);
+                        Debug.LogToFile("INFO Got psid: " + id);
+                        break;
+                    case "pfid":
+                        id = GetValueFromName(xDoc, gpuName, false);
+                        Debug.LogToFile("INFO Got pfid: " + id);
+                        break;
+                    default:
+                        Debug.LogToFile("WARN GetIDs was called, but nothing was specified.");
+                        break;
+                }
             }
 
             return id;

From d347ccefdf59b7b0fb72cbba87d368f0b33d2096 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Sun, 9 Jul 2023 18:19:33 +0200
Subject: [PATCH 02/69] improve logging

---
 EnvyUpdate/Debug.cs           |  1 -
 EnvyUpdate/InfoWindow.xaml    | 26 ++++++++++++++++----------
 EnvyUpdate/InfoWindow.xaml.cs | 18 ++++++++++++++++++
 EnvyUpdate/MainWindow.xaml.cs | 18 ++++++++++++++----
 EnvyUpdate/Util.cs            | 21 +++++++++++++++++----
 5 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/EnvyUpdate/Debug.cs b/EnvyUpdate/Debug.cs
index a239764..43e54b9 100644
--- a/EnvyUpdate/Debug.cs
+++ b/EnvyUpdate/Debug.cs
@@ -49,7 +49,6 @@ namespace EnvyUpdate
             return "Nvidia GeForce RTX 4080 (debug)";
         }
 
-        [ConditionalAttribute("DEBUG")]
         public static void LogToFile(string content)
         {
             if (isVerbose)
diff --git a/EnvyUpdate/InfoWindow.xaml b/EnvyUpdate/InfoWindow.xaml
index bdc6ca6..e9d09c5 100644
--- a/EnvyUpdate/InfoWindow.xaml
+++ b/EnvyUpdate/InfoWindow.xaml
@@ -7,14 +7,20 @@
         xmlns:p="clr-namespace:EnvyUpdate.Properties"
         mc:Ignorable="d"
         Title="" Height="400" Width="600" ResizeMode="NoResize" WindowStyle="ToolWindow" SizeToContent="WidthAndHeight">
-    <Grid>
-        <StackPanel Grid.Row="1">
-            <Button Content="{x:Static p:Resources.ui_info_website}" VerticalAlignment="Top" Height="20" Click="ButtonWeb_Click"/>
-            <Label x:Name="labelVer" Content="EnvyUpdate" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" Grid.RowSpan="2"/>
-            <Label Content="Licenses:" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
-            <ScrollViewer Height="310">
-                <TextBox IsReadOnly="True" HorizontalAlignment="Left" TextWrapping="Wrap" Text="=== EnvyUpdate ===&#xA;&#xA;MIT License&#xA;&#xA;Copyright (c) 2019-2023 Jakob Senkl&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in all&#xA;copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#xA;SOFTWARE.&#xA;&#xA;=== Fody ===&#xA;&#xA;MIT License&#xA;&#xA;Copyright (c) Simon Cropp&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in&#xA;all copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN&#xA;THE SOFTWARE.&#xA;&#xA;=== Costura.Fody ===&#xA;&#xA;The MIT License&#xA;&#xA;Copyright (c) 2012 Simon Cropp and contributors&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in&#xA;all copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN&#xA;THE SOFTWARE.&#xA;&#xA;=== wpf-notifyicon ===&#xA;&#xA;The Code Project Open License (CPOL) 1.02&#xA;&#xA;Preamble&#xA;&#xA;This License governs Your use of the Work. This License is intended to allow developers to use the Source Code and Executable Files provided as part of the Work in any application in any form. &#xA;&#xA;The main points subject to the terms of the License are:&#xA;  * Source Code and Executable Files can be used in commercial applications; &#xA;  * Source Code and Executable Files can be redistributed; and &#xA;  * Source Code can be modified to create derivative works. &#xA;  * No claim of suitability, guarantee, or any warranty whatsoever is provided. The software is provided &quot;as-is&quot;. &#xA;  * The Article accompanying the Work may not be distributed or republished without the Author's consent &#xA;This License is entered between You, the individual or other entity reading or otherwise making use of the Work licensed pursuant to this License and the individual or other entity which offers the Work under the terms of this License (&quot;Author&quot;).&#xA;&#xA;License&#xA;&#xA;THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CODE PROJECT OPEN LICENSE (&quot;LICENSE&quot;). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.&#xA;&#xA;BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HEREIN, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE AUTHOR GRANTS YOU THE RIGHTS CONTAINED HEREIN IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. IF YOU DO NOT AGREE TO ACCEPT AND BE BOUND BY THE TERMS OF THIS LICENSE, YOU CANNOT MAKE ANY USE OF THE WORK.&#xA;  1. Definitions.  &#xA;    1. &quot;Articles&quot; means, collectively, all articles written by Author which describes how the Source Code and Executable Files for the Work may be used by a user. &#xA;    2. &quot;Author&quot; means the individual or entity that offers the Work under the terms of this License. &#xA;    3. &quot;Derivative Work&quot; means a work based upon the Work or upon the Work and other pre-existing works. &#xA;    4. &quot;Executable Files&quot; refer to the executables, binary files, configuration and any required data files included in the Work. &#xA;    5. &quot;Publisher&quot; means the provider of the website, magazine, CD-ROM, DVD or other medium from or by which the Work is obtained by You. &#xA;    6. &quot;Source Code&quot; refers to the collection of source code and configuration files used to create the Executable Files. &#xA;    7. &quot;Standard Version&quot; refers to such a Work if it has not been modified, or has been modified in accordance with the consent of the Author, such consent being in the full discretion of the Author.  &#xA;    8. &quot;Work&quot; refers to the collection of files distributed by the Publisher, including the Source Code, Executable Files, binaries, data files, documentation, whitepapers and the Articles.  &#xA;    9. &quot;You&quot; is you, an individual or entity wishing to use the Work and exercise your rights under this License.    &#xA;  2. Fair Use/Fair Use Rights. Nothing in this License is intended to reduce, limit, or restrict any rights arising from fair use, fair dealing, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.  &#xA;  3. License Grant. Subject to the terms and conditions of this License, the Author hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:  &#xA;    1. You may use the standard version of the Source Code or Executable Files in Your own applications.  &#xA;    2. You may apply bug fixes, portability fixes and other modifications obtained from the Public Domain or from the Author. A Work modified in such a way shall still be considered the standard version and will be subject to this License. &#xA;    3. You may otherwise modify Your copy of this Work (excluding the Articles) in any way to create a Derivative Work, provided that You insert a prominent notice in each changed file stating how, when and where You changed that file. &#xA;    4. You may distribute the standard version of the Executable Files and Source Code or Derivative Work in aggregate with other (possibly commercial) programs as part of a larger (possibly commercial) software distribution.  &#xA;    5. The Articles discussing the Work published in any form by the author may not be distributed or republished without the Author's consent. The author retains copyright to any such Articles. You may use the Executable Files and Source Code pursuant to this License but you may not repost or republish or otherwise distribute or make available the Articles, without the prior written consent of the Author.  Any subroutines or modules supplied by You and linked into the Source Code or Executable Files of this Work shall not be considered part of this Work and will not be subject to the terms of this License.  &#xA;  4. Patent License. Subject to the terms and conditions of this License, each Author hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, import, and otherwise transfer the Work. &#xA;  5. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:  &#xA;    1. You agree not to remove any of the original copyright, patent, trademark, and attribution notices and associated disclaimers that may appear in the Source Code or Executable Files.  &#xA;    2. You agree not to advertise or in any way imply that this Work is a product of Your own.  &#xA;    3. The name of the Author may not be used to endorse or promote products derived from the Work without the prior written consent of the Author. &#xA;    4. You agree not to sell, lease, or rent any part of the Work. This does not restrict you from including the Work or any part of the Work inside a larger software distribution that itself is being sold. The Work by itself, though, cannot be sold, leased or rented. &#xA;    5. You may distribute the Executable Files and Source Code only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy of the Executable Files or Source Code You distribute and ensure that anyone receiving such Executable Files and Source Code agrees that the terms of this License apply to such Executable Files and/or Source Code. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute the Executable Files or Source Code with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License.  &#xA;    6. You agree not to use the Work for illegal, immoral or improper purposes, or on pages containing illegal, immoral or improper material. The Work is subject to applicable export laws. You agree to comply with all such laws and regulations that may apply to the Work after Your receipt of the Work.    &#xA;  6. Representations, Warranties and Disclaimer. THIS WORK IS PROVIDED &quot;AS IS&quot;, &quot;WHERE IS&quot; AND &quot;AS AVAILABLE&quot;, WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OR CONDITIONS OR GUARANTEES. YOU, THE USER, ASSUME ALL RISK IN ITS USE, INCLUDING COPYRIGHT INFRINGEMENT, PATENT INFRINGEMENT, SUITABILITY, ETC. AUTHOR EXPRESSLY DISCLAIMS ALL EXPRESS, IMPLIED OR STATUTORY WARRANTIES OR CONDITIONS, INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF MERCHANTABILITY, MERCHANTABLE QUALITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY WARRANTY OF TITLE OR NON-INFRINGEMENT, OR THAT THE WORK (OR ANY PORTION THEREOF) IS CORRECT, USEFUL, BUG-FREE OR FREE OF VIRUSES. YOU MUST PASS THIS DISCLAIMER ON WHENEVER YOU DISTRIBUTE THE WORK OR DERIVATIVE WORKS.  &#xA;  7. Indemnity. You agree to defend, indemnify and hold harmless the Author and the Publisher from and against any claims, suits, losses, damages, liabilities, costs, and expenses (including reasonable legal or attorneys' fees) resulting from or relating to any use of the Work by You.  &#xA;  8. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL THE AUTHOR OR THE PUBLISHER BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK OR OTHERWISE, EVEN IF THE AUTHOR OR THE PUBLISHER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  &#xA;  9. Termination.  &#xA;    1. This License and the rights granted hereunder will terminate automatically upon any breach by You of any term of this License. Individuals or entities who have received Derivative Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 6, 7, 8, 9, 10 and 11 will survive any termination of this License.  &#xA;    2. If You bring a copyright, trademark, patent or any other infringement claim against any contributor over infringements You claim are made by the Work, your License from such contributor to the Work ends automatically. &#xA;    3. Subject to the above terms and conditions, this License is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, the Author reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.    &#xA;  10. Publisher. The parties hereby confirm that the Publisher shall not, under any circumstances, be responsible for and shall not have any liability in respect of the subject matter of this License. The Publisher makes no warranty whatsoever in connection with the Work and shall not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. The Publisher reserves the right to cease making the Work available to You at any time without notice &#xA;  11. Miscellaneous  &#xA;    1. This License shall be governed by the laws of the location of the head office of the Author or if the Author is an individual, the laws of location of the principal place of residence of the Author. &#xA;    2. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this License, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.  &#xA;    3. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.  &#xA;    4. This License constitutes the entire agreement between the parties with respect to the Work licensed herein. There are no understandings, agreements or representations with respect to the Work not specified herein. The Author shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Author and You.    &#xA;&#xA;=== ResourceEmbedder ===&#xA;&#xA;The MIT License (MIT)&#xA;&#xA;Copyright (c) MarcStan&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in all&#xA;copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#xA;SOFTWARE.&#xA;&#xA;=== Windows Community Toolkit ===&#xA;&#xA;Copyright © .NET Foundation and Contributors&#xA;&#xA;All rights reserved.&#xA;&#xA;## MIT License (MIT)&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." VerticalAlignment="Top" Grid.Row="1" Width="599"/>
-            </ScrollViewer>
-        </StackPanel>
-    </Grid>
+    <StackPanel Grid.Row="1">
+        <Button Content="{x:Static p:Resources.ui_info_website}" VerticalAlignment="Top" Height="20" Click="ButtonWeb_Click"/>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+
+            <Label x:Name="labelVer" Content="EnvyUpdate" FontWeight="Bold" Grid.Column="0"/>
+            <CheckBox x:Name="chkLog" Content="Enable logging to file" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="1" Checked="chkLog_Checked" Unchecked="chkLog_Unchecked"/>
+        </Grid>
+        <Label Content="Licenses:" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
+        <ScrollViewer Height="310">
+            <TextBox IsReadOnly="True" HorizontalAlignment="Left" TextWrapping="Wrap" Text="=== EnvyUpdate ===&#xA;&#xA;MIT License&#xA;&#xA;Copyright (c) 2019-2023 Jakob Senkl&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in all&#xA;copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#xA;SOFTWARE.&#xA;&#xA;=== Fody ===&#xA;&#xA;MIT License&#xA;&#xA;Copyright (c) Simon Cropp&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in&#xA;all copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN&#xA;THE SOFTWARE.&#xA;&#xA;=== Costura.Fody ===&#xA;&#xA;The MIT License&#xA;&#xA;Copyright (c) 2012 Simon Cropp and contributors&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in&#xA;all copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN&#xA;THE SOFTWARE.&#xA;&#xA;=== wpf-notifyicon ===&#xA;&#xA;The Code Project Open License (CPOL) 1.02&#xA;&#xA;Preamble&#xA;&#xA;This License governs Your use of the Work. This License is intended to allow developers to use the Source Code and Executable Files provided as part of the Work in any application in any form. &#xA;&#xA;The main points subject to the terms of the License are:&#xA;  * Source Code and Executable Files can be used in commercial applications; &#xA;  * Source Code and Executable Files can be redistributed; and &#xA;  * Source Code can be modified to create derivative works. &#xA;  * No claim of suitability, guarantee, or any warranty whatsoever is provided. The software is provided &quot;as-is&quot;. &#xA;  * The Article accompanying the Work may not be distributed or republished without the Author's consent &#xA;This License is entered between You, the individual or other entity reading or otherwise making use of the Work licensed pursuant to this License and the individual or other entity which offers the Work under the terms of this License (&quot;Author&quot;).&#xA;&#xA;License&#xA;&#xA;THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CODE PROJECT OPEN LICENSE (&quot;LICENSE&quot;). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.&#xA;&#xA;BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HEREIN, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE AUTHOR GRANTS YOU THE RIGHTS CONTAINED HEREIN IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. IF YOU DO NOT AGREE TO ACCEPT AND BE BOUND BY THE TERMS OF THIS LICENSE, YOU CANNOT MAKE ANY USE OF THE WORK.&#xA;  1. Definitions.  &#xA;    1. &quot;Articles&quot; means, collectively, all articles written by Author which describes how the Source Code and Executable Files for the Work may be used by a user. &#xA;    2. &quot;Author&quot; means the individual or entity that offers the Work under the terms of this License. &#xA;    3. &quot;Derivative Work&quot; means a work based upon the Work or upon the Work and other pre-existing works. &#xA;    4. &quot;Executable Files&quot; refer to the executables, binary files, configuration and any required data files included in the Work. &#xA;    5. &quot;Publisher&quot; means the provider of the website, magazine, CD-ROM, DVD or other medium from or by which the Work is obtained by You. &#xA;    6. &quot;Source Code&quot; refers to the collection of source code and configuration files used to create the Executable Files. &#xA;    7. &quot;Standard Version&quot; refers to such a Work if it has not been modified, or has been modified in accordance with the consent of the Author, such consent being in the full discretion of the Author.  &#xA;    8. &quot;Work&quot; refers to the collection of files distributed by the Publisher, including the Source Code, Executable Files, binaries, data files, documentation, whitepapers and the Articles.  &#xA;    9. &quot;You&quot; is you, an individual or entity wishing to use the Work and exercise your rights under this License.    &#xA;  2. Fair Use/Fair Use Rights. Nothing in this License is intended to reduce, limit, or restrict any rights arising from fair use, fair dealing, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.  &#xA;  3. License Grant. Subject to the terms and conditions of this License, the Author hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:  &#xA;    1. You may use the standard version of the Source Code or Executable Files in Your own applications.  &#xA;    2. You may apply bug fixes, portability fixes and other modifications obtained from the Public Domain or from the Author. A Work modified in such a way shall still be considered the standard version and will be subject to this License. &#xA;    3. You may otherwise modify Your copy of this Work (excluding the Articles) in any way to create a Derivative Work, provided that You insert a prominent notice in each changed file stating how, when and where You changed that file. &#xA;    4. You may distribute the standard version of the Executable Files and Source Code or Derivative Work in aggregate with other (possibly commercial) programs as part of a larger (possibly commercial) software distribution.  &#xA;    5. The Articles discussing the Work published in any form by the author may not be distributed or republished without the Author's consent. The author retains copyright to any such Articles. You may use the Executable Files and Source Code pursuant to this License but you may not repost or republish or otherwise distribute or make available the Articles, without the prior written consent of the Author.  Any subroutines or modules supplied by You and linked into the Source Code or Executable Files of this Work shall not be considered part of this Work and will not be subject to the terms of this License.  &#xA;  4. Patent License. Subject to the terms and conditions of this License, each Author hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, import, and otherwise transfer the Work. &#xA;  5. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:  &#xA;    1. You agree not to remove any of the original copyright, patent, trademark, and attribution notices and associated disclaimers that may appear in the Source Code or Executable Files.  &#xA;    2. You agree not to advertise or in any way imply that this Work is a product of Your own.  &#xA;    3. The name of the Author may not be used to endorse or promote products derived from the Work without the prior written consent of the Author. &#xA;    4. You agree not to sell, lease, or rent any part of the Work. This does not restrict you from including the Work or any part of the Work inside a larger software distribution that itself is being sold. The Work by itself, though, cannot be sold, leased or rented. &#xA;    5. You may distribute the Executable Files and Source Code only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy of the Executable Files or Source Code You distribute and ensure that anyone receiving such Executable Files and Source Code agrees that the terms of this License apply to such Executable Files and/or Source Code. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute the Executable Files or Source Code with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License.  &#xA;    6. You agree not to use the Work for illegal, immoral or improper purposes, or on pages containing illegal, immoral or improper material. The Work is subject to applicable export laws. You agree to comply with all such laws and regulations that may apply to the Work after Your receipt of the Work.    &#xA;  6. Representations, Warranties and Disclaimer. THIS WORK IS PROVIDED &quot;AS IS&quot;, &quot;WHERE IS&quot; AND &quot;AS AVAILABLE&quot;, WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OR CONDITIONS OR GUARANTEES. YOU, THE USER, ASSUME ALL RISK IN ITS USE, INCLUDING COPYRIGHT INFRINGEMENT, PATENT INFRINGEMENT, SUITABILITY, ETC. AUTHOR EXPRESSLY DISCLAIMS ALL EXPRESS, IMPLIED OR STATUTORY WARRANTIES OR CONDITIONS, INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF MERCHANTABILITY, MERCHANTABLE QUALITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY WARRANTY OF TITLE OR NON-INFRINGEMENT, OR THAT THE WORK (OR ANY PORTION THEREOF) IS CORRECT, USEFUL, BUG-FREE OR FREE OF VIRUSES. YOU MUST PASS THIS DISCLAIMER ON WHENEVER YOU DISTRIBUTE THE WORK OR DERIVATIVE WORKS.  &#xA;  7. Indemnity. You agree to defend, indemnify and hold harmless the Author and the Publisher from and against any claims, suits, losses, damages, liabilities, costs, and expenses (including reasonable legal or attorneys' fees) resulting from or relating to any use of the Work by You.  &#xA;  8. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL THE AUTHOR OR THE PUBLISHER BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK OR OTHERWISE, EVEN IF THE AUTHOR OR THE PUBLISHER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  &#xA;  9. Termination.  &#xA;    1. This License and the rights granted hereunder will terminate automatically upon any breach by You of any term of this License. Individuals or entities who have received Derivative Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 6, 7, 8, 9, 10 and 11 will survive any termination of this License.  &#xA;    2. If You bring a copyright, trademark, patent or any other infringement claim against any contributor over infringements You claim are made by the Work, your License from such contributor to the Work ends automatically. &#xA;    3. Subject to the above terms and conditions, this License is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, the Author reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.    &#xA;  10. Publisher. The parties hereby confirm that the Publisher shall not, under any circumstances, be responsible for and shall not have any liability in respect of the subject matter of this License. The Publisher makes no warranty whatsoever in connection with the Work and shall not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. The Publisher reserves the right to cease making the Work available to You at any time without notice &#xA;  11. Miscellaneous  &#xA;    1. This License shall be governed by the laws of the location of the head office of the Author or if the Author is an individual, the laws of location of the principal place of residence of the Author. &#xA;    2. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this License, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.  &#xA;    3. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.  &#xA;    4. This License constitutes the entire agreement between the parties with respect to the Work licensed herein. There are no understandings, agreements or representations with respect to the Work not specified herein. The Author shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Author and You.    &#xA;&#xA;=== ResourceEmbedder ===&#xA;&#xA;The MIT License (MIT)&#xA;&#xA;Copyright (c) MarcStan&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in all&#xA;copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#xA;SOFTWARE.&#xA;&#xA;=== Windows Community Toolkit ===&#xA;&#xA;Copyright © .NET Foundation and Contributors&#xA;&#xA;All rights reserved.&#xA;&#xA;## MIT License (MIT)&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." VerticalAlignment="Top" Grid.Row="1" Width="599"/>
+        </ScrollViewer>
+    </StackPanel>
 </Window>
diff --git a/EnvyUpdate/InfoWindow.xaml.cs b/EnvyUpdate/InfoWindow.xaml.cs
index 9bba5d5..e610e89 100644
--- a/EnvyUpdate/InfoWindow.xaml.cs
+++ b/EnvyUpdate/InfoWindow.xaml.cs
@@ -21,6 +21,9 @@ namespace EnvyUpdate
             labelVer.Content += " " + version;
             if (GlobalVars.monitoringInstall)
                 labelVer.FontStyle = FontStyles.Italic;
+
+            if (File.Exists(Path.Combine(GlobalVars.exeloc, "envyupdate.log")))
+                chkLog.IsChecked = true;
         }
 
         private void ButtonWeb_Click(object sender, RoutedEventArgs e)
@@ -28,5 +31,20 @@ namespace EnvyUpdate
             Debug.LogToFile("INFO Launching website.");
             System.Diagnostics.Process.Start("https://github.com/fyr77/EnvyUpdate/");
         }
+
+        private void chkLog_Checked(object sender, RoutedEventArgs e)
+        {
+            Debug.isVerbose = true;
+            Debug.LogToFile("------");
+            Debug.LogToFile("INFO Enabled logging to file. Restart Application to see full startup log.");
+        }
+
+        private void chkLog_Unchecked(object sender, RoutedEventArgs e)
+        {
+            Debug.LogToFile("INFO Disabled logging to file.");
+            if (File.Exists(Path.Combine(GlobalVars.exeloc, "envyupdate.log")))
+                File.Move(Path.Combine(GlobalVars.exeloc, "envyupdate.log"), Path.Combine(GlobalVars.exeloc, "envyupdate.old.log"));
+            Debug.isVerbose = false;
+        }
     }
 }
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index cd86d62..b6344c6 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -37,11 +37,16 @@ namespace EnvyUpdate
                 // This is necessary, since .NET throws an exception if you check for a non-existant arg.
             }
 
-            if (Debug.isVerbose)
+            // Check if Debug file exists
+            if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
             {
-                File.AppendAllText(Debug.debugFile, "INFO Starting EnvyUpdate, version " + System.Diagnostics.FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion);
+                Debug.isVerbose = true;
+                Debug.LogToFile("------");
+                Debug.LogToFile("INFO Found log file, will start logging to this.");
             }
 
+            Debug.LogToFile("INFO Starting EnvyUpdate, version " + System.Diagnostics.FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion);
+
             // Check if EnvyUpdate is already running
             if (Util.IsInstanceOpen("EnvyUpdate"))
             {
@@ -95,7 +100,7 @@ namespace EnvyUpdate
             else
                 textblockLocalType.Text = "Standard";
 
-            Debug.LogToFile("INFO Done detecting driver type.");
+            Debug.LogToFile("INFO Done detecting driver type: " + textblockLocalType.Text);
 
             // Check for startup shortcut
             if (File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), "EnvyUpdate.lnk")))
@@ -189,7 +194,7 @@ namespace EnvyUpdate
             }
             catch (ArgumentException)
             {
-                Debug.LogToFile("WARN Could not get GPU update URL, trying again with standard driver.");
+                Debug.LogToFile("WARN Could not get GPU update URL, trying again with non-studio driver.");
                 try
                 {
                     // disable SD and try with GRD
@@ -202,6 +207,11 @@ namespace EnvyUpdate
                     MessageBox.Show(Properties.Resources.ui_studionotsupported);
                     radioGRD.IsChecked = true;
                 }
+                catch (ArgumentNullException)
+                {
+                    MessageBox.Show("ERROR: Could not get list of GPU models from Nvidia, please check your network connection.\nOtherwise, please report this issue on GitHub.");
+                    Environment.Exit(11);
+                }
                 catch (ArgumentException e)
                 {
                     // Now we have a problem.
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 328a24d..e4587e0 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -132,7 +132,7 @@ namespace EnvyUpdate
 
             Environment.Exit(2);
         }
-        public static int GetIDs(string IDtype)
+        public static int GetIDs(string IDtype, bool retry = true)
         {
             string xmlcontent = null;
             int id = -1;
@@ -154,7 +154,6 @@ namespace EnvyUpdate
             Debug.LogToFile("INFO Got Nvidia GPU list.");
             if (xmlcontent == null)
             {
-                Debug.LogToFile("WARN GPU list is NULL! This is a possible error source.");
                 switch (IDtype)
                 {
                     case "osid":
@@ -162,8 +161,22 @@ namespace EnvyUpdate
                         Debug.LogToFile("WARN Ignore previous warning, just getting osid.");
                         Debug.LogToFile("INFO Got osid: " + id);
                         break;
+                    case "psid":
+                    case "pfid":
+                        Debug.LogToFile("WARN GPU list is NULL! This is a possible error source.");
+                        if (retry)
+                        {
+                            Debug.LogToFile("WARN Trying to get ID again.");
+                            id = GetIDs(IDtype, false);
+                        }
+                        else
+                        {
+                            Debug.LogToFile("FATAL Could not get GPU list to find IDs.");
+                            throw new ArgumentNullException();
+                        }
+                        break;
                     default:
-                        Debug.LogToFile("WARN GetIDs was called, but nothing was specified.");
+                        Debug.LogToFile("WARN GetIDs was called, but nothing was specified. THIS SHOULD NOT HAPPEN!");
                         break;
                 }
             }
@@ -224,7 +237,7 @@ namespace EnvyUpdate
                     }
                     else
                     {
-                        Debug.LogToFile("DEBUG Getting something else than psid.");
+                        Debug.LogToFile("DEBUG Getting something other than psid.");
 
                         string result = name.Parent.Value.ToLower();
                         int index = result.IndexOf(sName);

From 1517bc3f92be6963b73a131e6f53b88f79eee85b Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Sun, 9 Jul 2023 18:24:44 +0200
Subject: [PATCH 03/69] fix typo in infowindow

---
 EnvyUpdate/InfoWindow.xaml.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/EnvyUpdate/InfoWindow.xaml.cs b/EnvyUpdate/InfoWindow.xaml.cs
index e610e89..25c2f5d 100644
--- a/EnvyUpdate/InfoWindow.xaml.cs
+++ b/EnvyUpdate/InfoWindow.xaml.cs
@@ -22,7 +22,7 @@ namespace EnvyUpdate
             if (GlobalVars.monitoringInstall)
                 labelVer.FontStyle = FontStyles.Italic;
 
-            if (File.Exists(Path.Combine(GlobalVars.exeloc, "envyupdate.log")))
+            if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
                 chkLog.IsChecked = true;
         }
 
@@ -42,8 +42,8 @@ namespace EnvyUpdate
         private void chkLog_Unchecked(object sender, RoutedEventArgs e)
         {
             Debug.LogToFile("INFO Disabled logging to file.");
-            if (File.Exists(Path.Combine(GlobalVars.exeloc, "envyupdate.log")))
-                File.Move(Path.Combine(GlobalVars.exeloc, "envyupdate.log"), Path.Combine(GlobalVars.exeloc, "envyupdate.old.log"));
+            if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
+                File.Move(Path.Combine(GlobalVars.exedirectory, "envyupdate.log"), Path.Combine(GlobalVars.exedirectory, "envyupdate." + DateTime.Now.ToString("yyyyMMdd-HHmmss") + ".log"));
             Debug.isVerbose = false;
         }
     }

From 71221ef5b47f67600c29e466cf4023b0898f9ec1 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Sun, 9 Jul 2023 18:25:55 +0200
Subject: [PATCH 04/69] bump version

---
 EnvyUpdate/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index 2659d08..322a88d 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.19")]
-[assembly: AssemblyFileVersion("2.19")]
+[assembly: AssemblyVersion("2.20")]
+[assembly: AssemblyFileVersion("2.20")]

From e9c83dd8cef2eb02d9577735a07c9b1fc55267b9 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Sun, 9 Jul 2023 18:28:11 +0200
Subject: [PATCH 05/69] replace old format

---
 EnvyUpdate/MainWindow.xaml.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index b6344c6..d16e2b2 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -90,8 +90,7 @@ namespace EnvyUpdate
                 }
             }
 
-            if (Debug.isVerbose)
-                File.AppendAllText(Debug.debugFile, "INFO Detecting driver type.");
+            Debug.LogToFile("INFO Detecting driver type.");
 
             if (Util.IsDCH())
                 textblockLocalType.Text = "DCH";

From a28b56f48166a56a5e524337d179bd3508dc381b Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Sun, 9 Jul 2023 18:33:17 +0200
Subject: [PATCH 06/69] improve skip check and fix old format

---
 EnvyUpdate/MainWindow.xaml.cs | 2 +-
 EnvyUpdate/Util.cs            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index d16e2b2..07909e0 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -292,7 +292,7 @@ namespace EnvyUpdate
             }
 
             //Check for different version than skipped version
-            if (skippedVer != onlineDriv)
+            if (skippedVer != null && skippedVer != onlineDriv)
             {
                 Debug.LogToFile("INFO Skipped version is surpassed, deleting setting.");
                 skippedVer = null;
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index e4587e0..2736164 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -223,12 +223,12 @@ namespace EnvyUpdate
                 string sName = name.Value.ToString().ToLower();
                 if (sName == query)
                 {
-                    Debug.LogToFile("DEBUG Matched GetValueFromName query: " + sName);
+                    Debug.LogToFile("INFO Matched GetValueFromName query: " + sName);
                     string cleanResult = null;
 
                     if (psid)
                     {
-                        Debug.LogToFile("DEBUG Getting psid.");
+                        Debug.LogToFile("INFO Getting psid.");
 
                         if (i == 0)
                             value1 = int.Parse(name.Parent.FirstAttribute.Value);
@@ -237,7 +237,7 @@ namespace EnvyUpdate
                     }
                     else
                     {
-                        Debug.LogToFile("DEBUG Getting something other than psid.");
+                        Debug.LogToFile("INFO Getting something other than psid.");
 
                         string result = name.Parent.Value.ToLower();
                         int index = result.IndexOf(sName);
@@ -452,7 +452,7 @@ namespace EnvyUpdate
 
             if (Debug.isFake)
             {
-                Debug.LogToFile("DEBUG Loading fake IDs.");
+                Debug.LogToFile("INFO Loading fake IDs.");
                 psid = Debug.LoadFakeIDs("psid");
                 pfid = Debug.LoadFakeIDs("pfid");
                 osid = Debug.LoadFakeIDs("osid");

From ee31cf06d4e071bd7e7ddd4b3fb8c0e32223dea0 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Sun, 9 Jul 2023 18:35:46 +0200
Subject: [PATCH 07/69] improve logging

---
 EnvyUpdate/InfoWindow.xaml.cs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/EnvyUpdate/InfoWindow.xaml.cs b/EnvyUpdate/InfoWindow.xaml.cs
index 25c2f5d..6f369cb 100644
--- a/EnvyUpdate/InfoWindow.xaml.cs
+++ b/EnvyUpdate/InfoWindow.xaml.cs
@@ -34,17 +34,23 @@ namespace EnvyUpdate
 
         private void chkLog_Checked(object sender, RoutedEventArgs e)
         {
-            Debug.isVerbose = true;
-            Debug.LogToFile("------");
-            Debug.LogToFile("INFO Enabled logging to file. Restart Application to see full startup log.");
+            if (!Debug.isVerbose)
+            {
+                Debug.isVerbose = true;
+                Debug.LogToFile("------");
+                Debug.LogToFile("INFO Enabled logging to file. Restart Application to see full startup log.");
+            }
         }
 
         private void chkLog_Unchecked(object sender, RoutedEventArgs e)
         {
-            Debug.LogToFile("INFO Disabled logging to file.");
-            if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
-                File.Move(Path.Combine(GlobalVars.exedirectory, "envyupdate.log"), Path.Combine(GlobalVars.exedirectory, "envyupdate." + DateTime.Now.ToString("yyyyMMdd-HHmmss") + ".log"));
-            Debug.isVerbose = false;
+            if (Debug.isVerbose)
+            {
+                Debug.LogToFile("INFO Disabled logging to file.");
+                if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
+                    File.Move(Path.Combine(GlobalVars.exedirectory, "envyupdate.log"), Path.Combine(GlobalVars.exedirectory, "envyupdate." + DateTime.Now.ToString("yyyyMMdd-HHmmss") + ".log"));
+                Debug.isVerbose = false;
+            }
         }
     }
 }

From 45c6dbce700ed948229150c9690272a4a11ab249 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Sun, 9 Jul 2023 18:43:52 +0200
Subject: [PATCH 08/69] remove confusing warning

---
 EnvyUpdate/Util.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 2736164..fdd5fc2 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -158,7 +158,6 @@ namespace EnvyUpdate
                 {
                     case "osid":
                         id = GetOSID();
-                        Debug.LogToFile("WARN Ignore previous warning, just getting osid.");
                         Debug.LogToFile("INFO Got osid: " + id);
                         break;
                     case "psid":

From cdcfccd87c492ca4632df99a0049d5cfd59073bc Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 00:16:57 +0200
Subject: [PATCH 09/69] complete UI rewrite

---
 EnvyUpdate/App.xaml                           |   8 +-
 EnvyUpdate/DashboardPage.xaml                 |  85 ++++
 EnvyUpdate/DashboardPage.xaml.cs              | 415 ++++++++++++++++++
 EnvyUpdate/EnvyUpdate.csproj                  |  36 +-
 EnvyUpdate/InfoWindow.xaml                    |  26 --
 EnvyUpdate/MainWindow.xaml                    |  88 ++--
 EnvyUpdate/MainWindow.xaml.cs                 | 377 +---------------
 EnvyUpdate/Properties/Licenses.Designer.cs    | 153 +++++++
 EnvyUpdate/Properties/Licenses.resx           | 190 ++++++++
 EnvyUpdate/Properties/Resources.Designer.cs   |  99 +++++
 EnvyUpdate/Properties/Resources.de.resx       |  33 ++
 EnvyUpdate/Properties/Resources.resx          |  33 ++
 EnvyUpdate/SettingsPage.xaml                  |  61 +++
 ...nfoWindow.xaml.cs => SettingsPage.xaml.cs} |  38 +-
 README.md                                     |   4 +-
 15 files changed, 1207 insertions(+), 439 deletions(-)
 create mode 100644 EnvyUpdate/DashboardPage.xaml
 create mode 100644 EnvyUpdate/DashboardPage.xaml.cs
 delete mode 100644 EnvyUpdate/InfoWindow.xaml
 create mode 100644 EnvyUpdate/Properties/Licenses.Designer.cs
 create mode 100644 EnvyUpdate/Properties/Licenses.resx
 create mode 100644 EnvyUpdate/SettingsPage.xaml
 rename EnvyUpdate/{InfoWindow.xaml.cs => SettingsPage.xaml.cs} (58%)

diff --git a/EnvyUpdate/App.xaml b/EnvyUpdate/App.xaml
index 414c0d4..de53160 100644
--- a/EnvyUpdate/App.xaml
+++ b/EnvyUpdate/App.xaml
@@ -2,8 +2,14 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:EnvyUpdate"
+             xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ui:ThemesDictionary Theme="Light"/>
+                <ui:ControlsDictionary />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
new file mode 100644
index 0000000..b9572ba
--- /dev/null
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -0,0 +1,85 @@
+<ui:UiPage x:Class="EnvyUpdate.DashboardPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:EnvyUpdate"
+      xmlns:p="clr-namespace:EnvyUpdate.Properties"
+      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+      mc:Ignorable="d" 
+      d:DesignHeight="400" d:DesignWidth="600"
+      Title="DashboardPage">
+
+    <Grid Margin="8,0,8,8">
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <ui:SymbolIcon Symbol="DeveloperBoard24" FontSize="64"/>
+            <TextBlock Margin="8,0,0,0" x:Name="textblockGPUName" Grid.Column="1" Text="GPU..." FontSize="32" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
+        </Grid>
+        
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+
+            <ui:InfoBar x:Name="infoBarStatus"
+            Title="Checking"
+            IsOpen="True"
+            IsClosable="False"
+            Message="..."
+            Severity="Informational" />
+
+            <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Secondary" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" />
+            
+            <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" />
+        </Grid>
+
+        <ProgressBar Grid.Row="2" Value="0" Visibility="Collapsed"/>
+        <!-- This is for later automatic downloading. Todo! -->
+
+        <Grid Margin="0,12,0,0" Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+
+            <ui:CardExpander x:Name="cardLocal" Margin="0,0,4,0" Grid.Column="0" Grid.Row="0" Icon="Desktop32" Header="..." ToolTip="{x:Static p:Resources.ui_localdriver}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Grid.Column="0" FontWeight="Bold" Text="{x:Static p:Resources.ui_localdriver_type}"/>
+                    <TextBlock Grid.Column="1" x:Name="textblockLocalType" Text="?" />
+                </Grid>
+            </ui:CardExpander>
+            <ui:CardExpander x:Name="cardOnline" Margin="4,0,0,0" Grid.Column="1" Grid.Row="0" Icon="Earth32" Header="..." ToolTip="{x:Static p:Resources.ui_onlinedriver}">
+                <ui:Button Icon="Open24" Click="CardOnline_Click" Content="{x:Static p:Resources.ui_openwebsite}" HorizontalAlignment="Stretch"/>
+            </ui:CardExpander>
+        </Grid>
+
+        <ui:CardControl Margin="0,12,0,0" Grid.Row="4" Icon="Color24" Header="Studio Driver">
+            <ui:ToggleSwitch x:Name="switchStudioDriver" IsChecked="False" />
+        </ui:CardControl>
+
+        <ui:CardControl Margin="0,12,0,0" Grid.Row="5" Icon="LightbulbFilament48" Header="{x:Static p:Resources.ui_autostart}">
+            <ui:ToggleSwitch x:Name="switchAutostart" IsChecked="False" Click="switchAutostart_Click" />
+        </ui:CardControl>
+    </Grid>
+</ui:UiPage>
diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
new file mode 100644
index 0000000..abb0b90
--- /dev/null
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -0,0 +1,415 @@
+using Microsoft.Build.Framework.XamlTypes;
+using Microsoft.Toolkit.Uwp.Notifications;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Threading;
+using Windows.ApplicationModel.VoiceCommands;
+
+namespace EnvyUpdate
+{
+    /// <summary>
+    /// Interaction logic for Dashboard.xaml
+    /// </summary>
+    public partial class DashboardPage
+    {
+        private string localDriv = null;
+        private string onlineDriv = null;
+        private string gpuURL = null;
+        private string skippedVer = null;
+        private string[] arguments = null;
+
+        public DashboardPage()
+        {
+            InitializeComponent();
+
+            // Try to get command line arguments
+            try
+            {
+                arguments = Environment.GetCommandLineArgs();
+            }
+            catch (IndexOutOfRangeException)
+            {
+                // This is necessary, since .NET throws an exception if you check for a non-existant arg.
+            }
+
+            // Delete installed legacy versions
+            if (Directory.Exists(GlobalVars.appdata))
+            {
+                Debug.LogToFile("INFO Found old appdata installation, uninstalling.");
+                UninstallAll();
+            }
+
+            localDriv = Util.GetLocDriv();
+
+            Debug.LogToFile("INFO Local driver version: " + localDriv);
+
+            if (localDriv != null)
+            {
+                Debug.LogToFile("INFO Local driver version already known, updating info without reloading.");
+                UpdateLocalVer(false);
+            }
+            else
+            {
+                if (arguments.Contains("/fake"))
+                {
+                    Debug.isFake = true;
+                    Debug.LogToFile("WARN Faking GPU with debug info.");
+                }
+                else
+                {
+                    Debug.LogToFile("FATAL No supported GPU found, terminating.");
+                    MessageBox.Show(Properties.Resources.no_compatible_gpu);
+                    Environment.Exit(255);
+                }
+            }
+
+            Debug.LogToFile("INFO Detecting driver type.");
+
+            if (Util.IsDCH())
+                textblockLocalType.Text = "DCH";
+            else if (Debug.isFake)
+                textblockLocalType.Text = "DCH (Debug)";
+            else
+                textblockLocalType.Text = "Standard";
+
+            Debug.LogToFile("INFO Done detecting driver type: " + textblockLocalType.Text);
+
+            // Check for startup shortcut
+            if (File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), "EnvyUpdate.lnk")))
+            {
+                Debug.LogToFile("INFO Autostart is enabled.");
+                switchAutostart.IsChecked = true;
+                switchAutostart_Click(null, null); //Automatically recreate shortcut to account for moved EXE.
+            }
+
+            DispatcherTimer Dt = new DispatcherTimer();
+            Dt.Tick += new EventHandler(Dt_Tick);
+            // Check for new updates every 5 hours.
+            Dt.Interval = new TimeSpan(5, 0, 0);
+            Dt.Start();
+            Debug.LogToFile("INFO Started check timer.");
+
+            string watchDirPath = Path.Combine(Environment.ExpandEnvironmentVariables("%ProgramW6432%"), "NVIDIA Corporation\\Installer2\\InstallerCore");
+            if (Directory.Exists(watchDirPath))
+            {
+                GlobalVars.monitoringInstall = true;
+
+                var driverFileChangedWatcher = new FileSystemWatcher(watchDirPath);
+                driverFileChangedWatcher.NotifyFilter = NotifyFilters.Attributes
+                                 | NotifyFilters.CreationTime
+                                 | NotifyFilters.FileName
+                                 | NotifyFilters.LastAccess
+                                 | NotifyFilters.LastWrite
+                                 | NotifyFilters.Size;
+                driverFileChangedWatcher.Changed += DriverFileChanged;
+
+                driverFileChangedWatcher.Filter = "*.dll";
+                driverFileChangedWatcher.IncludeSubdirectories = false;
+                driverFileChangedWatcher.EnableRaisingEvents = true;
+                Debug.LogToFile("INFO Started update file system watcher.");
+            }
+
+            Load();
+        }
+
+        private void Dt_Tick(object sender, EventArgs e)
+        {
+            Load();
+        }
+
+        private void Load()
+        {
+            if (Util.GetDTID() == 18)
+            {
+                Debug.LogToFile("INFO Found studio driver.");
+                switchStudioDriver.IsChecked = true;
+            }
+            else
+            {
+                Debug.LogToFile("INFO Found standard driver.");
+                switchStudioDriver.IsChecked = false;
+            }
+
+            if (File.Exists(GlobalVars.exedirectory + "skip.envy"))
+            {
+                Debug.LogToFile("INFO Found version skip config.");
+                skippedVer = File.ReadLines(GlobalVars.exedirectory + "skip.envy").First();
+            }
+
+            // This little bool check is necessary for debug mode on systems without an Nvidia GPU. 
+            if (Debug.isFake)
+            {
+                localDriv = Debug.LocalDriv();
+                cardLocal.Header = localDriv;
+                textblockGPUName.Text = Debug.GPUname();
+            }
+
+            try
+            {
+                Debug.LogToFile("INFO Trying to get GPU update URL.");
+                gpuURL = Util.GetGpuUrl();
+            }
+            catch (ArgumentException)
+            {
+                Debug.LogToFile("WARN Could not get GPU update URL, trying again with non-studio driver.");
+                try
+                {
+                    // disable SD and try with GRD
+                    if (File.Exists(GlobalVars.exedirectory + "sd.envy"))
+                    {
+                        File.Delete(GlobalVars.exedirectory + "sd.envy");
+                    }
+
+                    gpuURL = Util.GetGpuUrl(); //try again with GRD
+                    MessageBox.Show(Properties.Resources.ui_studionotsupported);
+                    switchStudioDriver.IsChecked = false;
+                }
+                catch (ArgumentNullException)
+                {
+                    MessageBox.Show("ERROR: Could not get list of GPU models from Nvidia, please check your network connection.\nOtherwise, please report this issue on GitHub.");
+                    Environment.Exit(11);
+                }
+                catch (ArgumentException e)
+                {
+                    // Now we have a problem.
+                    Debug.LogToFile("FATAL Invalid API response from Nvidia. Attempted API call: " + e.Message);
+                    MessageBox.Show("ERROR: Invalid API response from Nvidia. Please file an issue on GitHub.\nAttempted API call:\n" + e.Message);
+                    Environment.Exit(10);
+                }
+            }
+
+            using (var c = new WebClient())
+            {
+                Debug.LogToFile("INFO Trying to get newest driver version.");
+                string pContent = c.DownloadString(gpuURL);
+                var pattern = @"Windows\/\d{3}\.\d{2}";
+                Regex rgx = new Regex(pattern);
+                var matches = rgx.Matches(pContent);
+                onlineDriv = Regex.Replace(Convert.ToString(matches[0]), "Windows/", "");
+                cardOnline.Header = onlineDriv;
+                Debug.LogToFile("INFO Got online driver version: " + onlineDriv);
+            }
+
+            try
+            {
+                if (float.Parse(localDriv) < float.Parse(onlineDriv))
+                {
+                    Debug.LogToFile("INFO Local version is older than online. Setting UI...");
+                    SetInfoBar(false);
+                    buttonDownload.Visibility = Visibility.Visible;
+                    if (skippedVer == null)
+                    {
+                        buttonSkipVersion.ToolTip = Properties.Resources.ui_skipversion;
+                        buttonSkipVersion.IsEnabled = true;
+                        buttonSkipVersion.Visibility = Visibility.Visible;
+                    }
+                    else
+                    {
+                        buttonSkipVersion.IsEnabled = true;
+                        buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped;
+                    }
+
+                    Debug.LogToFile("INFO UI set.");
+
+                    if (skippedVer != onlineDriv)
+                    {
+                        Debug.LogToFile("INFO Showing update popup notification.");
+                        Notify.ShowDrivUpdatePopup();
+                    }
+                }
+                else
+                {
+                    Debug.LogToFile("INFO Local version is up to date.");
+                    buttonSkipVersion.Visibility = Visibility.Collapsed;
+                    SetInfoBar(true);
+                }
+            }
+            catch (FormatException)
+            {
+                Debug.LogToFile("INFO Caught FormatException, assuming locale workaround is necessary.");
+                //Thank you locales. Some languages need , instead of . for proper parsing
+                string cLocalDriv = localDriv.Replace('.', ',');
+                string cOnlineDriv = onlineDriv.Replace('.', ',');
+                if (float.Parse(cLocalDriv) < float.Parse(cOnlineDriv))
+                {
+                    Debug.LogToFile("INFO Local version is older than online. Setting UI...");
+                    SetInfoBar(false);
+                    buttonDownload.Visibility = Visibility.Visible;
+                    if (skippedVer == null)
+                    {
+                        buttonSkipVersion.IsEnabled = true;
+                        buttonSkipVersion.Visibility = Visibility.Visible;
+                    }
+                    else
+                    {
+                        buttonSkipVersion.IsEnabled = false;
+                        buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped;
+                    }
+                        
+                    if (skippedVer != onlineDriv)
+                    {
+                        Debug.LogToFile("INFO Showing update popup notification.");
+                        Notify.ShowDrivUpdatePopup();
+                    }
+                }
+                else
+                {
+                    Debug.LogToFile("INFO Local version is up to date.");
+                    buttonSkipVersion.Visibility = Visibility.Collapsed;
+                    SetInfoBar(true);
+                }
+            }
+
+            //Check for different version than skipped version
+            if (skippedVer != null && skippedVer != onlineDriv)
+            {
+                Debug.LogToFile("INFO Skipped version is surpassed, deleting setting.");
+                skippedVer = null;
+                if (File.Exists(GlobalVars.exedirectory + "skip.envy"))
+                    File.Delete(GlobalVars.exedirectory + "skip.envy");
+                buttonSkipVersion.ToolTip = Properties.Resources.ui_skipversion;
+                buttonSkipVersion.IsEnabled = true;
+                buttonSkipVersion.Visibility = Visibility.Visible;
+            }
+        }
+
+        private void buttonDL_Click(object sender, RoutedEventArgs e)
+        {
+            Debug.LogToFile("INFO Opening download page.");
+            Process.Start(gpuURL);
+        }
+
+        public void UninstallAll()
+        {
+            if (File.Exists(GlobalVars.startup + "\\EnvyUpdate.lnk"))
+            {
+                Debug.LogToFile("INFO Deleted startup entry.");
+                File.Delete(GlobalVars.startup + "\\EnvyUpdate.lnk");
+            }
+
+            if (File.Exists(GlobalVars.startmenu + "\\EnvyUpdate.lnk"))
+            {
+                Debug.LogToFile("INFO Deleted start menu entry.");
+                File.Delete(GlobalVars.startmenu + "\\EnvyUpdate.lnk");
+            }
+            if ((GlobalVars.exedirectory == GlobalVars.appdata) && File.Exists(GlobalVars.appdata + "EnvyUpdate.exe"))
+            {
+                Debug.LogToFile("INFO Deleting EnvyUpdate appdata and self.");
+                MessageBox.Show(Properties.Resources.uninstall_legacy_message);
+                Util.SelfDelete();
+            }
+            else if (Directory.Exists(GlobalVars.appdata))
+            {
+                Debug.LogToFile("INFO Deleting EnvyUpdate appdata folder");
+                Directory.Delete(GlobalVars.appdata, true);
+            }
+        }
+
+        private void radioGRD_Checked(object sender, RoutedEventArgs e)
+        {
+            if (File.Exists(GlobalVars.exedirectory + "sd.envy"))
+            {
+                Debug.LogToFile("INFO Switching to game ready driver.");
+                File.Delete(GlobalVars.exedirectory + "sd.envy");
+                Load();
+            }
+        }
+
+        private void radioSD_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!File.Exists(GlobalVars.exedirectory + "sd.envy"))
+            {
+                Debug.LogToFile("INFO Switching to studio driver.");
+                File.Create(GlobalVars.exedirectory + "sd.envy").Close();
+                Load();
+            }
+        }
+
+        private void switchAutostart_Click(object sender, RoutedEventArgs e)
+        {
+            if (File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), "EnvyUpdate.lnk")))
+            {
+                Debug.LogToFile("INFO Removing autostart entry.");
+                File.Delete(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), "EnvyUpdate.lnk"));
+            }
+            if (switchAutostart.IsChecked == true)
+            {
+                Debug.LogToFile("INFO Creating autostart entry.");
+                Util.CreateShortcut("EnvyUpdate", Environment.GetFolderPath(Environment.SpecialFolder.Startup), GlobalVars.exeloc, "NVidia Update Checker", "/minimize");
+            }
+        }
+
+        private void buttonSkip_Click(object sender, RoutedEventArgs e)
+        {
+            Debug.LogToFile("INFO Skipping version.");
+            skippedVer = onlineDriv;
+            File.WriteAllText(GlobalVars.exedirectory + "skip.envy", onlineDriv);
+            buttonSkipVersion.IsEnabled = false;
+            buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped;
+            MessageBox.Show(Properties.Resources.skip_confirm);
+        }
+
+        private void UpdateLocalVer(bool reloadLocalDriv = true)
+        {
+            Debug.LogToFile("INFO Updating local driver version in UI.");
+            if (reloadLocalDriv)
+            {
+                Debug.LogToFile("INFO Reloading local driver version.");
+                localDriv = Util.GetLocDriv();
+            }
+            cardLocal.Header = localDriv;
+            if (GlobalVars.isMobile)
+                textblockGPUName.Text = Util.GetGPUName(false) + " (mobile)";
+            else
+                textblockGPUName.Text = Util.GetGPUName(false);
+        }
+
+        void DriverFileChanged(object sender, FileSystemEventArgs e)
+        {
+            Debug.LogToFile("INFO Watched driver file changed! Reloading data.");
+            System.Threading.Thread.Sleep(10000);
+            Application.Current.Dispatcher.Invoke(delegate
+            {
+                UpdateLocalVer();
+                Load();
+            });
+        }
+
+        private void CardOnline_Click(object sender, RoutedEventArgs e)
+        {
+            Debug.LogToFile("INFO Opening download page.");
+            Process.Start(gpuURL);
+        }
+
+        private void SetInfoBar (bool good)
+        {
+            if (good)
+            {
+                infoBarStatus.Severity = Wpf.Ui.Controls.InfoBarSeverity.Success;
+                infoBarStatus.Title = Properties.Resources.ui_info_uptodate;
+                infoBarStatus.Message = Properties.Resources.ui_message_good;
+            }
+            else
+            {
+                infoBarStatus.Severity = Wpf.Ui.Controls.InfoBarSeverity.Warning;
+                infoBarStatus.Title = Properties.Resources.ui_info_outdated;
+                infoBarStatus.Message = Properties.Resources.ui_message_update;
+            }
+        }
+    }
+}
diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj
index b3e717f..ef59029 100644
--- a/EnvyUpdate/EnvyUpdate.csproj
+++ b/EnvyUpdate/EnvyUpdate.csproj
@@ -100,21 +100,25 @@
     </ApplicationDefinition>
     <Compile Include="Debug.cs" />
     <Compile Include="GlobalVars.cs" />
-    <Compile Include="InfoWindow.xaml.cs">
-      <DependentUpon>InfoWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Notify.cs" />
+    <Compile Include="DashboardPage.xaml.cs">
+      <DependentUpon>DashboardPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Licenses.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Licenses.resx</DependentUpon>
+    </Compile>
     <Compile Include="Properties\Resources.de.Designer.cs">
       <DependentUpon>Resources.de.resx</DependentUpon>
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
     </Compile>
+    <Compile Include="SettingsPage.xaml.cs">
+      <DependentUpon>SettingsPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="StringExt.cs" />
     <Compile Include="Util.cs" />
-    <Page Include="InfoWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -127,6 +131,14 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="DashboardPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SettingsPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -142,6 +154,10 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <EmbeddedResource Include="Properties\Licenses.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Licenses.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.de.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.de.Designer.cs</LastGenOutput>
@@ -197,9 +213,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Hardcodet.NotifyIcon.Wpf">
-      <Version>1.1.0</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
       <Version>7.1.3</Version>
     </PackageReference>
@@ -209,6 +222,9 @@
     <PackageReference Include="System.Text.Json">
       <Version>7.0.1</Version>
     </PackageReference>
+    <PackageReference Include="WPF-UI">
+      <Version>2.0.3</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/EnvyUpdate/InfoWindow.xaml b/EnvyUpdate/InfoWindow.xaml
deleted file mode 100644
index e9d09c5..0000000
--- a/EnvyUpdate/InfoWindow.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Window x:Class="EnvyUpdate.InfoWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:EnvyUpdate"
-        xmlns:p="clr-namespace:EnvyUpdate.Properties"
-        mc:Ignorable="d"
-        Title="" Height="400" Width="600" ResizeMode="NoResize" WindowStyle="ToolWindow" SizeToContent="WidthAndHeight">
-    <StackPanel Grid.Row="1">
-        <Button Content="{x:Static p:Resources.ui_info_website}" VerticalAlignment="Top" Height="20" Click="ButtonWeb_Click"/>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-
-            <Label x:Name="labelVer" Content="EnvyUpdate" FontWeight="Bold" Grid.Column="0"/>
-            <CheckBox x:Name="chkLog" Content="Enable logging to file" VerticalAlignment="Center" HorizontalAlignment="Right" Grid.Column="1" Checked="chkLog_Checked" Unchecked="chkLog_Unchecked"/>
-        </Grid>
-        <Label Content="Licenses:" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
-        <ScrollViewer Height="310">
-            <TextBox IsReadOnly="True" HorizontalAlignment="Left" TextWrapping="Wrap" Text="=== EnvyUpdate ===&#xA;&#xA;MIT License&#xA;&#xA;Copyright (c) 2019-2023 Jakob Senkl&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in all&#xA;copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#xA;SOFTWARE.&#xA;&#xA;=== Fody ===&#xA;&#xA;MIT License&#xA;&#xA;Copyright (c) Simon Cropp&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in&#xA;all copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN&#xA;THE SOFTWARE.&#xA;&#xA;=== Costura.Fody ===&#xA;&#xA;The MIT License&#xA;&#xA;Copyright (c) 2012 Simon Cropp and contributors&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in&#xA;all copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN&#xA;THE SOFTWARE.&#xA;&#xA;=== wpf-notifyicon ===&#xA;&#xA;The Code Project Open License (CPOL) 1.02&#xA;&#xA;Preamble&#xA;&#xA;This License governs Your use of the Work. This License is intended to allow developers to use the Source Code and Executable Files provided as part of the Work in any application in any form. &#xA;&#xA;The main points subject to the terms of the License are:&#xA;  * Source Code and Executable Files can be used in commercial applications; &#xA;  * Source Code and Executable Files can be redistributed; and &#xA;  * Source Code can be modified to create derivative works. &#xA;  * No claim of suitability, guarantee, or any warranty whatsoever is provided. The software is provided &quot;as-is&quot;. &#xA;  * The Article accompanying the Work may not be distributed or republished without the Author's consent &#xA;This License is entered between You, the individual or other entity reading or otherwise making use of the Work licensed pursuant to this License and the individual or other entity which offers the Work under the terms of this License (&quot;Author&quot;).&#xA;&#xA;License&#xA;&#xA;THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CODE PROJECT OPEN LICENSE (&quot;LICENSE&quot;). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.&#xA;&#xA;BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HEREIN, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE AUTHOR GRANTS YOU THE RIGHTS CONTAINED HEREIN IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. IF YOU DO NOT AGREE TO ACCEPT AND BE BOUND BY THE TERMS OF THIS LICENSE, YOU CANNOT MAKE ANY USE OF THE WORK.&#xA;  1. Definitions.  &#xA;    1. &quot;Articles&quot; means, collectively, all articles written by Author which describes how the Source Code and Executable Files for the Work may be used by a user. &#xA;    2. &quot;Author&quot; means the individual or entity that offers the Work under the terms of this License. &#xA;    3. &quot;Derivative Work&quot; means a work based upon the Work or upon the Work and other pre-existing works. &#xA;    4. &quot;Executable Files&quot; refer to the executables, binary files, configuration and any required data files included in the Work. &#xA;    5. &quot;Publisher&quot; means the provider of the website, magazine, CD-ROM, DVD or other medium from or by which the Work is obtained by You. &#xA;    6. &quot;Source Code&quot; refers to the collection of source code and configuration files used to create the Executable Files. &#xA;    7. &quot;Standard Version&quot; refers to such a Work if it has not been modified, or has been modified in accordance with the consent of the Author, such consent being in the full discretion of the Author.  &#xA;    8. &quot;Work&quot; refers to the collection of files distributed by the Publisher, including the Source Code, Executable Files, binaries, data files, documentation, whitepapers and the Articles.  &#xA;    9. &quot;You&quot; is you, an individual or entity wishing to use the Work and exercise your rights under this License.    &#xA;  2. Fair Use/Fair Use Rights. Nothing in this License is intended to reduce, limit, or restrict any rights arising from fair use, fair dealing, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.  &#xA;  3. License Grant. Subject to the terms and conditions of this License, the Author hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:  &#xA;    1. You may use the standard version of the Source Code or Executable Files in Your own applications.  &#xA;    2. You may apply bug fixes, portability fixes and other modifications obtained from the Public Domain or from the Author. A Work modified in such a way shall still be considered the standard version and will be subject to this License. &#xA;    3. You may otherwise modify Your copy of this Work (excluding the Articles) in any way to create a Derivative Work, provided that You insert a prominent notice in each changed file stating how, when and where You changed that file. &#xA;    4. You may distribute the standard version of the Executable Files and Source Code or Derivative Work in aggregate with other (possibly commercial) programs as part of a larger (possibly commercial) software distribution.  &#xA;    5. The Articles discussing the Work published in any form by the author may not be distributed or republished without the Author's consent. The author retains copyright to any such Articles. You may use the Executable Files and Source Code pursuant to this License but you may not repost or republish or otherwise distribute or make available the Articles, without the prior written consent of the Author.  Any subroutines or modules supplied by You and linked into the Source Code or Executable Files of this Work shall not be considered part of this Work and will not be subject to the terms of this License.  &#xA;  4. Patent License. Subject to the terms and conditions of this License, each Author hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, import, and otherwise transfer the Work. &#xA;  5. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:  &#xA;    1. You agree not to remove any of the original copyright, patent, trademark, and attribution notices and associated disclaimers that may appear in the Source Code or Executable Files.  &#xA;    2. You agree not to advertise or in any way imply that this Work is a product of Your own.  &#xA;    3. The name of the Author may not be used to endorse or promote products derived from the Work without the prior written consent of the Author. &#xA;    4. You agree not to sell, lease, or rent any part of the Work. This does not restrict you from including the Work or any part of the Work inside a larger software distribution that itself is being sold. The Work by itself, though, cannot be sold, leased or rented. &#xA;    5. You may distribute the Executable Files and Source Code only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy of the Executable Files or Source Code You distribute and ensure that anyone receiving such Executable Files and Source Code agrees that the terms of this License apply to such Executable Files and/or Source Code. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute the Executable Files or Source Code with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License.  &#xA;    6. You agree not to use the Work for illegal, immoral or improper purposes, or on pages containing illegal, immoral or improper material. The Work is subject to applicable export laws. You agree to comply with all such laws and regulations that may apply to the Work after Your receipt of the Work.    &#xA;  6. Representations, Warranties and Disclaimer. THIS WORK IS PROVIDED &quot;AS IS&quot;, &quot;WHERE IS&quot; AND &quot;AS AVAILABLE&quot;, WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES OR CONDITIONS OR GUARANTEES. YOU, THE USER, ASSUME ALL RISK IN ITS USE, INCLUDING COPYRIGHT INFRINGEMENT, PATENT INFRINGEMENT, SUITABILITY, ETC. AUTHOR EXPRESSLY DISCLAIMS ALL EXPRESS, IMPLIED OR STATUTORY WARRANTIES OR CONDITIONS, INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF MERCHANTABILITY, MERCHANTABLE QUALITY OR FITNESS FOR A PARTICULAR PURPOSE, OR ANY WARRANTY OF TITLE OR NON-INFRINGEMENT, OR THAT THE WORK (OR ANY PORTION THEREOF) IS CORRECT, USEFUL, BUG-FREE OR FREE OF VIRUSES. YOU MUST PASS THIS DISCLAIMER ON WHENEVER YOU DISTRIBUTE THE WORK OR DERIVATIVE WORKS.  &#xA;  7. Indemnity. You agree to defend, indemnify and hold harmless the Author and the Publisher from and against any claims, suits, losses, damages, liabilities, costs, and expenses (including reasonable legal or attorneys' fees) resulting from or relating to any use of the Work by You.  &#xA;  8. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL THE AUTHOR OR THE PUBLISHER BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK OR OTHERWISE, EVEN IF THE AUTHOR OR THE PUBLISHER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  &#xA;  9. Termination.  &#xA;    1. This License and the rights granted hereunder will terminate automatically upon any breach by You of any term of this License. Individuals or entities who have received Derivative Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 6, 7, 8, 9, 10 and 11 will survive any termination of this License.  &#xA;    2. If You bring a copyright, trademark, patent or any other infringement claim against any contributor over infringements You claim are made by the Work, your License from such contributor to the Work ends automatically. &#xA;    3. Subject to the above terms and conditions, this License is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, the Author reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.    &#xA;  10. Publisher. The parties hereby confirm that the Publisher shall not, under any circumstances, be responsible for and shall not have any liability in respect of the subject matter of this License. The Publisher makes no warranty whatsoever in connection with the Work and shall not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. The Publisher reserves the right to cease making the Work available to You at any time without notice &#xA;  11. Miscellaneous  &#xA;    1. This License shall be governed by the laws of the location of the head office of the Author or if the Author is an individual, the laws of location of the principal place of residence of the Author. &#xA;    2. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this License, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.  &#xA;    3. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.  &#xA;    4. This License constitutes the entire agreement between the parties with respect to the Work licensed herein. There are no understandings, agreements or representations with respect to the Work not specified herein. The Author shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Author and You.    &#xA;&#xA;=== ResourceEmbedder ===&#xA;&#xA;The MIT License (MIT)&#xA;&#xA;Copyright (c) MarcStan&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy&#xA;of this software and associated documentation files (the &quot;Software&quot;), to deal&#xA;in the Software without restriction, including without limitation the rights&#xA;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#xA;copies of the Software, and to permit persons to whom the Software is&#xA;furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in all&#xA;copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#xA;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#xA;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#xA;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#xA;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#xA;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#xA;SOFTWARE.&#xA;&#xA;=== Windows Community Toolkit ===&#xA;&#xA;Copyright © .NET Foundation and Contributors&#xA;&#xA;All rights reserved.&#xA;&#xA;## MIT License (MIT)&#xA;&#xA;Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:&#xA;&#xA;The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.&#xA;&#xA;THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." VerticalAlignment="Top" Grid.Row="1" Width="599"/>
-        </ScrollViewer>
-    </StackPanel>
-</Window>
diff --git a/EnvyUpdate/MainWindow.xaml b/EnvyUpdate/MainWindow.xaml
index 81f4d3d..d85a609 100644
--- a/EnvyUpdate/MainWindow.xaml
+++ b/EnvyUpdate/MainWindow.xaml
@@ -1,31 +1,63 @@
-<Window x:Class="EnvyUpdate.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:EnvyUpdate"
-        xmlns:p="clr-namespace:EnvyUpdate.Properties"
-        xmlns:tb="http://www.hardcodet.net/taskbar" 
-        mc:Ignorable="d"
-        Title="EnvyUpdate" Height="270" Width="389" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize">
-    <Grid Margin="0,0,0,0">
+<ui:UiWindow x:Class="EnvyUpdate.MainWindow"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:local="clr-namespace:EnvyUpdate"
+	xmlns:p="clr-namespace:EnvyUpdate.Properties"
+	xmlns:tb="http://www.hardcodet.net/taskbar"
+	xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    mc:Ignorable="d"
+    ExtendsContentIntoTitleBar="True"
+    WindowBackdropType="Mica"
+    
+    Title="EnvyUpdate" MinHeight="400" Height="400" MinWidth="600" Width="600" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" Activated="UiWindow_Activated" WindowStyle="None">
+    <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="17*"/>
-            <RowDefinition Height="86*"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <tb:TaskbarIcon IconSource="/icon.ico" ToolTipText="EnvyUpdate" TrayLeftMouseDown="TaskbarIcon_TrayLeftMouseDown" Grid.RowSpan="3" />
-        <TextBlock HorizontalAlignment="Left" Margin="10,81,0,0" TextWrapping="Wrap" FontWeight="Bold" Width="140" Height="16" VerticalAlignment="Top" Grid.Row="1"><Run Text="{x:Static p:Resources.ui_localdriver}"/></TextBlock>
-        <TextBlock x:Name="textblockGPU" HorizontalAlignment="Right" Margin="0,81,10,0" TextWrapping="Wrap" Text="&lt;none&gt;" Width="134" Height="16" VerticalAlignment="Top" TextAlignment="Right" Grid.Row="1"/>
-        <Button x:Name="buttonHelp" Content="..." Margin="0,12,10,0" Click="buttonHelp_Click" HorizontalAlignment="Right" Width="20" Height="20" VerticalAlignment="Top" Grid.RowSpan="2"/>
-        <TextBlock Margin="10,102,0,0" TextWrapping="Wrap" FontWeight="Bold" Grid.Row="1" HorizontalAlignment="Left" Width="140" Height="16" VerticalAlignment="Top"><Run Text="{x:Static p:Resources.ui_onlinedriver}"/></TextBlock>
-        <TextBlock x:Name="textblockOnline" HorizontalAlignment="Right" Margin="0,102,10,0" TextWrapping="Wrap" Text="&lt;none&gt;" Width="134" Grid.Row="1" Height="16" VerticalAlignment="Top" TextAlignment="Right"/>
-        <Button x:Name="buttonDL" Content="⟱" Margin="10,151,10,10" FontSize="20" Click="buttonDL_Click" Foreground="White" Background="#FF3CDA00" Grid.Row="1" IsEnabled="False"/>
-        <TextBlock x:Name="textblockGPUName" Margin="10,14,35,0" TextWrapping="Wrap" Text="GPU..." Height="16" VerticalAlignment="Top" TextAlignment="Center" Grid.RowSpan="2" FontWeight="Bold"/>
-        <TextBlock HorizontalAlignment="Left" Margin="10,19,0,0" TextWrapping="Wrap" FontWeight="Bold" Width="140" Height="16" VerticalAlignment="Top" Grid.Row="1" Text="{x:Static p:Resources.ui_localdriver_type}"/>
-        <TextBlock x:Name="textblockLocalType" HorizontalAlignment="Right" Margin="0,19,10,0" TextWrapping="Wrap" Width="134" Height="16" VerticalAlignment="Top" TextAlignment="Right" Grid.Row="1"><Run Text="&lt;none&gt;"/><LineBreak/><Run/></TextBlock>
-        <RadioButton x:Name="radioGRD" Content="Game Ready / Standard Driver" HorizontalAlignment="Left" Margin="10,40,0,0" Grid.Row="1" VerticalAlignment="Top" Checked="radioGRD_Checked"/>
-        <RadioButton x:Name="radioSD" Content="Studio Driver" HorizontalAlignment="Left" Margin="10,60,0,0" Grid.Row="1" VerticalAlignment="Top" Checked="radioSD_Checked"/>
-        <CheckBox x:Name="chkAutostart" Content="{x:Static p:Resources.ui_autostart}" HorizontalAlignment="Left" Margin="10,131,0,0" Grid.Row="1" VerticalAlignment="Top" Click="chkAutostart_Click"/>
-        <Button x:Name="buttonSkip" Content="{x:Static p:Resources.ui_skipversion}" Margin="0,131,10,0" Grid.Row="1" VerticalAlignment="Top" HorizontalAlignment="Right" Click="buttonSkip_Click" IsEnabled="False"/>
+        <ui:TitleBar
+            Title="EnvyUpdate"
+            Grid.Row="0"
+            CanMaximize="False"
+            ShowMaximize="False"
+            Icon="/icon.ico">
+            <ui:TitleBar.Tray>
+                <ui:NotifyIcon
+                    FocusOnLeftClick="True"
+                    Icon="/icon.ico"
+                    MenuOnRightClick="False"
+                    TooltipText="EnvyUpdate"></ui:NotifyIcon>
+            </ui:TitleBar.Tray>
+        </ui:TitleBar>
+        <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <ui:NavigationCompact
+            x:Name="RootNavigation"
+            Frame="{Binding ElementName=MainFrame}"
+            Grid.Column="0"
+            SelectedPageIndex="0">
+                <ui:NavigationCompact.Items>
+                    <ui:NavigationItem
+                        Content="{x:Static p:Resources.ui_home}"
+                        Icon="Home24"
+                        PageType="{x:Type local:DashboardPage}"
+                    />
+                </ui:NavigationCompact.Items>
+                <ui:NavigationCompact.Footer>
+                    <ui:NavigationItem
+                        Content="{x:Static p:Resources.ui_settings}"
+                        Icon="Settings24" 
+                        PageType="{x:Type local:SettingsPage}"/>
+                </ui:NavigationCompact.Footer>
+            </ui:NavigationCompact>
+            <Frame
+                x:Name="MainFrame"
+                Grid.Column="1" />
+        </Grid>
     </Grid>
-</Window>
+</ui:UiWindow>
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 07909e0..271996c 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -1,32 +1,29 @@
-using Microsoft.Toolkit.Uwp.Notifications;
+using Microsoft.Build.Framework.XamlTypes;
+using Microsoft.Toolkit.Uwp.Notifications;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Management;
 using System.Net;
+using System.Runtime.Remoting.Messaging;
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Threading;
+using Wpf.Ui.Controls.Interfaces;
 
 namespace EnvyUpdate
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class MainWindow : Window
+    public partial class MainWindow
     {
-        private string localDriv = null;
-        private string onlineDriv = null;
-        private string gpuURL = null;
         private string[] arguments = null;
-        private string skippedVer = null;
 
         public MainWindow()
         {
-            InitializeComponent();
-
             // Try to get command line arguments
             try
             {
@@ -52,63 +49,11 @@ namespace EnvyUpdate
             {
                 Debug.LogToFile("FATAL Found another instance, terminating.");
 
+
                 MessageBox.Show(Properties.Resources.instance_already_running);
                 Environment.Exit(1);
             }
 
-            // Delete installed legacy versions
-            if (Directory.Exists(GlobalVars.appdata))
-            {
-                Debug.LogToFile("INFO Found old appdata installation, uninstalling.");
-                UninstallAll();
-            }
-
-            GlobalVars.isMobile = Util.IsMobile();
-            Debug.LogToFile("INFO Mobile: " + GlobalVars.isMobile);
-
-            localDriv = Util.GetLocDriv();
-
-            Debug.LogToFile("INFO Local driver version: " + localDriv);
-
-            if (localDriv != null)
-            {
-                Debug.LogToFile("INFO Local driver version already known, updating info without reloading.");
-                UpdateLocalVer(false);
-            }
-            else
-            {
-                if (arguments.Contains("/fake"))
-                {
-                    Debug.isFake = true;
-                    Debug.LogToFile("WARN Faking GPU with debug info.");
-                }
-                else
-                {
-                    Debug.LogToFile("FATAL No supported GPU found, terminating.");
-                    MessageBox.Show(Properties.Resources.no_compatible_gpu);
-                    Environment.Exit(255);
-                }
-            }
-
-            Debug.LogToFile("INFO Detecting driver type.");
-
-            if (Util.IsDCH())
-                textblockLocalType.Text = "DCH";
-            else if (Debug.isFake)
-                textblockLocalType.Text = "DCH (Debug)";
-            else
-                textblockLocalType.Text = "Standard";
-
-            Debug.LogToFile("INFO Done detecting driver type: " + textblockLocalType.Text);
-
-            // Check for startup shortcut
-            if (File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), "EnvyUpdate.lnk")))
-            {
-                Debug.LogToFile("INFO Autostart is enabled.");
-                chkAutostart.IsChecked = true;
-                chkAutostart_Click(null, null); //Automatically recreate shortcut to account for moved EXE.
-            }
-
             //Check if launched as miminized with arg
             if (arguments.Contains("/minimize"))
             {
@@ -117,204 +62,14 @@ namespace EnvyUpdate
                 Hide();
             }
 
-            DispatcherTimer Dt = new DispatcherTimer();
-            Dt.Tick += new EventHandler(Dt_Tick);
-            // Check for new updates every 5 hours.
-            Dt.Interval = new TimeSpan(5, 0, 0);
-            Dt.Start();
-            Debug.LogToFile("INFO Started check timer.");
+            GlobalVars.isMobile = Util.IsMobile();
+            Debug.LogToFile("INFO Mobile: " + GlobalVars.isMobile);
 
-            string watchDirPath = Path.Combine(Environment.ExpandEnvironmentVariables("%ProgramW6432%"), "NVIDIA Corporation\\Installer2\\InstallerCore");
-            if (Directory.Exists(watchDirPath))
-            {
-                GlobalVars.monitoringInstall = true;
+            InitializeComponent();
+            Wpf.Ui.Appearance.Accent.ApplySystemAccent();
 
-                var driverFileChangedWatcher = new FileSystemWatcher(watchDirPath);
-                driverFileChangedWatcher.NotifyFilter = NotifyFilters.Attributes
-                                 | NotifyFilters.CreationTime
-                                 | NotifyFilters.FileName
-                                 | NotifyFilters.LastAccess
-                                 | NotifyFilters.LastWrite
-                                 | NotifyFilters.Size;
-                driverFileChangedWatcher.Changed += DriverFileChanged;
-
-                driverFileChangedWatcher.Filter = "*.dll";
-                driverFileChangedWatcher.IncludeSubdirectories = false;
-                driverFileChangedWatcher.EnableRaisingEvents = true;
-                Debug.LogToFile("INFO Started update file system watcher.");
-            }
-
-            Load();
+            
         }
-
-        private void Dt_Tick(object sender, EventArgs e)
-        {
-            Load();
-        }
-
-        private void buttonHelp_Click(object sender, RoutedEventArgs e)
-        {
-            Debug.LogToFile("INFO Showing info window.");
-            InfoWindow infoWin = new InfoWindow();
-            infoWin.ShowDialog();
-        }
-
-        private void Load()
-        {
-            if (Util.GetDTID() == 18)
-            {
-                Debug.LogToFile("INFO Found studio driver.");
-                radioSD.IsChecked = true;
-            }
-            else
-            {
-                Debug.LogToFile("INFO Found standard driver.");
-                radioGRD.IsChecked = true;
-            }
-
-            if (File.Exists(GlobalVars.exedirectory + "skip.envy"))
-            {
-                Debug.LogToFile("INFO Found version skip config.");
-                skippedVer = File.ReadLines(GlobalVars.exedirectory + "skip.envy").First();
-            }
-
-            // This little bool check is necessary for debug mode on systems without an Nvidia GPU. 
-            if (Debug.isFake)
-            {
-                localDriv = Debug.LocalDriv();
-                textblockGPU.Text = localDriv;
-                textblockGPUName.Text = Debug.GPUname();
-            }
-
-            try
-            {
-                Debug.LogToFile("INFO Trying to get GPU update URL.");
-                gpuURL = Util.GetGpuUrl();
-            }
-            catch (ArgumentException)
-            {
-                Debug.LogToFile("WARN Could not get GPU update URL, trying again with non-studio driver.");
-                try
-                {
-                    // disable SD and try with GRD
-                    if (File.Exists(GlobalVars.exedirectory + "sd.envy"))
-                    {
-                        File.Delete(GlobalVars.exedirectory + "sd.envy");
-                    }
-
-                    gpuURL = Util.GetGpuUrl(); //try again with GRD
-                    MessageBox.Show(Properties.Resources.ui_studionotsupported);
-                    radioGRD.IsChecked = true;
-                }
-                catch (ArgumentNullException)
-                {
-                    MessageBox.Show("ERROR: Could not get list of GPU models from Nvidia, please check your network connection.\nOtherwise, please report this issue on GitHub.");
-                    Environment.Exit(11);
-                }
-                catch (ArgumentException e)
-                {
-                    // Now we have a problem.
-                    Debug.LogToFile("FATAL Invalid API response from Nvidia. Attempted API call: " + e.Message);
-                    MessageBox.Show("ERROR: Invalid API response from Nvidia. Please file an issue on GitHub.\nAttempted API call:\n" + e.Message);
-                    Environment.Exit(10);
-                }
-            }
-
-            using (var c = new WebClient())
-            {
-                Debug.LogToFile("INFO Trying to get newest driver version.");
-                string pContent = c.DownloadString(gpuURL);
-                var pattern = @"Windows\/\d{3}\.\d{2}";
-                Regex rgx = new Regex(pattern);
-                var matches = rgx.Matches(pContent);
-                onlineDriv = Regex.Replace(Convert.ToString(matches[0]), "Windows/", "");
-                textblockOnline.Text = onlineDriv;
-                Debug.LogToFile("INFO Got online driver version: " + onlineDriv);
-            }
-
-            try
-            {
-                if (float.Parse(localDriv) < float.Parse(onlineDriv))
-                {
-                    Debug.LogToFile("INFO Local version is older than online. Setting UI...");
-                    textblockOnline.Foreground = Brushes.Red;
-                    buttonDL.IsEnabled = true;
-                    if (skippedVer == null)
-                    {
-                        buttonSkip.Content = Properties.Resources.ui_skipversion;
-                        buttonSkip.IsEnabled = true;
-                    }
-                    else
-                        buttonSkip.Content = Properties.Resources.ui_skipped;
-
-                    Debug.LogToFile("INFO UI set.");
-
-                    if (skippedVer != onlineDriv)
-                    {
-                        Debug.LogToFile("INFO Showing update popup notification.");
-                        Notify.ShowDrivUpdatePopup();
-                    }
-                }
-                else
-                {
-                    Debug.LogToFile("INFO Local version is up to date.");
-                    buttonSkip.IsEnabled = false;
-                    textblockOnline.Foreground = Brushes.Green;
-                }
-            }
-            catch (FormatException)
-            {
-                Debug.LogToFile("INFO Caught FormatException, assuming locale workaround is necessary.");
-                //Thank you locales. Some languages need , instead of . for proper parsing
-                string cLocalDriv = localDriv.Replace('.', ',');
-                string cOnlineDriv = onlineDriv.Replace('.', ',');
-                if (float.Parse(cLocalDriv) < float.Parse(cOnlineDriv))
-                {
-                    Debug.LogToFile("INFO Local version is older than online. Setting UI...");
-                    textblockOnline.Foreground = Brushes.Red;
-                    buttonDL.IsEnabled = true;
-                    if (skippedVer == null)
-                        buttonSkip.IsEnabled = true;
-                    else
-                        buttonSkip.Content = Properties.Resources.ui_skipped;
-                    if (skippedVer != onlineDriv)
-                    {
-                        Debug.LogToFile("INFO Showing update popup notification.");
-                        Notify.ShowDrivUpdatePopup();
-                    }
-                }
-                else
-                {
-                    Debug.LogToFile("INFO Local version is up to date.");
-                    buttonSkip.IsEnabled = false;
-                    textblockOnline.Foreground = Brushes.Green;
-                }
-            }
-
-            //Check for different version than skipped version
-            if (skippedVer != null && skippedVer != onlineDriv)
-            {
-                Debug.LogToFile("INFO Skipped version is surpassed, deleting setting.");
-                skippedVer = null;
-                if (File.Exists(GlobalVars.exedirectory + "skip.envy"))
-                    File.Delete(GlobalVars.exedirectory + "skip.envy");
-                buttonSkip.Content = Properties.Resources.ui_skipversion;
-                buttonSkip.IsEnabled = true;
-            }
-        }
-
-        private void buttonDL_Click(object sender, RoutedEventArgs e)
-        {
-            Debug.LogToFile("INFO Opening download page.");
-            Process.Start(gpuURL);
-        }
-
-        private void TaskbarIcon_TrayLeftMouseDown(object sender, RoutedEventArgs e)
-        {
-            Debug.LogToFile("INFO Tray was clicked, opening main window.");
-            Util.ShowMain();
-        }
-
         private void Window_StateChanged(object sender, EventArgs e)
         {
             if (WindowState == WindowState.Minimized)
@@ -324,115 +79,25 @@ namespace EnvyUpdate
             }
         }
 
-        public void UninstallAll()
-        {
-            if (File.Exists(GlobalVars.startup + "\\EnvyUpdate.lnk"))
-            {
-                Debug.LogToFile("INFO Deleted startup entry.");
-                File.Delete(GlobalVars.startup + "\\EnvyUpdate.lnk");
-            }
-
-            if (File.Exists(GlobalVars.startmenu + "\\EnvyUpdate.lnk"))
-            {
-                Debug.LogToFile("INFO Deleted start menu entry.");
-                File.Delete(GlobalVars.startmenu + "\\EnvyUpdate.lnk");
-            }
-            if ((GlobalVars.exedirectory == GlobalVars.appdata) && File.Exists(GlobalVars.appdata + "EnvyUpdate.exe"))
-            {
-                Debug.LogToFile("INFO Deleting EnvyUpdate appdata and self.");
-                MessageBox.Show(Properties.Resources.uninstall_legacy_message);
-                Util.SelfDelete();
-            }
-            else if (Directory.Exists(GlobalVars.appdata))
-            {
-                Debug.LogToFile("INFO Deleting EnvyUpdate appdata folder");
-                Directory.Delete(GlobalVars.appdata, true);
-            }
-        }
-
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            if (MessageBox.Show(Properties.Resources.exit_confirm, "", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
-            {
-                Debug.LogToFile("INFO Uninstalling notifications and shutting down.");
-                ToastNotificationManagerCompat.Uninstall(); // Uninstall notifications to prevent issues with the app being portable.
-                Application.Current.Shutdown();
-            }
-            else
-            {
-                Debug.LogToFile("INFO Application shutdown was cancelled.");
-                e.Cancel = true;
-            }
+            Debug.LogToFile("INFO Uninstalling notifications and shutting down.");
+            ToastNotificationManagerCompat.Uninstall(); // Uninstall notifications to prevent issues with the app being portable.
+            Application.Current.Shutdown();
         }
 
-        private void radioGRD_Checked(object sender, RoutedEventArgs e)
+        private void UiWindow_Activated(object sender, EventArgs e)
         {
-            if (File.Exists(GlobalVars.exedirectory + "sd.envy"))
+            // This is a workaround for a bug (?) in the UI library, which causes the nav to not load the first item on startup.
+            // Without this, the nav attempts to navigate before the window is shown, which doesn't work.
+            try
             {
-                Debug.LogToFile("INFO Switching to game ready driver.");
-                File.Delete(GlobalVars.exedirectory + "sd.envy");
-                Load();
+                var test = RootNavigation.Current.PageType;
             }
-        }
-
-        private void radioSD_Checked(object sender, RoutedEventArgs e)
-        {
-            if (!File.Exists(GlobalVars.exedirectory + "sd.envy"))
+            catch (NullReferenceException)
             {
-                Debug.LogToFile("INFO Switching to studio driver.");
-                File.Create(GlobalVars.exedirectory + "sd.envy").Close();
-                Load();
+                RootNavigation.Navigate(0);
             }
         }
-
-        private void chkAutostart_Click(object sender, RoutedEventArgs e)
-        {
-            if (File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), "EnvyUpdate.lnk")))
-            {
-                Debug.LogToFile("INFO Removing autostart entry.");
-                File.Delete(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Startup), "EnvyUpdate.lnk"));
-            }
-            if (chkAutostart.IsChecked == true)
-            {
-                Debug.LogToFile("INFO Creating autostart entry.");
-                Util.CreateShortcut("EnvyUpdate", Environment.GetFolderPath(Environment.SpecialFolder.Startup), GlobalVars.exeloc, "NVidia Update Checker", "/minimize");
-            }
-        }
-
-        private void buttonSkip_Click(object sender, RoutedEventArgs e)
-        {
-            Debug.LogToFile("INFO Skipping version.");
-            skippedVer = onlineDriv;
-            File.WriteAllText(GlobalVars.exedirectory + "skip.envy", onlineDriv);
-            buttonSkip.IsEnabled = false;
-            buttonSkip.Content = Properties.Resources.ui_skipped;
-            MessageBox.Show(Properties.Resources.skip_confirm);
-        }
-
-        private void UpdateLocalVer(bool reloadLocalDriv = true)
-        {
-            Debug.LogToFile("INFO Updating local driver version in UI.");
-            if (reloadLocalDriv)
-            {
-                Debug.LogToFile("INFO Reloading local driver version.");
-                localDriv = Util.GetLocDriv();
-            }
-            textblockGPU.Text = localDriv;
-            if (GlobalVars.isMobile)
-                textblockGPUName.Text = Util.GetGPUName(false) + " (mobile)";
-            else
-                textblockGPUName.Text = Util.GetGPUName(false);
-        }
-
-        void DriverFileChanged(object sender, FileSystemEventArgs e)
-        {
-            Debug.LogToFile("INFO Watched driver file changed! Reloading data.");
-            System.Threading.Thread.Sleep(10000);
-            Application.Current.Dispatcher.Invoke(delegate
-            {
-                UpdateLocalVer();
-                Load();
-            });
-        }
     }
 }
\ No newline at end of file
diff --git a/EnvyUpdate/Properties/Licenses.Designer.cs b/EnvyUpdate/Properties/Licenses.Designer.cs
new file mode 100644
index 0000000..5c0056d
--- /dev/null
+++ b/EnvyUpdate/Properties/Licenses.Designer.cs
@@ -0,0 +1,153 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace EnvyUpdate.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Licenses {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Licenses() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("EnvyUpdate.Properties.Licenses", typeof(Licenses).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The MIT License
+        ///
+        ///Copyright (c) 2012 Simon Cropp and contributors
+        ///
+        ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+        ///
+        ///The ab [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string CosturaFody {
+            get {
+                return ResourceManager.GetString("CosturaFody", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to MIT License
+        ///
+        ///Copyright (c) 2019-2023 Jakob Senkl
+        ///
+        ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+        ///
+        ///The above copyright no [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string EnvyUpdate {
+            get {
+                return ResourceManager.GetString("EnvyUpdate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to MIT License
+        ///
+        ///Copyright (c) Simon Cropp
+        ///
+        ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+        ///
+        ///The above copyright notice and t [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string Fody {
+            get {
+                return ResourceManager.GetString("Fody", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The MIT License (MIT)
+        ///
+        ///Copyright (c) MarcStan
+        ///
+        ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+        ///
+        ///The above copyright notic [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string ResourceEmbedder {
+            get {
+                return ResourceManager.GetString("ResourceEmbedder", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to # Windows Community Toolkit
+        ///
+        ///Copyright © .NET Foundation and Contributors
+        ///
+        ///All rights reserved.
+        ///
+        ///## MIT License (MIT)
+        ///
+        ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string WindowsCommunityToolkit {
+            get {
+                return ResourceManager.GetString("WindowsCommunityToolkit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to MIT License
+        ///
+        ///Copyright (c) 2021-2023 Leszek Pomianowski and WPF UI Contributors. https://dev.lepo.co/
+        ///
+        ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject t [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string wpfui {
+            get {
+                return ResourceManager.GetString("wpfui", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/EnvyUpdate/Properties/Licenses.resx b/EnvyUpdate/Properties/Licenses.resx
new file mode 100644
index 0000000..6ebf13d
--- /dev/null
+++ b/EnvyUpdate/Properties/Licenses.resx
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CosturaFody" xml:space="preserve">
+    <value>The MIT License
+
+Copyright (c) 2012 Simon Cropp and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
+  </data>
+  <data name="EnvyUpdate" xml:space="preserve">
+    <value>MIT License
+
+Copyright (c) 2019-2023 Jakob Senkl
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
+  </data>
+  <data name="Fody" xml:space="preserve">
+    <value>MIT License
+
+Copyright (c) Simon Cropp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
+  </data>
+  <data name="ResourceEmbedder" xml:space="preserve">
+    <value>The MIT License (MIT)
+
+Copyright (c) MarcStan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
+  </data>
+  <data name="WindowsCommunityToolkit" xml:space="preserve">
+    <value># Windows Community Toolkit
+
+Copyright © .NET Foundation and Contributors
+
+All rights reserved.
+
+## MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
+  </data>
+  <data name="wpfui" xml:space="preserve">
+    <value>MIT License
+
+Copyright (c) 2021-2023 Leszek Pomianowski and WPF UI Contributors. https://dev.lepo.co/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index cd696e7..c17e88a 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -114,6 +114,15 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to No.
+        /// </summary>
+        public static string no {
+            get {
+                return ResourceManager.GetString("no", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to No NVIDIA GPU found. Application will exit..
         /// </summary>
@@ -141,6 +150,24 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Enable logging to file.
+        /// </summary>
+        public static string ui_enable_logging {
+            get {
+                return ResourceManager.GetString("ui_enable_logging", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Home.
+        /// </summary>
+        public static string ui_home {
+            get {
+                return ResourceManager.GetString("ui_home", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to DCH driver.
         /// </summary>
@@ -159,6 +186,24 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Update available..
+        /// </summary>
+        public static string ui_info_outdated {
+            get {
+                return ResourceManager.GetString("ui_info_outdated", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Up to date..
+        /// </summary>
+        public static string ui_info_uptodate {
+            get {
+                return ResourceManager.GetString("ui_info_uptodate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to EnvyUpdate website.
         /// </summary>
@@ -177,6 +222,15 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Licenses.
+        /// </summary>
+        public static string ui_licenses {
+            get {
+                return ResourceManager.GetString("ui_licenses", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Local driver version:.
         /// </summary>
@@ -195,6 +249,24 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to All good..
+        /// </summary>
+        public static string ui_message_good {
+            get {
+                return ResourceManager.GetString("ui_message_good", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to New driver found..
+        /// </summary>
+        public static string ui_message_update {
+            get {
+                return ResourceManager.GetString("ui_message_update", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Online driver version:.
         /// </summary>
@@ -204,6 +276,24 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Open website.
+        /// </summary>
+        public static string ui_openwebsite {
+            get {
+                return ResourceManager.GetString("ui_openwebsite", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Settings.
+        /// </summary>
+        public static string ui_settings {
+            get {
+                return ResourceManager.GetString("ui_settings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Version skipped.
         /// </summary>
@@ -266,5 +356,14 @@ namespace EnvyUpdate.Properties {
                 return ResourceManager.GetString("update_popup_message", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Yes.
+        /// </summary>
+        public static string yes {
+            get {
+                return ResourceManager.GetString("yes", resourceCulture);
+            }
+        }
     }
 }
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index 1329401..eace543 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -135,6 +135,9 @@
   <data name="message_new_version" xml:space="preserve">
     <value>Neue Version von EnvyUpdate gefunden. Die Anwendung wird neu starten.\nDies wird wahrscheinlich einige Sekunden dauern.</value>
   </data>
+  <data name="no" xml:space="preserve">
+    <value>Nein</value>
+  </data>
   <data name="no_compatible_gpu" xml:space="preserve">
     <value>Keine NVIDIA GPU gefunden. EnvyUpdate wird sich nun schließen.</value>
   </data>
@@ -144,27 +147,54 @@
   <data name="ui_autostart" xml:space="preserve">
     <value>Beim Start von Windows ausführen</value>
   </data>
+  <data name="ui_enable_logging" xml:space="preserve">
+    <value>Programm-Log in Datei schreiben</value>
+  </data>
+  <data name="ui_home" xml:space="preserve">
+    <value>Start</value>
+  </data>
   <data name="ui_info_dch" xml:space="preserve">
     <value>DCH Treiber</value>
   </data>
   <data name="ui_info_mobile" xml:space="preserve">
     <value>Mobile Grafikkarte (Laptop, etc)?</value>
   </data>
+  <data name="ui_info_outdated" xml:space="preserve">
+    <value>Aktualisierung verfügbar.</value>
+  </data>
+  <data name="ui_info_uptodate" xml:space="preserve">
+    <value>Aktuell.</value>
+  </data>
   <data name="ui_info_website" xml:space="preserve">
     <value>EnvyUpdate Webseite</value>
   </data>
   <data name="ui_install" xml:space="preserve">
     <value>Installieren</value>
   </data>
+  <data name="ui_licenses" xml:space="preserve">
+    <value>Lizenzen</value>
+  </data>
   <data name="ui_localdriver" xml:space="preserve">
     <value>Lokale Treiberversion:</value>
   </data>
   <data name="ui_localdriver_type" xml:space="preserve">
     <value>Lokaler Treibertyp:</value>
   </data>
+  <data name="ui_message_good" xml:space="preserve">
+    <value>Alles in Ordnung.</value>
+  </data>
+  <data name="ui_message_update" xml:space="preserve">
+    <value>Neue Treiberversion gefunden.</value>
+  </data>
   <data name="ui_onlinedriver" xml:space="preserve">
     <value>Online Treiberversion:</value>
   </data>
+  <data name="ui_openwebsite" xml:space="preserve">
+    <value>Webseite öffnen</value>
+  </data>
+  <data name="ui_settings" xml:space="preserve">
+    <value>Einstellungen</value>
+  </data>
   <data name="ui_skipped" xml:space="preserve">
     <value>Version übersprungen</value>
   </data>
@@ -186,4 +216,7 @@
   <data name="update_popup_message" xml:space="preserve">
     <value>Eine neue Treiberversion ist verfügbar.</value>
   </data>
+  <data name="yes" xml:space="preserve">
+    <value>Ja</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index abdfedd..bb5275a 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -135,6 +135,9 @@
   <data name="message_new_version" xml:space="preserve">
     <value>New version of EnvyUpdate found. Application will restart.\nThis will probably take a few seconds.</value>
   </data>
+  <data name="no" xml:space="preserve">
+    <value>No</value>
+  </data>
   <data name="no_compatible_gpu" xml:space="preserve">
     <value>No NVIDIA GPU found. Application will exit.</value>
   </data>
@@ -144,27 +147,54 @@
   <data name="ui_autostart" xml:space="preserve">
     <value>Run at Windows startup</value>
   </data>
+  <data name="ui_enable_logging" xml:space="preserve">
+    <value>Enable logging to file</value>
+  </data>
+  <data name="ui_home" xml:space="preserve">
+    <value>Home</value>
+  </data>
   <data name="ui_info_dch" xml:space="preserve">
     <value>DCH driver</value>
   </data>
   <data name="ui_info_mobile" xml:space="preserve">
     <value>Mobile GPU (Laptop, etc)?</value>
   </data>
+  <data name="ui_info_outdated" xml:space="preserve">
+    <value>Update available.</value>
+  </data>
+  <data name="ui_info_uptodate" xml:space="preserve">
+    <value>Up to date.</value>
+  </data>
   <data name="ui_info_website" xml:space="preserve">
     <value>EnvyUpdate website</value>
   </data>
   <data name="ui_install" xml:space="preserve">
     <value>Install</value>
   </data>
+  <data name="ui_licenses" xml:space="preserve">
+    <value>Licenses</value>
+  </data>
   <data name="ui_localdriver" xml:space="preserve">
     <value>Local driver version:</value>
   </data>
   <data name="ui_localdriver_type" xml:space="preserve">
     <value>Local driver type:</value>
   </data>
+  <data name="ui_message_good" xml:space="preserve">
+    <value>All good.</value>
+  </data>
+  <data name="ui_message_update" xml:space="preserve">
+    <value>New driver found.</value>
+  </data>
   <data name="ui_onlinedriver" xml:space="preserve">
     <value>Online driver version:</value>
   </data>
+  <data name="ui_openwebsite" xml:space="preserve">
+    <value>Open website</value>
+  </data>
+  <data name="ui_settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
   <data name="ui_skipped" xml:space="preserve">
     <value>Version skipped</value>
   </data>
@@ -186,4 +216,7 @@
   <data name="update_popup_message" xml:space="preserve">
     <value>A new driver update is available for your graphics card.</value>
   </data>
+  <data name="yes" xml:space="preserve">
+    <value>Yes</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/EnvyUpdate/SettingsPage.xaml b/EnvyUpdate/SettingsPage.xaml
new file mode 100644
index 0000000..5525ad8
--- /dev/null
+++ b/EnvyUpdate/SettingsPage.xaml
@@ -0,0 +1,61 @@
+<ui:UiPage x:Class="EnvyUpdate.SettingsPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:EnvyUpdate"
+      xmlns:p="clr-namespace:EnvyUpdate.Properties"
+      xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+      mc:Ignorable="d" 
+      d:DesignHeight="400" d:DesignWidth="600"
+      Title="SettingsPage">
+
+    <Grid Margin="8,0,8,8">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <ui:SymbolIcon Grid.Column="1" Symbol="WindowApps24" FontSize="32" />
+            <TextBlock Grid.Column="2" x:Name="textBlockVer" Text="" VerticalAlignment="Center" FontSize="24"/>
+        </Grid>
+
+        <ui:CardAction Grid.Row="1" Margin="0,12,0,0" Icon="Open24" Content="{x:Static p:Resources.ui_info_website}" Click="CardWeb_Click"/>
+        <ui:CardControl Grid.Row="2" Margin="0,12,0,0" Icon="Bug24" Header="{x:Static p:Resources.ui_enable_logging}" >
+            <ui:ToggleSwitch x:Name="chkLog" Checked="chkLog_Checked" Unchecked="chkLog_Unchecked"/>
+        </ui:CardControl>
+
+        <Label Grid.Row="3" Content="{x:Static p:Resources.ui_licenses}" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold"/>
+        <ScrollViewer Grid.Row="4" MaxHeight="700" HorizontalAlignment="Stretch">
+            <StackPanel>
+                <Expander Header="EnvyUpdate">
+                    <TextBox x:Name="textBoxLicEnvyupdate" IsReadOnly="True" TextWrapping="Wrap"/>
+                </Expander>
+                <Expander Margin="0,4,0,0" Header="Fody">
+                    <TextBox x:Name="textBoxLicFody" IsReadOnly="True" TextWrapping="Wrap"/>
+                </Expander>
+                <Expander Margin="0,4,0,0" Header="Costura.Fody">
+                    <TextBox x:Name="textBoxLicCostura" IsReadOnly="True" TextWrapping="Wrap"/>
+                </Expander>
+                <Expander Margin="0,4,0,0" Header="ResourceEmbedder">
+                    <TextBox x:Name="textBoxLicResourceembedder" IsReadOnly="True" TextWrapping="Wrap"/>
+                </Expander>
+                <Expander Margin="0,4,0,0" Header="Windows Community Toolkit">
+                    <TextBox x:Name="textBoxLicWindowscommunitytoolkit" IsReadOnly="True" TextWrapping="Wrap"/>
+                </Expander>
+                <Expander Margin="0,4,0,0" Header="WPF-UI">
+                    <TextBox x:Name="textBoxLicWpfui" IsReadOnly="True" TextWrapping="Wrap"/>
+                </Expander>
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
+</ui:UiPage>
diff --git a/EnvyUpdate/InfoWindow.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
similarity index 58%
rename from EnvyUpdate/InfoWindow.xaml.cs
rename to EnvyUpdate/SettingsPage.xaml.cs
index 6f369cb..b6373e5 100644
--- a/EnvyUpdate/InfoWindow.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -1,32 +1,38 @@
 using System;
-using System.Windows;
-using System.Windows.Input;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
 
 namespace EnvyUpdate
 {
     /// <summary>
-    /// Interaction logic for InfoWindow.xaml
+    /// Interaction logic for SettingsPage.xaml
     /// </summary>
-    public partial class InfoWindow : Window
+    public partial class SettingsPage
     {
-        public InfoWindow()
+        public SettingsPage()
         {
             InitializeComponent();
 
-            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
-            System.Diagnostics.FileVersionInfo fvi = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location);
-            string version = fvi.FileVersion;
-
-            labelVer.Content += " " + version;
-            if (GlobalVars.monitoringInstall)
-                labelVer.FontStyle = FontStyles.Italic;
-
-            if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
-                chkLog.IsChecked = true;
+            textBoxLicEnvyupdate.Text = Properties.Licenses.EnvyUpdate;
+            textBoxLicFody.Text = Properties.Licenses.Fody;
+            textBoxLicCostura.Text = Properties.Licenses.CosturaFody;
+            textBoxLicResourceembedder.Text = Properties.Licenses.ResourceEmbedder;
+            textBoxLicWindowscommunitytoolkit.Text = Properties.Licenses.WindowsCommunityToolkit;
+            textBoxLicWpfui.Text = Properties.Licenses.wpfui;
         }
 
-        private void ButtonWeb_Click(object sender, RoutedEventArgs e)
+        private void CardWeb_Click(object sender, RoutedEventArgs e)
         {
             Debug.LogToFile("INFO Launching website.");
             System.Diagnostics.Process.Start("https://github.com/fyr77/EnvyUpdate/");
diff --git a/README.md b/README.md
index 15c718d..d1a58b5 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ EnvyUpdate is not a replacement for any of these tools. I will still try to impl
 * This project: [MIT](https://github.com/fyr77/EnvyUpdate/blob/master/LICENSE)
 * Fody (dependency of Costura.Fody): [MIT](https://github.com/Fody/Fody/blob/master/License.txt)
 * Costura.Fody (for embedding DLLs into the main executable): [MIT](https://github.com/Fody/Costura/blob/develop/LICENSE)
-* wpf-notifyicon (for showing an icon in the system tray): [CPOL](https://github.com/hardcodet/wpf-notifyicon/blob/master/LICENSE)
-* Resource Embedder: [MIT](https://github.com/MarcStan/resource-embedder/blob/master/LICENSE)
+* Resource Embedder: [MIT](https://www.nuget.org/packages/Resource.Embedder/)
 * Windows Community Toolkit: [MIT](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/License.md)
+* wpfui: [MIT](https://github.com/lepoco/wpfui/blob/main/LICENSE)
 * Icon made by Freepik from www.flaticon.com

From d147415febc8321ae78d6b0bdd26c02df62cfd05 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 11:16:21 +0200
Subject: [PATCH 10/69] fix fake profile and studio driver

---
 EnvyUpdate.sln                   | 13 +++++++++++--
 EnvyUpdate/DashboardPage.xaml    |  2 +-
 EnvyUpdate/DashboardPage.xaml.cs | 28 ++--------------------------
 EnvyUpdate/EnvyUpdate.csproj     | 31 +++++++++++++++++++++++++++++++
 EnvyUpdate/MainWindow.xaml.cs    | 15 +++++++++++++++
 EnvyUpdate/Util.cs               | 16 ++++++++++++++++
 6 files changed, 76 insertions(+), 29 deletions(-)

diff --git a/EnvyUpdate.sln b/EnvyUpdate.sln
index 5225e06..d7abf71 100644
--- a/EnvyUpdate.sln
+++ b/EnvyUpdate.sln
@@ -1,23 +1,32 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29411.108
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33829.357
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvyUpdate", "EnvyUpdate\EnvyUpdate.csproj", "{1BF2468D-9579-462D-9153-4836E9C8721F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug - ignoregpu|Any CPU = Debug - ignoregpu|Any CPU
+		Debug - ignoregpu|x86 = Debug - ignoregpu|x86
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|Any CPU.ActiveCfg = Debug - ignoregpu|Any CPU
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|Any CPU.Build.0 = Debug - ignoregpu|Any CPU
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|x86.ActiveCfg = Debug - ignoregpu|x86
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|x86.Build.0 = Debug - ignoregpu|x86
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|x86.ActiveCfg = Debug|x86
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|x86.Build.0 = Debug|x86
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|x86.ActiveCfg = Release|x86
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index b9572ba..128af7b 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -75,7 +75,7 @@
         </Grid>
 
         <ui:CardControl Margin="0,12,0,0" Grid.Row="4" Icon="Color24" Header="Studio Driver">
-            <ui:ToggleSwitch x:Name="switchStudioDriver" IsChecked="False" />
+            <ui:ToggleSwitch x:Name="switchStudioDriver" IsChecked="False" Checked="switchStudioDriver_Checked" Unchecked="switchStudioDriver_Unchecked" />
         </ui:CardControl>
 
         <ui:CardControl Margin="0,12,0,0" Grid.Row="5" Icon="LightbulbFilament48" Header="{x:Static p:Resources.ui_autostart}">
diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index abb0b90..6b4eba3 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -37,16 +37,6 @@ namespace EnvyUpdate
         {
             InitializeComponent();
 
-            // Try to get command line arguments
-            try
-            {
-                arguments = Environment.GetCommandLineArgs();
-            }
-            catch (IndexOutOfRangeException)
-            {
-                // This is necessary, since .NET throws an exception if you check for a non-existant arg.
-            }
-
             // Delete installed legacy versions
             if (Directory.Exists(GlobalVars.appdata))
             {
@@ -63,20 +53,6 @@ namespace EnvyUpdate
                 Debug.LogToFile("INFO Local driver version already known, updating info without reloading.");
                 UpdateLocalVer(false);
             }
-            else
-            {
-                if (arguments.Contains("/fake"))
-                {
-                    Debug.isFake = true;
-                    Debug.LogToFile("WARN Faking GPU with debug info.");
-                }
-                else
-                {
-                    Debug.LogToFile("FATAL No supported GPU found, terminating.");
-                    MessageBox.Show(Properties.Resources.no_compatible_gpu);
-                    Environment.Exit(255);
-                }
-            }
 
             Debug.LogToFile("INFO Detecting driver type.");
 
@@ -320,7 +296,7 @@ namespace EnvyUpdate
             }
         }
 
-        private void radioGRD_Checked(object sender, RoutedEventArgs e)
+        private void switchStudioDriver_Unchecked(object sender, RoutedEventArgs e)
         {
             if (File.Exists(GlobalVars.exedirectory + "sd.envy"))
             {
@@ -330,7 +306,7 @@ namespace EnvyUpdate
             }
         }
 
-        private void radioSD_Checked(object sender, RoutedEventArgs e)
+        private void switchStudioDriver_Checked(object sender, RoutedEventArgs e)
         {
             if (!File.Exists(GlobalVars.exedirectory + "sd.envy"))
             {
diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj
index ef59029..29dd347 100644
--- a/EnvyUpdate/EnvyUpdate.csproj
+++ b/EnvyUpdate/EnvyUpdate.csproj
@@ -72,6 +72,37 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug - ignoregpu|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug - ignoregpu\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 271996c..672e8db 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -54,6 +54,21 @@ namespace EnvyUpdate
                 Environment.Exit(1);
             }
 
+            if (!Util.IsNvidia())
+            {
+                if (arguments.Contains("/fake"))
+                {
+                    Debug.isFake = true;
+                    Debug.LogToFile("WARN Faking GPU with debug info.");
+                }
+                else
+                {
+                    Debug.LogToFile("FATAL No supported GPU found, terminating.");
+                    MessageBox.Show(Properties.Resources.no_compatible_gpu);
+                    Environment.Exit(255);
+                }
+            }
+
             //Check if launched as miminized with arg
             if (arguments.Contains("/minimize"))
             {
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index fdd5fc2..9aa70cf 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -59,6 +59,22 @@ namespace EnvyUpdate
             }
         }
 
+        /// <summary>
+        /// Check for existence of Nvidia GPU
+        /// </summary>
+        /// <returns></returns>
+        public static bool IsNvidia()
+        {
+            Debug.LogToFile("INFO Checking for existence of Nvidia GPU.");
+
+            foreach (ManagementObject obj in new ManagementObjectSearcher("SELECT * FROM Win32_VideoController").Get())
+            {
+                if (obj["Description"].ToString().ToLower().Contains("nvidia"))
+                    return true;
+            }
+            return false;
+        }
+
         /// <summary>
         /// Creates a standard Windows shortcut.
         /// </summary>

From 8df1f951230264f361d8c6b9595a44d16cc9158b Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 11:23:10 +0200
Subject: [PATCH 11/69] layout adjustments

---
 EnvyUpdate/DashboardPage.xaml    | 2 +-
 EnvyUpdate/DashboardPage.xaml.cs | 1 -
 EnvyUpdate/MainWindow.xaml       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index 128af7b..31e3ab6 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -26,7 +26,7 @@
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-            <ui:SymbolIcon Symbol="DeveloperBoard24" FontSize="64"/>
+            <ui:SymbolIcon Symbol="DeveloperBoard24" FontSize="56"/>
             <TextBlock Margin="8,0,0,0" x:Name="textblockGPUName" Grid.Column="1" Text="GPU..." FontSize="32" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
         </Grid>
         
diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 6b4eba3..411a330 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -31,7 +31,6 @@ namespace EnvyUpdate
         private string onlineDriv = null;
         private string gpuURL = null;
         private string skippedVer = null;
-        private string[] arguments = null;
 
         public DashboardPage()
         {
diff --git a/EnvyUpdate/MainWindow.xaml b/EnvyUpdate/MainWindow.xaml
index d85a609..e3b0166 100644
--- a/EnvyUpdate/MainWindow.xaml
+++ b/EnvyUpdate/MainWindow.xaml
@@ -11,7 +11,7 @@
     ExtendsContentIntoTitleBar="True"
     WindowBackdropType="Mica"
     
-    Title="EnvyUpdate" MinHeight="400" Height="400" MinWidth="600" Width="600" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" Activated="UiWindow_Activated" WindowStyle="None">
+    Title="EnvyUpdate" MinHeight="450" Height="450" MinWidth="600" Width="600" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" Activated="UiWindow_Activated" WindowStyle="None">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />

From 938afbd85b61ac1978e6ce29d0a16af61798c094 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 11:23:56 +0200
Subject: [PATCH 12/69] bump version

---
 EnvyUpdate/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index 322a88d..15d4b57 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.20")]
-[assembly: AssemblyFileVersion("2.20")]
+[assembly: AssemblyVersion("3.0")]
+[assembly: AssemblyFileVersion("3.0")]

From e42fbf9b2ae4105fa50dbbd6dfaca6f8971dc975 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 11:33:38 +0200
Subject: [PATCH 13/69] fix settingspage details

---
 EnvyUpdate/SettingsPage.xaml    |  2 +-
 EnvyUpdate/SettingsPage.xaml.cs | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/EnvyUpdate/SettingsPage.xaml b/EnvyUpdate/SettingsPage.xaml
index 5525ad8..b707a27 100644
--- a/EnvyUpdate/SettingsPage.xaml
+++ b/EnvyUpdate/SettingsPage.xaml
@@ -26,7 +26,7 @@
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <ui:SymbolIcon Grid.Column="1" Symbol="WindowApps24" FontSize="32" />
-            <TextBlock Grid.Column="2" x:Name="textBlockVer" Text="" VerticalAlignment="Center" FontSize="24"/>
+            <TextBlock Margin="8,0,0,0" Grid.Column="2" x:Name="textBlockVer" Text="" VerticalAlignment="Center" FontSize="24"/>
         </Grid>
 
         <ui:CardAction Grid.Row="1" Margin="0,12,0,0" Icon="Open24" Content="{x:Static p:Resources.ui_info_website}" Click="CardWeb_Click"/>
diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index b6373e5..5e5d838 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -24,6 +24,17 @@ namespace EnvyUpdate
         {
             InitializeComponent();
 
+            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            System.Diagnostics.FileVersionInfo fvi = System.Diagnostics.FileVersionInfo.GetVersionInfo(assembly.Location);
+            string version = fvi.FileVersion;
+
+            textBlockVer.Text = version;
+            if (GlobalVars.monitoringInstall)
+                textBlockVer.FontStyle = FontStyles.Italic;
+
+            if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
+                chkLog.IsChecked = true;
+
             textBoxLicEnvyupdate.Text = Properties.Licenses.EnvyUpdate;
             textBoxLicFody.Text = Properties.Licenses.Fody;
             textBoxLicCostura.Text = Properties.Licenses.CosturaFody;

From 99267bdf9ddb6c6a81ca917273e540806ec14878 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 11:46:12 +0200
Subject: [PATCH 14/69] cleanup

---
 EnvyUpdate/DashboardPage.xaml.cs | 33 --------------------------------
 EnvyUpdate/MainWindow.xaml.cs    |  7 +++++++
 EnvyUpdate/Util.cs               | 26 +++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 411a330..62f41bc 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -36,13 +36,6 @@ namespace EnvyUpdate
         {
             InitializeComponent();
 
-            // Delete installed legacy versions
-            if (Directory.Exists(GlobalVars.appdata))
-            {
-                Debug.LogToFile("INFO Found old appdata installation, uninstalling.");
-                UninstallAll();
-            }
-
             localDriv = Util.GetLocDriv();
 
             Debug.LogToFile("INFO Local driver version: " + localDriv);
@@ -269,32 +262,6 @@ namespace EnvyUpdate
             Process.Start(gpuURL);
         }
 
-        public void UninstallAll()
-        {
-            if (File.Exists(GlobalVars.startup + "\\EnvyUpdate.lnk"))
-            {
-                Debug.LogToFile("INFO Deleted startup entry.");
-                File.Delete(GlobalVars.startup + "\\EnvyUpdate.lnk");
-            }
-
-            if (File.Exists(GlobalVars.startmenu + "\\EnvyUpdate.lnk"))
-            {
-                Debug.LogToFile("INFO Deleted start menu entry.");
-                File.Delete(GlobalVars.startmenu + "\\EnvyUpdate.lnk");
-            }
-            if ((GlobalVars.exedirectory == GlobalVars.appdata) && File.Exists(GlobalVars.appdata + "EnvyUpdate.exe"))
-            {
-                Debug.LogToFile("INFO Deleting EnvyUpdate appdata and self.");
-                MessageBox.Show(Properties.Resources.uninstall_legacy_message);
-                Util.SelfDelete();
-            }
-            else if (Directory.Exists(GlobalVars.appdata))
-            {
-                Debug.LogToFile("INFO Deleting EnvyUpdate appdata folder");
-                Directory.Delete(GlobalVars.appdata, true);
-            }
-        }
-
         private void switchStudioDriver_Unchecked(object sender, RoutedEventArgs e)
         {
             if (File.Exists(GlobalVars.exedirectory + "sd.envy"))
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 672e8db..5353f49 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -54,6 +54,13 @@ namespace EnvyUpdate
                 Environment.Exit(1);
             }
 
+            // Delete installed legacy versions
+            if (Directory.Exists(GlobalVars.appdata))
+            {
+                Debug.LogToFile("INFO Found old appdata installation, uninstalling.");
+                Util.UninstallAll();
+            }
+
             if (!Util.IsNvidia())
             {
                 if (arguments.Contains("/fake"))
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 9aa70cf..c9fec1f 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -526,6 +526,32 @@ namespace EnvyUpdate
             return gpuUrl;
         }
 
+        public static void UninstallAll()
+        {
+            if (System.IO.File.Exists(GlobalVars.startup + "\\EnvyUpdate.lnk"))
+            {
+                Debug.LogToFile("INFO Deleted startup entry.");
+                System.IO.File.Delete(GlobalVars.startup + "\\EnvyUpdate.lnk");
+            }
+
+            if (System.IO.File.Exists(GlobalVars.startmenu + "\\EnvyUpdate.lnk"))
+            {
+                Debug.LogToFile("INFO Deleted start menu entry.");
+                System.IO.File.Delete(GlobalVars.startmenu + "\\EnvyUpdate.lnk");
+            }
+            if ((GlobalVars.exedirectory == GlobalVars.appdata) && System.IO.File.Exists(GlobalVars.appdata + "EnvyUpdate.exe"))
+            {
+                Debug.LogToFile("INFO Deleting EnvyUpdate appdata and self.");
+                MessageBox.Show(Properties.Resources.uninstall_legacy_message);
+                Util.SelfDelete();
+            }
+            else if (Directory.Exists(GlobalVars.appdata))
+            {
+                Debug.LogToFile("INFO Deleting EnvyUpdate appdata folder");
+                Directory.Delete(GlobalVars.appdata, true);
+            }
+        }
+
         public static void DownloadFile(string fileURL, string savePath)
         {
             //TODO Implement downloading

From 6b745618e607628ca7208570df6ccdd5139099f3 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 12:05:06 +0200
Subject: [PATCH 15/69] fix debug & skip

---
 EnvyUpdate/DashboardPage.xaml    |  2 +-
 EnvyUpdate/DashboardPage.xaml.cs | 17 +++++++++++------
 EnvyUpdate/MainWindow.xaml.cs    | 21 +++++++++------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index 31e3ab6..a9a1d8d 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -44,7 +44,7 @@
             Message="..."
             Severity="Informational" />
 
-            <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Secondary" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" />
+            <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Secondary" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
             
             <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" />
         </Grid>
diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 62f41bc..e88ea01 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -36,7 +36,10 @@ namespace EnvyUpdate
         {
             InitializeComponent();
 
-            localDriv = Util.GetLocDriv();
+            if (Debug.isFake)
+                localDriv = Debug.LocalDriv();
+            else
+                localDriv = Util.GetLocDriv();
 
             Debug.LogToFile("INFO Local driver version: " + localDriv);
 
@@ -48,10 +51,10 @@ namespace EnvyUpdate
 
             Debug.LogToFile("INFO Detecting driver type.");
 
-            if (Util.IsDCH())
-                textblockLocalType.Text = "DCH";
-            else if (Debug.isFake)
+            if (Debug.isFake)
                 textblockLocalType.Text = "DCH (Debug)";
+            else if (Util.IsDCH())
+                textblockLocalType.Text = "DCH";
             else
                 textblockLocalType.Text = "Standard";
 
@@ -91,6 +94,8 @@ namespace EnvyUpdate
                 driverFileChangedWatcher.EnableRaisingEvents = true;
                 Debug.LogToFile("INFO Started update file system watcher.");
             }
+            else
+                Debug.LogToFile("WARN Could not start update file system watcher. Path not found: " + watchDirPath);
 
             Load();
         }
@@ -119,7 +124,7 @@ namespace EnvyUpdate
                 skippedVer = File.ReadLines(GlobalVars.exedirectory + "skip.envy").First();
             }
 
-            // This little bool check is necessary for debug mode on systems without an Nvidia GPU. 
+            // This little bool check is necessary for debug fake mode. 
             if (Debug.isFake)
             {
                 localDriv = Debug.LocalDriv();
@@ -296,7 +301,7 @@ namespace EnvyUpdate
             }
         }
 
-        private void buttonSkip_Click(object sender, RoutedEventArgs e)
+        private void buttonSkipVersion_Click(object sender, RoutedEventArgs e)
         {
             Debug.LogToFile("INFO Skipping version.");
             skippedVer = onlineDriv;
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 5353f49..1d9eb37 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -61,19 +61,16 @@ namespace EnvyUpdate
                 Util.UninstallAll();
             }
 
-            if (!Util.IsNvidia())
+            if (arguments.Contains("/fake"))
             {
-                if (arguments.Contains("/fake"))
-                {
-                    Debug.isFake = true;
-                    Debug.LogToFile("WARN Faking GPU with debug info.");
-                }
-                else
-                {
-                    Debug.LogToFile("FATAL No supported GPU found, terminating.");
-                    MessageBox.Show(Properties.Resources.no_compatible_gpu);
-                    Environment.Exit(255);
-                }
+                Debug.isFake = true;
+                Debug.LogToFile("WARN Faking GPU with debug info.");
+            }
+            else if (!Util.IsNvidia())
+            {
+                Debug.LogToFile("FATAL No supported GPU found, terminating.");
+                MessageBox.Show(Properties.Resources.no_compatible_gpu);
+                Environment.Exit(255);
             }
 
             //Check if launched as miminized with arg

From 6d281e4e4492f89c81131b84b5d0f0cf5957eeb2 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 12:37:00 +0200
Subject: [PATCH 16/69] add dark mode

---
 EnvyUpdate/App.xaml           |  1 -
 EnvyUpdate/App.xaml.cs        |  9 +++++++++
 EnvyUpdate/MainWindow.xaml.cs |  7 ++-----
 EnvyUpdate/Util.cs            | 29 +++++++++++++++++++++++++----
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/EnvyUpdate/App.xaml b/EnvyUpdate/App.xaml
index de53160..99d92b4 100644
--- a/EnvyUpdate/App.xaml
+++ b/EnvyUpdate/App.xaml
@@ -7,7 +7,6 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ui:ThemesDictionary Theme="Light"/>
                 <ui:ControlsDictionary />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/EnvyUpdate/App.xaml.cs b/EnvyUpdate/App.xaml.cs
index 3bd4437..92c551b 100644
--- a/EnvyUpdate/App.xaml.cs
+++ b/EnvyUpdate/App.xaml.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using Windows.Foundation.Collections;
+using Wpf.Ui.Markup;
 
 namespace EnvyUpdate
 {
@@ -18,6 +19,14 @@ namespace EnvyUpdate
     {
         protected override void OnStartup(StartupEventArgs e)
         {
+            Wpf.Ui.Appearance.Accent.ApplySystemAccent();
+            ThemesDictionary themedict = new ThemesDictionary();
+            if (Util.IsDarkTheme())
+                themedict.Theme = Wpf.Ui.Appearance.ThemeType.Dark;
+            else
+                themedict.Theme = Wpf.Ui.Appearance.ThemeType.Light;
+            Application.Current.Resources.MergedDictionaries.Add(themedict);
+
             // Listen to notification activation
             ToastNotificationManagerCompat.OnActivated += toastArgs =>
             {
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 1d9eb37..1f6b74d 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -24,6 +24,8 @@ namespace EnvyUpdate
 
         public MainWindow()
         {
+            InitializeComponent();
+
             // Try to get command line arguments
             try
             {
@@ -83,11 +85,6 @@ namespace EnvyUpdate
 
             GlobalVars.isMobile = Util.IsMobile();
             Debug.LogToFile("INFO Mobile: " + GlobalVars.isMobile);
-
-            InitializeComponent();
-            Wpf.Ui.Appearance.Accent.ApplySystemAccent();
-
-            
         }
         private void Window_StateChanged(object sender, EventArgs e)
         {
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index c9fec1f..91e3124 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -6,13 +6,9 @@ using System.IO;
 using System.Linq;
 using System.Management;
 using System.Net;
-using System.Security.Cryptography;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Xml.Linq;
-using Windows.Devices.Radios;
-using Windows.UI.Xaml.Input;
 
 namespace EnvyUpdate
 {
@@ -552,6 +548,31 @@ namespace EnvyUpdate
             }
         }
 
+        public static bool IsDarkTheme()
+        {
+            try
+            {
+                Debug.LogToFile("INFO Trying to get app theme...");
+                int res = (int)Registry.GetValue("HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme", -1);
+                switch (res)
+                {
+                    case 0:
+                        Debug.LogToFile("INFO Using dark theme.");
+                        return true;
+                    case 1:
+                        Debug.LogToFile("INFO Using light theme.");
+                        return false;
+                    default:
+                        throw new IndexOutOfRangeException();
+                }
+            }
+            catch (Exception)
+            {
+                Debug.LogToFile("WARN Could not determine theme. Setting light theme.");
+                return false;
+            }
+        }
+
         public static void DownloadFile(string fileURL, string savePath)
         {
             //TODO Implement downloading

From 58bef7537fa4784fff9483e5b26dc8089feb8740 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 12:55:18 +0200
Subject: [PATCH 17/69] edit dark theme implementation

---
 EnvyUpdate/App.xaml    | 1 +
 EnvyUpdate/App.xaml.cs | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/EnvyUpdate/App.xaml b/EnvyUpdate/App.xaml
index 99d92b4..de53160 100644
--- a/EnvyUpdate/App.xaml
+++ b/EnvyUpdate/App.xaml
@@ -7,6 +7,7 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ui:ThemesDictionary Theme="Light"/>
                 <ui:ControlsDictionary />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/EnvyUpdate/App.xaml.cs b/EnvyUpdate/App.xaml.cs
index 92c551b..369d24c 100644
--- a/EnvyUpdate/App.xaml.cs
+++ b/EnvyUpdate/App.xaml.cs
@@ -19,13 +19,16 @@ namespace EnvyUpdate
     {
         protected override void OnStartup(StartupEventArgs e)
         {
+            // Remove placeholder light theme and apply system app theme
             Wpf.Ui.Appearance.Accent.ApplySystemAccent();
+            Application.Current.Resources.MergedDictionaries.RemoveAt(0);
             ThemesDictionary themedict = new ThemesDictionary();
             if (Util.IsDarkTheme())
                 themedict.Theme = Wpf.Ui.Appearance.ThemeType.Dark;
             else
                 themedict.Theme = Wpf.Ui.Appearance.ThemeType.Light;
             Application.Current.Resources.MergedDictionaries.Add(themedict);
+            // TODO: Watch for theme changes and dynamically update
 
             // Listen to notification activation
             ToastNotificationManagerCompat.OnActivated += toastArgs =>

From 0760600d4735b168f9a6f315e26899fc5a268a13 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 21:04:54 +0200
Subject: [PATCH 18/69] add download for driver

---
 EnvyUpdate/DashboardPage.xaml    |  4 +--
 EnvyUpdate/DashboardPage.xaml.cs | 55 ++++++++++++++++++++------------
 EnvyUpdate/MainWindow.xaml.cs    | 11 +------
 EnvyUpdate/SettingsPage.xaml.cs  | 11 -------
 EnvyUpdate/Util.cs               | 11 +++++--
 README.md                        |  2 +-
 6 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index a9a1d8d..3170e4b 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -46,10 +46,10 @@
 
             <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Secondary" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
             
-            <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" />
+            <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" Click="buttonDownload_Click" />
         </Grid>
 
-        <ProgressBar Grid.Row="2" Value="0" Visibility="Collapsed"/>
+        <ProgressBar x:Name="progressbarDownload" Grid.Row="2" Value="0" Visibility="Collapsed"/>
         <!-- This is for later automatic downloading. Todo! -->
 
         <Grid Margin="0,12,0,0" Grid.Row="3">
diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index e88ea01..a72a329 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -1,24 +1,13 @@
-using Microsoft.Build.Framework.XamlTypes;
-using Microsoft.Toolkit.Uwp.Notifications;
-using System;
-using System.Collections.Generic;
+using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using System.Threading;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
 using System.Windows.Threading;
-using Windows.ApplicationModel.VoiceCommands;
 
 namespace EnvyUpdate
 {
@@ -261,12 +250,6 @@ namespace EnvyUpdate
             }
         }
 
-        private void buttonDL_Click(object sender, RoutedEventArgs e)
-        {
-            Debug.LogToFile("INFO Opening download page.");
-            Process.Start(gpuURL);
-        }
-
         private void switchStudioDriver_Unchecked(object sender, RoutedEventArgs e)
         {
             if (File.Exists(GlobalVars.exedirectory + "sd.envy"))
@@ -358,5 +341,37 @@ namespace EnvyUpdate
                 infoBarStatus.Message = Properties.Resources.ui_message_update;
             }
         }
+
+        private void buttonDownload_Click(object sender, RoutedEventArgs e)
+        {
+            progressbarDownload.Visibility = Visibility.Visible;
+            buttonDownload.IsEnabled = false;
+            
+            Thread thread = new Thread(() => {
+                WebClient client = new WebClient();
+                client.Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/115.0";
+                client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
+                client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
+                client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe"));
+            });
+            thread.Start();
+        }
+
+        void client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        {
+            double bytesIn = double.Parse(e.BytesReceived.ToString());
+            double totalBytes = double.Parse(e.TotalBytesToReceive.ToString());
+            double percentage = bytesIn / totalBytes * 100;
+            Application.Current.Dispatcher.Invoke(new Action(() => {
+                progressbarDownload.Value = int.Parse(Math.Truncate(percentage).ToString());
+            }));
+        }
+        void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
+        {
+            Application.Current.Dispatcher.Invoke(new Action(() => {
+                progressbarDownload.Visibility = Visibility.Collapsed;
+                buttonDownload.Icon = Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24;
+            }));
+        }
     }
 }
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 1f6b74d..6efb4fc 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -1,17 +1,8 @@
-using Microsoft.Build.Framework.XamlTypes;
-using Microsoft.Toolkit.Uwp.Notifications;
+using Microsoft.Toolkit.Uwp.Notifications;
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Management;
-using System.Net;
-using System.Runtime.Remoting.Messaging;
-using System.Text.RegularExpressions;
 using System.Windows;
-using System.Windows.Media;
-using System.Windows.Threading;
-using Wpf.Ui.Controls.Interfaces;
 
 namespace EnvyUpdate
 {
diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index 5e5d838..28fe8b7 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -1,17 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
 
 namespace EnvyUpdate
 {
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 91e3124..94c5f9b 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -573,10 +573,15 @@ namespace EnvyUpdate
             }
         }
 
-        public static void DownloadFile(string fileURL, string savePath)
+        public static string GetDirectDownload(string gpuUrl)
         {
-            //TODO Implement downloading
-            //TODO implement progress bar
+            string webcontent;
+            using (var wc = new WebClient())
+                webcontent = wc.DownloadString(gpuUrl);
+
+            string directUrl = Regex.Match(webcontent, "\\/Windows\\/\\d+\\.\\d+\\/[\\w\\d\\/\\-\\.]*exe").Value;
+            directUrl = "https://us.download.nvidia.com" + directUrl;
+            return directUrl;
         }
     }
 }
diff --git a/README.md b/README.md
index d1a58b5..2b6a970 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ If you want to help me develop EnvyUpdate, you can start by creating issues with
 
 * [TinyNvidiaUpdateChecker](https://github.com/ElPumpo/TinyNvidiaUpdateChecker) - a command line update checker and installer. Inspired EnvyUpdate to begin with.
 * [nvidia-update](https://github.com/ZenitH-AT/nvidia-update) - a Powershell script to check for driver updates
-* [Disable-Nvidia-Telemtry](https://github.com/NateShoffner/Disable-Nvidia-Telemetry) - does pretty much what the name says. It disables Nvidia Telemetry.
+* [Disable-Nvidia-Telemetry](https://github.com/NateShoffner/Disable-Nvidia-Telemetry) - does pretty much what the name says. It disables Nvidia Telemetry.
 * [NVCleanInstall](https://www.techpowerup.com/nvcleanstall/) - a closed-source application by TechPowerUp which does quite a lot of cool things.
 
 EnvyUpdate is not a replacement for any of these tools. I will still try to implement as many features in EnvyUpdate as possible while keeping the simple interface and as little settings as possible.

From 726adc71936c01a8ca75e2ee97d410e85da27773 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 21:52:27 +0200
Subject: [PATCH 19/69] finish downloader

---
 EnvyUpdate/DashboardPage.xaml               | 129 ++++++++++----------
 EnvyUpdate/DashboardPage.xaml.cs            |  31 ++++-
 EnvyUpdate/Properties/Resources.Designer.cs |  36 ++++++
 EnvyUpdate/Properties/Resources.de.resx     |  12 ++
 EnvyUpdate/Properties/Resources.resx        |  12 ++
 EnvyUpdate/Util.cs                          |   5 +-
 6 files changed, 159 insertions(+), 66 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index 3170e4b..eb0757b 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -11,75 +11,78 @@
       Title="DashboardPage">
 
     <Grid Margin="8,0,8,8">
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
         <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
 
-            <ui:SymbolIcon Symbol="DeveloperBoard24" FontSize="56"/>
-            <TextBlock Margin="8,0,0,0" x:Name="textblockGPUName" Grid.Column="1" Text="GPU..." FontSize="32" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
-        </Grid>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+
+                <ui:SymbolIcon Symbol="DeveloperBoard24" FontSize="56"/>
+                <TextBlock Margin="8,0,0,0" x:Name="textblockGPUName" Grid.Column="1" Text="GPU..." FontSize="32" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
+            </Grid>
         
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
 
-            <ui:InfoBar x:Name="infoBarStatus"
-            Title="Checking"
-            IsOpen="True"
-            IsClosable="False"
-            Message="..."
-            Severity="Informational" />
+                <ui:InfoBar x:Name="infoBarStatus"
+                Title="Checking"
+                IsOpen="True"
+                IsClosable="False"
+                Message="..."
+                Severity="Informational" />
 
-            <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Secondary" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
+                <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Secondary" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
             
-            <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" Click="buttonDownload_Click" />
+                <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" Click="buttonDownload_Click" />
+            </Grid>
+
+            <ProgressBar x:Name="progressbarDownload" Grid.Row="2" Value="0" Visibility="Collapsed"/>
+            <!-- This is for later automatic downloading. Todo! -->
+
+            <Grid Margin="0,12,0,0" Grid.Row="3">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+
+                <ui:CardExpander x:Name="cardLocal" Margin="0,0,4,0" Grid.Column="0" Grid.Row="0" Icon="Desktop32" Header="..." ToolTip="{x:Static p:Resources.ui_localdriver}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Column="0" FontWeight="Bold" Text="{x:Static p:Resources.ui_localdriver_type}"/>
+                        <TextBlock Grid.Column="1" x:Name="textblockLocalType" Text="?" />
+                    </Grid>
+                </ui:CardExpander>
+                <ui:CardExpander x:Name="cardOnline" Margin="4,0,0,0" Grid.Column="1" Grid.Row="0" Icon="Earth32" Header="..." ToolTip="{x:Static p:Resources.ui_onlinedriver}">
+                    <ui:Button Icon="Open24" Click="CardOnline_Click" Content="{x:Static p:Resources.ui_openwebsite}" HorizontalAlignment="Stretch"/>
+                </ui:CardExpander>
+            </Grid>
+
+            <ui:CardControl Margin="0,12,0,0" Grid.Row="4" Icon="Color24" Header="Studio Driver">
+                <ui:ToggleSwitch x:Name="switchStudioDriver" IsChecked="False" Checked="switchStudioDriver_Checked" Unchecked="switchStudioDriver_Unchecked" />
+            </ui:CardControl>
+
+            <ui:CardControl Margin="0,12,0,0" Grid.Row="5" Icon="LightbulbFilament48" Header="{x:Static p:Resources.ui_autostart}">
+                <ui:ToggleSwitch x:Name="switchAutostart" IsChecked="False" Click="switchAutostart_Click" />
+            </ui:CardControl>
         </Grid>
-
-        <ProgressBar x:Name="progressbarDownload" Grid.Row="2" Value="0" Visibility="Collapsed"/>
-        <!-- This is for later automatic downloading. Todo! -->
-
-        <Grid Margin="0,12,0,0" Grid.Row="3">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-
-            <ui:CardExpander x:Name="cardLocal" Margin="0,0,4,0" Grid.Column="0" Grid.Row="0" Icon="Desktop32" Header="..." ToolTip="{x:Static p:Resources.ui_localdriver}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-
-                    <TextBlock Grid.Column="0" FontWeight="Bold" Text="{x:Static p:Resources.ui_localdriver_type}"/>
-                    <TextBlock Grid.Column="1" x:Name="textblockLocalType" Text="?" />
-                </Grid>
-            </ui:CardExpander>
-            <ui:CardExpander x:Name="cardOnline" Margin="4,0,0,0" Grid.Column="1" Grid.Row="0" Icon="Earth32" Header="..." ToolTip="{x:Static p:Resources.ui_onlinedriver}">
-                <ui:Button Icon="Open24" Click="CardOnline_Click" Content="{x:Static p:Resources.ui_openwebsite}" HorizontalAlignment="Stretch"/>
-            </ui:CardExpander>
-        </Grid>
-
-        <ui:CardControl Margin="0,12,0,0" Grid.Row="4" Icon="Color24" Header="Studio Driver">
-            <ui:ToggleSwitch x:Name="switchStudioDriver" IsChecked="False" Checked="switchStudioDriver_Checked" Unchecked="switchStudioDriver_Unchecked" />
-        </ui:CardControl>
-
-        <ui:CardControl Margin="0,12,0,0" Grid.Row="5" Icon="LightbulbFilament48" Header="{x:Static p:Resources.ui_autostart}">
-            <ui:ToggleSwitch x:Name="switchAutostart" IsChecked="False" Click="switchAutostart_Click" />
-        </ui:CardControl>
+        <ui:Snackbar x:Name="snackbarInfo" Timeout="0"/>
     </Grid>
 </ui:UiPage>
diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index a72a329..45f7af0 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -8,6 +8,8 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows;
 using System.Windows.Threading;
+using Wpf.Ui.Controls;
+using MessageBox = System.Windows.MessageBox;
 
 namespace EnvyUpdate
 {
@@ -352,7 +354,7 @@ namespace EnvyUpdate
                 client.Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/115.0";
                 client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
                 client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
-                client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe"));
+                client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe.downloading"));
             });
             thread.Start();
         }
@@ -369,9 +371,34 @@ namespace EnvyUpdate
         void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
         {
             Application.Current.Dispatcher.Invoke(new Action(() => {
+                buttonDownload.IsEnabled = true;
                 progressbarDownload.Visibility = Visibility.Collapsed;
-                buttonDownload.Icon = Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24;
             }));
+            if (e.Error == null)
+            {
+                Application.Current.Dispatcher.Invoke(new Action(() => {
+                    showSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_download_success, Properties.Resources.info_download_success_title);
+                }));
+                if (File.Exists(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe")))
+                    File.Delete(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe"));
+                File.Move(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe.downloading"), Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe"));
+            }
+            else
+            {
+                File.Delete(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe.downloading"));
+                Application.Current.Dispatcher.Invoke(new Action(() => {
+                    showSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_download_error, Properties.Resources.info_download_error_title);
+                }));
+            }
+        }
+
+        private void showSnackbar (Wpf.Ui.Common.ControlAppearance appearance, Wpf.Ui.Common.SymbolRegular icon, string message = "", string title = "")
+        {
+            snackbarInfo.Appearance = appearance;
+            snackbarInfo.Icon = icon;
+            snackbarInfo.Title = title;
+            snackbarInfo.Message = message;
+            snackbarInfo.Show();
         }
     }
 }
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index c17e88a..e0ed7b3 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -78,6 +78,42 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to There was a problem downloading the driver installer. Please try again..
+        /// </summary>
+        public static string info_download_error {
+            get {
+                return ResourceManager.GetString("info_download_error", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Error while downloading.
+        /// </summary>
+        public static string info_download_error_title {
+            get {
+                return ResourceManager.GetString("info_download_error_title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Driver installer successfully downloaded..
+        /// </summary>
+        public static string info_download_success {
+            get {
+                return ResourceManager.GetString("info_download_success", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Download successful.
+        /// </summary>
+        public static string info_download_success_title {
+            get {
+                return ResourceManager.GetString("info_download_success_title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Preference reset..
         /// </summary>
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index eace543..13bfb43 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -123,6 +123,18 @@
   <data name="exit_confirm" xml:space="preserve">
     <value>EnvyUpdate schließen?</value>
   </data>
+  <data name="info_download_error" xml:space="preserve">
+    <value>Fehler beim Herunterladen der Treiber-Installationsdatei. Bitte versuchen Sie es erneut.</value>
+  </data>
+  <data name="info_download_error_title" xml:space="preserve">
+    <value>Fehler beim Herunterladen</value>
+  </data>
+  <data name="info_download_success" xml:space="preserve">
+    <value>Treiber-Installationsdatei erfolgreich heruntergeladen.</value>
+  </data>
+  <data name="info_download_success_title" xml:space="preserve">
+    <value>Herunterladen erfolgreich abgeschlossen</value>
+  </data>
   <data name="info_reset_caption" xml:space="preserve">
     <value>Einstellung zurückgesetzt.</value>
   </data>
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index bb5275a..308ba4e 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -123,6 +123,18 @@
   <data name="exit_confirm" xml:space="preserve">
     <value>Exit EnvyUpdate?</value>
   </data>
+  <data name="info_download_error" xml:space="preserve">
+    <value>There was a problem downloading the driver installer. Please try again.</value>
+  </data>
+  <data name="info_download_error_title" xml:space="preserve">
+    <value>Error while downloading</value>
+  </data>
+  <data name="info_download_success" xml:space="preserve">
+    <value>Driver installer successfully downloaded.</value>
+  </data>
+  <data name="info_download_success_title" xml:space="preserve">
+    <value>Download successful</value>
+  </data>
   <data name="info_reset_caption" xml:space="preserve">
     <value>Preference reset.</value>
   </data>
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 94c5f9b..5cd3410 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -1,4 +1,5 @@
-using IWshRuntimeLibrary;
+using EnvyUpdate.Properties;
+using IWshRuntimeLibrary;
 using Microsoft.Win32;
 using System;
 using System.Diagnostics;
@@ -7,7 +8,9 @@ using System.Linq;
 using System.Management;
 using System.Net;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 using System.Xml.Linq;
 
 namespace EnvyUpdate

From 452790d9233b33674c7431875eb773004e0a1d39 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 14 Jul 2023 22:03:26 +0200
Subject: [PATCH 20/69] simplify notification

---
 EnvyUpdate/App.xaml.cs           | 27 +++++++++------------------
 EnvyUpdate/DashboardPage.xaml    |  1 +
 EnvyUpdate/DashboardPage.xaml.cs |  6 ++++++
 EnvyUpdate/MainWindow.xaml       |  2 +-
 EnvyUpdate/Notify.cs             |  3 ---
 5 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/EnvyUpdate/App.xaml.cs b/EnvyUpdate/App.xaml.cs
index 369d24c..2d0e158 100644
--- a/EnvyUpdate/App.xaml.cs
+++ b/EnvyUpdate/App.xaml.cs
@@ -31,25 +31,16 @@ namespace EnvyUpdate
             // TODO: Watch for theme changes and dynamically update
 
             // Listen to notification activation
-            ToastNotificationManagerCompat.OnActivated += toastArgs =>
-            {
-                // Obtain the arguments from the notification
-                ToastArguments args = ToastArguments.Parse(toastArgs.Argument);
+            ToastNotificationManagerCompat.OnActivated += ToastNotificationManagerCompat_OnActivated;
+        }
 
-                // Need to dispatch to UI thread if performing UI operations
-                Application.Current.Dispatcher.Invoke(delegate
-                {
-                    switch (args.Get("action"))
-                    {
-                        case "download":
-                            Process.Start(Util.GetGpuUrl());
-                            break;
-                        default:
-                            Util.ShowMain();
-                            break;
-                    }
-                });
-            };
+        private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivatedEventArgsCompat e)
+        {
+            // Need to dispatch to UI thread if performing UI operations
+            Application.Current.Dispatcher.Invoke(delegate
+            {
+                Util.ShowMain();
+            });
         }
     }
 }
diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index eb0757b..dc9d964 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -48,6 +48,7 @@
                 <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Secondary" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
             
                 <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" Click="buttonDownload_Click" />
+                <ui:Button x:Name="buttonInstall" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="AppsAddIn24" Visibility="Collapsed" Click="buttonInstall_Click" />
             </Grid>
 
             <ProgressBar x:Name="progressbarDownload" Grid.Row="2" Value="0" Visibility="Collapsed"/>
diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 45f7af0..f7e4f1d 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -378,6 +378,8 @@ namespace EnvyUpdate
             {
                 Application.Current.Dispatcher.Invoke(new Action(() => {
                     showSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_download_success, Properties.Resources.info_download_success_title);
+                    buttonDownload.Visibility = Visibility.Collapsed;
+                    buttonInstall.Visibility = Visibility.Visible;
                 }));
                 if (File.Exists(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe")))
                     File.Delete(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe"));
@@ -391,6 +393,10 @@ namespace EnvyUpdate
                 }));
             }
         }
+        private void buttonInstall_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
 
         private void showSnackbar (Wpf.Ui.Common.ControlAppearance appearance, Wpf.Ui.Common.SymbolRegular icon, string message = "", string title = "")
         {
diff --git a/EnvyUpdate/MainWindow.xaml b/EnvyUpdate/MainWindow.xaml
index e3b0166..f12d454 100644
--- a/EnvyUpdate/MainWindow.xaml
+++ b/EnvyUpdate/MainWindow.xaml
@@ -11,7 +11,7 @@
     ExtendsContentIntoTitleBar="True"
     WindowBackdropType="Mica"
     
-    Title="EnvyUpdate" MinHeight="450" Height="450" MinWidth="600" Width="600" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" Activated="UiWindow_Activated" WindowStyle="None">
+    Title="EnvyUpdate" MinHeight="500" Height="500" MinWidth="600" Width="600" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" Activated="UiWindow_Activated" WindowStyle="None">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
diff --git a/EnvyUpdate/Notify.cs b/EnvyUpdate/Notify.cs
index 6230c6a..ac317c1 100644
--- a/EnvyUpdate/Notify.cs
+++ b/EnvyUpdate/Notify.cs
@@ -8,9 +8,6 @@ namespace EnvyUpdate
         {
             var toast = new ToastContentBuilder();
             toast.AddText(Properties.Resources.update_popup_message);
-            toast.AddButton(new ToastButton()
-                .SetContent("Download")
-                .AddArgument("action", "download"));
             toast.Show();
         }
     }

From b2d0e9764faed0ad76d7564d97b054023c409add Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Fri, 11 Aug 2023 19:45:22 +0200
Subject: [PATCH 21/69] fix gpu detection

---
 EnvyUpdate/Util.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index fdd5fc2..c2f6711 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -220,7 +220,7 @@ namespace EnvyUpdate
             foreach (var name in names) // Looping through the XML Doc because the name is not the primary key
             {
                 string sName = name.Value.ToString().ToLower();
-                if (sName == query)
+                if (sName.Contains(query))
                 {
                     Debug.LogToFile("INFO Matched GetValueFromName query: " + sName);
                     string cleanResult = null;
@@ -335,7 +335,7 @@ namespace EnvyUpdate
                     {
                         GPUName = obj["VideoProcessor"].ToString().ToLower();
                         // Remove any 3GB, 6GB or similar from name. We don't need to know the VRAM to get results.
-                        GPUName = Regex.Match(GPUName, "(geforce )?.tx \\w*\\d*( ti)?").Value;
+                        GPUName = Regex.Match(GPUName, "(geforce )((.tx )|(mx))?\\w*\\d*( ti)?").Value;
                     }
                     else
                         GPUName = obj["VideoProcessor"].ToString();

From d408b51b0ef26ceb3f14ab712d534d529eb33848 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 09:14:50 +0200
Subject: [PATCH 22/69] add os check and detect win11

---
 EnvyUpdate/MainWindow.xaml.cs               | 12 ++++++--
 EnvyUpdate/Properties/Resources.Designer.cs |  9 ++++++
 EnvyUpdate/Properties/Resources.de.resx     |  3 ++
 EnvyUpdate/Properties/Resources.resx        |  3 ++
 EnvyUpdate/Util.cs                          | 32 +++++++--------------
 5 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 6efb4fc..f7729a4 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -37,23 +37,31 @@ namespace EnvyUpdate
 
             Debug.LogToFile("INFO Starting EnvyUpdate, version " + System.Diagnostics.FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion);
 
+            // Check if running on supported Windows version.
+            if (Environment.OSVersion.Version.Major < 10)
+            {
+                Debug.LogToFile("FATAL Unsupported OS version, terminating.");
+                MessageBox.Show(Properties.Resources.unsupported_os);
+                Environment.Exit(1);
+            }
+
             // Check if EnvyUpdate is already running
             if (Util.IsInstanceOpen("EnvyUpdate"))
             {
                 Debug.LogToFile("FATAL Found another instance, terminating.");
 
-
                 MessageBox.Show(Properties.Resources.instance_already_running);
                 Environment.Exit(1);
             }
 
-            // Delete installed legacy versions
+            // Delete installed legacy versions, required for people upgrading from very old versions.
             if (Directory.Exists(GlobalVars.appdata))
             {
                 Debug.LogToFile("INFO Found old appdata installation, uninstalling.");
                 Util.UninstallAll();
             }
 
+            // Allow for running using a fake graphics card if no nvidia card is present.
             if (arguments.Contains("/fake"))
             {
                 Debug.isFake = true;
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index e0ed7b3..6cac9c1 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -384,6 +384,15 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Your operating system is not supported by EnvyUpdate. Windows 10 or later is required..
+        /// </summary>
+        public static string unsupported_os {
+            get {
+                return ResourceManager.GetString("unsupported_os", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to A new driver update is available for your graphics card..
         /// </summary>
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index 13bfb43..7758b15 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -225,6 +225,9 @@
   <data name="uninstall_legacy_message" xml:space="preserve">
     <value>Aufgrund eines Programmfehlers musste EnvyUpdate deinstalliert werden. Bitte laden Sie die neuste Version erneut manuell herunter.</value>
   </data>
+  <data name="unsupported_os" xml:space="preserve">
+    <value>Diese Betriebssystemversion wird von EnvyUpdate nicht unterstützt. Windows 10 oder neuer wird vorausgesetzt.</value>
+  </data>
   <data name="update_popup_message" xml:space="preserve">
     <value>Eine neue Treiberversion ist verfügbar.</value>
   </data>
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index 308ba4e..8667646 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -225,6 +225,9 @@
   <data name="uninstall_legacy_message" xml:space="preserve">
     <value>EnvyUpdate must be uninstalled because of an application bug. Please download the most recent version again.</value>
   </data>
+  <data name="unsupported_os" xml:space="preserve">
+    <value>Your operating system is not supported by EnvyUpdate. Windows 10 or later is required.</value>
+  </data>
   <data name="update_popup_message" xml:space="preserve">
     <value>A new driver update is available for your graphics card.</value>
   </data>
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 937f40e..2b03540 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -296,31 +296,21 @@ namespace EnvyUpdate
         private static int GetOSID()
         {
             // This is faster than making a whole web request and searching through XML. This application only supports 8 possible IDs, so they are hardcoded.
-            int value = 0;
-            string OS = Environment.OSVersion.Version.Major.ToString() + "." + Environment.OSVersion.Version.Minor.ToString();
+            int value;
 
-            // Here the 32bit values are used. Later, if the OS is 64bit, we'll add 1, since that is how Nvidia does their IDs.
-            switch (OS) //TODO until Win10 EOL: Differentiate between Win10 and Win11
+            if (Environment.OSVersion.Version.Build < 22000)
             {
-                case "10.0": //Win10 or Win11
+                // This means we are running Windows 10.
+                if (Environment.Is64BitOperatingSystem)
                     value = 56;
-                    break;
-                case "6.1": //Win7
-                    value = 18;
-                    break;
-                case "6.2": //Win8
-                    value = 27;
-                    break;
-                case "6.3": //Win8.1
-                    value = 40;
-                    break;
-                default:
-                    break;
+                else
+                    value = 57;
+            }
+            else
+            {
+                // This must be Windows 11 (for now, until Windows 12 comes along)
+                value = 135; // No need to check for 64bit, Win11 can not be 32bit.
             }
-
-            //Simply increment the ID by 1 if OS is 64bit.
-            if (Environment.Is64BitOperatingSystem)
-                value++;
 
             return value;
         }

From 3a8eb0a76cbb93e8d1619dd0f8a37572a6396db3 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 09:41:31 +0200
Subject: [PATCH 23/69] better download naming

---
 EnvyUpdate/DashboardPage.xaml.cs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index f7e4f1d..2239a76 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -350,11 +350,14 @@ namespace EnvyUpdate
             buttonDownload.IsEnabled = false;
             
             Thread thread = new Thread(() => {
+                if (File.Exists(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading")))
+                    File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+
                 WebClient client = new WebClient();
-                client.Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/115.0";
+                client.Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0";
                 client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
                 client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
-                client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe.downloading"));
+                client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
             });
             thread.Start();
         }
@@ -381,13 +384,13 @@ namespace EnvyUpdate
                     buttonDownload.Visibility = Visibility.Collapsed;
                     buttonInstall.Visibility = Visibility.Visible;
                 }));
-                if (File.Exists(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe")))
-                    File.Delete(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe"));
-                File.Move(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe.downloading"), Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe"));
+                if (File.Exists(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe")))
+                    File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe"));
+                File.Move(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"), Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe"));
             }
             else
             {
-                File.Delete(Path.Combine(GlobalVars.exedirectory, "nvidia-installer.exe.downloading"));
+                File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
                 Application.Current.Dispatcher.Invoke(new Action(() => {
                     showSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_download_error, Properties.Resources.info_download_error_title);
                 }));

From 8f263831666c5262ce24341dc9ed54c024148015 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 10:06:06 +0200
Subject: [PATCH 24/69] support install after restart

---
 EnvyUpdate/DashboardPage.xaml.cs | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 2239a76..5501dbd 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -250,6 +250,14 @@ namespace EnvyUpdate
                 buttonSkipVersion.IsEnabled = true;
                 buttonSkipVersion.Visibility = Visibility.Visible;
             }
+
+            // Check if update file already exists and display install button instead
+            if (File.Exists(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe")))
+            {
+                Debug.LogToFile("INFO Found downloaded driver installer, no need to redownload.");
+                buttonDownload.Visibility = Visibility.Collapsed;
+                buttonInstall.Visibility = Visibility.Visible;
+            }
         }
 
         private void switchStudioDriver_Unchecked(object sender, RoutedEventArgs e)
@@ -348,11 +356,13 @@ namespace EnvyUpdate
         {
             progressbarDownload.Visibility = Visibility.Visible;
             buttonDownload.IsEnabled = false;
-            
-            Thread thread = new Thread(() => {
-                if (File.Exists(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading")))
-                    File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
 
+            if (File.Exists(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading")))
+            {
+                Debug.LogToFile("WARN Found previous unfinished download, retrying.");
+                File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+            }
+            Thread thread = new Thread(() => {
                 WebClient client = new WebClient();
                 client.Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0";
                 client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
@@ -360,6 +370,7 @@ namespace EnvyUpdate
                 client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
             });
             thread.Start();
+            Debug.LogToFile("INFO Started installer download.");
         }
 
         void client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
@@ -383,6 +394,7 @@ namespace EnvyUpdate
                     showSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_download_success, Properties.Resources.info_download_success_title);
                     buttonDownload.Visibility = Visibility.Collapsed;
                     buttonInstall.Visibility = Visibility.Visible;
+                    Debug.LogToFile("INFO Download successful.");
                 }));
                 if (File.Exists(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe")))
                     File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe"));
@@ -393,6 +405,7 @@ namespace EnvyUpdate
                 File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
                 Application.Current.Dispatcher.Invoke(new Action(() => {
                     showSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_download_error, Properties.Resources.info_download_error_title);
+                    Debug.LogToFile("INFO Download NOT successful. Error: " + e.Error.ToString());
                 }));
             }
         }

From 15202c9dfd09d1ed2e6b1558054f79f2902b58ab Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 14:37:36 +0200
Subject: [PATCH 25/69] add automatic driver installing

---
 EnvyUpdate/DashboardPage.xaml.cs            | 75 ++++++++++++++++++---
 EnvyUpdate/EnvyUpdate.csproj                |  6 +-
 EnvyUpdate/GlobalVars.cs                    |  1 +
 EnvyUpdate/Properties/Licenses.Designer.cs  | 15 +++++
 EnvyUpdate/Properties/Licenses.resx         | 11 +++
 EnvyUpdate/Properties/Resources.Designer.cs | 63 +++++++++++++++++
 EnvyUpdate/Properties/Resources.de.resx     | 21 ++++++
 EnvyUpdate/Properties/Resources.resx        | 21 ++++++
 EnvyUpdate/SettingsPage.xaml                |  3 +
 EnvyUpdate/SettingsPage.xaml.cs             |  1 +
 EnvyUpdate/Util.cs                          | 74 ++++++++++++++++++--
 README.md                                   |  1 +
 README.md.backup                            | 55 +++++++++++++++
 13 files changed, 331 insertions(+), 16 deletions(-)
 create mode 100644 README.md.backup

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 5501dbd..2eadc5a 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -8,7 +8,6 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows;
 using System.Windows.Threading;
-using Wpf.Ui.Controls;
 using MessageBox = System.Windows.MessageBox;
 
 namespace EnvyUpdate
@@ -363,11 +362,13 @@ namespace EnvyUpdate
                 File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
             }
             Thread thread = new Thread(() => {
-                WebClient client = new WebClient();
-                client.Headers["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0";
-                client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
-                client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
-                client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+                using (WebClient client = new WebClient())
+                {
+                    client.Headers["User-Agent"] = GlobalVars.useragent;
+                    client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
+                    client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
+                    client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+                }
             });
             thread.Start();
             Debug.LogToFile("INFO Started installer download.");
@@ -391,7 +392,7 @@ namespace EnvyUpdate
             if (e.Error == null)
             {
                 Application.Current.Dispatcher.Invoke(new Action(() => {
-                    showSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_download_success, Properties.Resources.info_download_success_title);
+                    ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_download_success, Properties.Resources.info_download_success_title);
                     buttonDownload.Visibility = Visibility.Collapsed;
                     buttonInstall.Visibility = Visibility.Visible;
                     Debug.LogToFile("INFO Download successful.");
@@ -404,17 +405,73 @@ namespace EnvyUpdate
             {
                 File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
                 Application.Current.Dispatcher.Invoke(new Action(() => {
-                    showSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_download_error, Properties.Resources.info_download_error_title);
+                    ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_download_error, Properties.Resources.info_download_error_title);
                     Debug.LogToFile("INFO Download NOT successful. Error: " + e.Error.ToString());
                 }));
             }
         }
         private void buttonInstall_Click(object sender, RoutedEventArgs e)
         {
+            string sevenZipPath = Util.GetSevenZip();
 
+            ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Info, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_extracting, Properties.Resources.info_extracting_title);
+
+            string filePath = Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe");
+            string destinationDir = Path.Combine(GlobalVars.exedirectory, onlineDriv + "-extracted");
+
+            if (!Directory.Exists(destinationDir))
+                Directory.CreateDirectory(destinationDir);
+
+            Process process = new Process();
+            ProcessStartInfo startInfo = new ProcessStartInfo
+            {
+                WindowStyle = ProcessWindowStyle.Minimized,
+                WorkingDirectory = destinationDir,
+                FileName = sevenZipPath,
+                Arguments = "x -aoa -y " + filePath + " Display.Driver Display.Nview Display.Optimus HDAudio MSVCR NVI2 NVPCF PhysX PPC ShieldWirelessController EULA.txt ListDevices.txt setup.cfg setup.exe"
+            };
+            process.EnableRaisingEvents = true;
+            process.StartInfo = startInfo;
+            process.Exited += new EventHandler(ExtractionFinished);
+            process.Start();
         }
 
-        private void showSnackbar (Wpf.Ui.Common.ControlAppearance appearance, Wpf.Ui.Common.SymbolRegular icon, string message = "", string title = "")
+        private void ExtractionFinished(object sender, EventArgs e)
+        {
+            string extractedPath = Path.Combine(GlobalVars.exedirectory, onlineDriv + "-extracted");
+            Application.Current.Dispatcher.Invoke(new Action(() => {
+                ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_extract_complete, Properties.Resources.info_extract_complete_title);
+            }));
+            
+            File.Delete(Path.Combine(GlobalVars.exedirectory, "7zr.exe"));
+
+            Util.CleanInstallConfig(Path.Combine(extractedPath, "setup.cfg"));
+
+            Process process = new Process();
+            ProcessStartInfo startInfo = new ProcessStartInfo
+            {
+                WindowStyle = ProcessWindowStyle.Normal,
+                WorkingDirectory = extractedPath,
+                FileName = "setup.exe",
+                Arguments = "-passive -noreboot -noeula"
+            };
+            process.EnableRaisingEvents = true;
+            process.StartInfo = startInfo;
+            process.Exited += new EventHandler(InstallFinished);
+            process.Start();
+        }
+
+        private void InstallFinished(object sender, EventArgs e)
+        {
+            Application.Current.Dispatcher.Invoke(new Action(() => {
+                ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_install_complete, Properties.Resources.info_install_complete_title);
+            }));
+
+            File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe"));
+            Directory.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-extracted"), true);
+        }
+
+        private void ShowSnackbar(Wpf.Ui.Common.ControlAppearance appearance, Wpf.Ui.Common.SymbolRegular icon, string message = "", string title = "")
         {
             snackbarInfo.Appearance = appearance;
             snackbarInfo.Icon = icon;
diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj
index 29dd347..894b162 100644
--- a/EnvyUpdate/EnvyUpdate.csproj
+++ b/EnvyUpdate/EnvyUpdate.csproj
@@ -240,7 +240,7 @@
       <Version>4.1.0</Version>
     </PackageReference>
     <PackageReference Include="Fody">
-      <Version>6.6.4</Version>
+      <Version>6.8.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -251,10 +251,10 @@
       <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Json">
-      <Version>7.0.1</Version>
+      <Version>7.0.3</Version>
     </PackageReference>
     <PackageReference Include="WPF-UI">
-      <Version>2.0.3</Version>
+      <Version>2.1.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs
index 249bb54..e9d8b9b 100644
--- a/EnvyUpdate/GlobalVars.cs
+++ b/EnvyUpdate/GlobalVars.cs
@@ -12,5 +12,6 @@ namespace EnvyUpdate
         public static readonly string appdata = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\envyupdate\\";
         public static readonly string startup = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
         public static bool monitoringInstall = false;
+        public static readonly string useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0";
     }
 }
diff --git a/EnvyUpdate/Properties/Licenses.Designer.cs b/EnvyUpdate/Properties/Licenses.Designer.cs
index 5c0056d..4acc90b 100644
--- a/EnvyUpdate/Properties/Licenses.Designer.cs
+++ b/EnvyUpdate/Properties/Licenses.Designer.cs
@@ -120,6 +120,21 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to MIT License
+        ///
+        ///Copyright (c) 2017 Alexander Selishchev
+        ///
+        ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+        ///
+        ///The above copyrigh [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string SevenZipExtractor {
+            get {
+                return ResourceManager.GetString("SevenZipExtractor", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to # Windows Community Toolkit
         ///
diff --git a/EnvyUpdate/Properties/Licenses.resx b/EnvyUpdate/Properties/Licenses.resx
index 6ebf13d..be5631f 100644
--- a/EnvyUpdate/Properties/Licenses.resx
+++ b/EnvyUpdate/Properties/Licenses.resx
@@ -159,6 +159,17 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
+  </data>
+  <data name="SevenZipExtractor" xml:space="preserve">
+    <value>MIT License
+
+Copyright (c) 2017 Alexander Selishchev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
   </data>
   <data name="WindowsCommunityToolkit" xml:space="preserve">
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index 6cac9c1..727d269 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -69,6 +69,15 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to An error occurred attempting to install the new version. Please enable logging in the settings and report the issue on GitHub!.
+        /// </summary>
+        public static string error_installing {
+            get {
+                return ResourceManager.GetString("error_installing", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Exit EnvyUpdate?.
         /// </summary>
@@ -114,6 +123,60 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The driver files have finished extracting..
+        /// </summary>
+        public static string info_extract_complete {
+            get {
+                return ResourceManager.GetString("info_extract_complete", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Extraction complete.
+        /// </summary>
+        public static string info_extract_complete_title {
+            get {
+                return ResourceManager.GetString("info_extract_complete_title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The driver files are being extracted. This could take a few minutes..
+        /// </summary>
+        public static string info_extracting {
+            get {
+                return ResourceManager.GetString("info_extracting", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Extracting driver files.
+        /// </summary>
+        public static string info_extracting_title {
+            get {
+                return ResourceManager.GetString("info_extracting_title", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The installation of the new driver version was completed..
+        /// </summary>
+        public static string info_install_complete {
+            get {
+                return ResourceManager.GetString("info_install_complete", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Update finished.
+        /// </summary>
+        public static string info_install_complete_title {
+            get {
+                return ResourceManager.GetString("info_install_complete_title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Preference reset..
         /// </summary>
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index 7758b15..6a71fa2 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -120,6 +120,9 @@
   <data name="app_description" xml:space="preserve">
     <value>NVIDIA Aktualisierungsanwendung.</value>
   </data>
+  <data name="error_installing" xml:space="preserve">
+    <value>Ein Fehler ist bei der Installation aufgetreten. Bitte aktivieren Sie den Log und melden Sie den Fehler auf GitHub!</value>
+  </data>
   <data name="exit_confirm" xml:space="preserve">
     <value>EnvyUpdate schließen?</value>
   </data>
@@ -135,6 +138,24 @@
   <data name="info_download_success_title" xml:space="preserve">
     <value>Herunterladen erfolgreich abgeschlossen</value>
   </data>
+  <data name="info_extracting" xml:space="preserve">
+    <value>Die Treiberdateien werden nun extrahiert. Dies könnte einige Minuten dauern.</value>
+  </data>
+  <data name="info_extracting_title" xml:space="preserve">
+    <value>Dateien werden extrahiert</value>
+  </data>
+  <data name="info_extract_complete" xml:space="preserve">
+    <value>Die Treiberdateien wurden vollständig extrahiert.</value>
+  </data>
+  <data name="info_extract_complete_title" xml:space="preserve">
+    <value>Extrahierung abgeschlossen</value>
+  </data>
+  <data name="info_install_complete" xml:space="preserve">
+    <value>Die Installation der neuen Treiberversion wurde abgeschlossen.</value>
+  </data>
+  <data name="info_install_complete_title" xml:space="preserve">
+    <value>Update abgeschlossen</value>
+  </data>
   <data name="info_reset_caption" xml:space="preserve">
     <value>Einstellung zurückgesetzt.</value>
   </data>
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index 8667646..63c8453 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -120,6 +120,9 @@
   <data name="app_description" xml:space="preserve">
     <value>NVIDIA Updater Application.</value>
   </data>
+  <data name="error_installing" xml:space="preserve">
+    <value>An error occurred attempting to install the new version. Please enable logging in the settings and report the issue on GitHub!</value>
+  </data>
   <data name="exit_confirm" xml:space="preserve">
     <value>Exit EnvyUpdate?</value>
   </data>
@@ -135,6 +138,24 @@
   <data name="info_download_success_title" xml:space="preserve">
     <value>Download successful</value>
   </data>
+  <data name="info_extracting" xml:space="preserve">
+    <value>The driver files are being extracted. This could take a few minutes.</value>
+  </data>
+  <data name="info_extracting_title" xml:space="preserve">
+    <value>Extracting driver files</value>
+  </data>
+  <data name="info_extract_complete" xml:space="preserve">
+    <value>The driver files have finished extracting.</value>
+  </data>
+  <data name="info_extract_complete_title" xml:space="preserve">
+    <value>Extraction complete</value>
+  </data>
+  <data name="info_install_complete" xml:space="preserve">
+    <value>The installation of the new driver version was completed.</value>
+  </data>
+  <data name="info_install_complete_title" xml:space="preserve">
+    <value>Update finished</value>
+  </data>
   <data name="info_reset_caption" xml:space="preserve">
     <value>Preference reset.</value>
   </data>
diff --git a/EnvyUpdate/SettingsPage.xaml b/EnvyUpdate/SettingsPage.xaml
index b707a27..f01e838 100644
--- a/EnvyUpdate/SettingsPage.xaml
+++ b/EnvyUpdate/SettingsPage.xaml
@@ -49,6 +49,9 @@
                 <Expander Margin="0,4,0,0" Header="ResourceEmbedder">
                     <TextBox x:Name="textBoxLicResourceembedder" IsReadOnly="True" TextWrapping="Wrap"/>
                 </Expander>
+                <Expander Margin="0,4,0,0" Header="SevenZipExtractor">
+                    <TextBox x:Name="textBoxLic7z" IsReadOnly="True" TextWrapping="Wrap"/>
+                </Expander>
                 <Expander Margin="0,4,0,0" Header="Windows Community Toolkit">
                     <TextBox x:Name="textBoxLicWindowscommunitytoolkit" IsReadOnly="True" TextWrapping="Wrap"/>
                 </Expander>
diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index 28fe8b7..bede45d 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -28,6 +28,7 @@ namespace EnvyUpdate
             textBoxLicFody.Text = Properties.Licenses.Fody;
             textBoxLicCostura.Text = Properties.Licenses.CosturaFody;
             textBoxLicResourceembedder.Text = Properties.Licenses.ResourceEmbedder;
+            textBoxLic7z.Text = Properties.Licenses.SevenZipExtractor;
             textBoxLicWindowscommunitytoolkit.Text = Properties.Licenses.WindowsCommunityToolkit;
             textBoxLicWpfui.Text = Properties.Licenses.wpfui;
         }
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 2b03540..5c41283 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -1,5 +1,4 @@
-using EnvyUpdate.Properties;
-using IWshRuntimeLibrary;
+using IWshRuntimeLibrary;
 using Microsoft.Win32;
 using System;
 using System.Diagnostics;
@@ -8,9 +7,7 @@ using System.Linq;
 using System.Management;
 using System.Net;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
 using System.Xml.Linq;
 
 namespace EnvyUpdate
@@ -576,5 +573,74 @@ namespace EnvyUpdate
             directUrl = "https://us.download.nvidia.com" + directUrl;
             return directUrl;
         }
+
+        public static string GetSevenZip()
+        {
+            // Note: This download happens on the main thread. I believe spinning up a whole thread to 
+            //       download a single 600kb file is less efficient than just doing it on the main thread.
+            //       At 1Mbit/s, this download takes 5 seconds, in most cases internet should be faster than that.
+            string path = Path.Combine(GlobalVars.exedirectory, "7zr.exe");
+            using (WebClient client = new WebClient())
+            {
+                client.Headers["User-Agent"] = GlobalVars.useragent;
+                client.DownloadFile(new Uri("https://www.7-zip.org/a/7zr.exe"), path);
+            }
+
+            return path;
+        }
+
+        public static Process ExtractWithSevenZip(string sevenZipPath, string filePath, string destinationDir)
+        {
+            if (!Directory.Exists(destinationDir))
+                Directory.CreateDirectory(destinationDir);
+
+            Process process = new Process();
+            ProcessStartInfo startInfo = new ProcessStartInfo
+            {
+                WindowStyle = ProcessWindowStyle.Minimized,
+                WorkingDirectory = destinationDir,
+                FileName = sevenZipPath,
+                Arguments = "x -aoa -y " + filePath + " Display.Driver Display.Nview Display.Optimus HDAudio MSVCR NVI2 NVPCF PhysX PPC ShieldWirelessController EULA.txt ListDevices.txt setup.cfg setup.exe"
+            };
+            process.EnableRaisingEvents = true;
+            process.StartInfo = startInfo;
+            return process;
+        }
+
+        public static void CleanInstallConfig(string filePath)
+        {
+            if (!System.IO.File.Exists(filePath))
+            {
+                Debug.LogToFile("FATAL Driver installer config not found, terminating.");
+                MessageBox.Show(Properties.Resources.error_installing);
+                Environment.Exit(17);
+            }
+
+            Debug.LogToFile("INFO Removing GFE content from installer config.");
+
+            string outfile = filePath + ".out";
+
+            StreamReader sr = new StreamReader(filePath);
+            StreamWriter sw = new StreamWriter(outfile);
+            string line;
+
+            while ((line = sr.ReadLine()) != null)
+            {
+                if (new[] { "EulaHtmlFile", "FunctionalConsentFile", "PrivacyPolicyFile" }.Any(c => line.Contains(c)))
+                {
+                    continue;
+                }
+
+                sw.WriteLine(line);
+            }
+
+            sw.Close();
+            sr.Close();
+
+            System.IO.File.Delete(filePath);
+            System.IO.File.Move(outfile, filePath);
+
+            Debug.LogToFile("INFO Finished removing GFE content from installer config.");
+        }
     }
 }
diff --git a/README.md b/README.md
index 2b6a970..51ea1ea 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,7 @@ EnvyUpdate is not a replacement for any of these tools. I will still try to impl
 * Fody (dependency of Costura.Fody): [MIT](https://github.com/Fody/Fody/blob/master/License.txt)
 * Costura.Fody (for embedding DLLs into the main executable): [MIT](https://github.com/Fody/Costura/blob/develop/LICENSE)
 * Resource Embedder: [MIT](https://www.nuget.org/packages/Resource.Embedder/)
+* SevenZipExtractor: [MIT](https://github.com/adoconnection/SevenZipExtractor/blob/master/LICENSE)
 * Windows Community Toolkit: [MIT](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/License.md)
 * wpfui: [MIT](https://github.com/lepoco/wpfui/blob/main/LICENSE)
 * Icon made by Freepik from www.flaticon.com
diff --git a/README.md.backup b/README.md.backup
new file mode 100644
index 0000000..2b6a970
--- /dev/null
+++ b/README.md.backup
@@ -0,0 +1,55 @@
+![Logo](https://github.com/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
+
+# Important Information
+
+Nvidia has discontinued non-DCH drivers. This means only Windows 10 and Windows 11 can get the most recent driver versions. 
+
+If you are running Standard (non-DCH) drivers right now, EnvyUpdate will **NOT** display newer driver versions until you have manually updated to DCH drivers.
+
+# EnvyUpdate
+ A small portable update checker application for Nvidia GPUs
+ 
+ ![License](https://img.shields.io/github/license/fyr77/envyupdate?style=for-the-badge)
+ ![Issues](https://img.shields.io/github/issues/fyr77/envyupdate?style=for-the-badge)
+ ![Version](https://img.shields.io/github/v/release/fyr77/envyupdate?style=for-the-badge)
+ 
+## How to use
+
+Download the [latest release](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.exe) (or as a [.zip](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.zip)) and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed.
+
+The application itself does not update itself. If you notice any bugs or issues, be sure to check for a new version on GitHub!
+
+Enabling Autostart will create a shortcut of EnvyUpdate in the Windows startup folder.
+
+## Compatibility
+
+The application should be compatible with all Nvidia GeForce GPUs that have their drivers available on the nvidia.com download page and runs on Windows 10 and up.
+
+It is tested with GeForce Series GPUs. Generally others might work, but they are (currently) untested.
+
+## Development
+
+This application is currently maintained and developed by me (fyr77) alone in my free time. 
+
+I always try to implement critical fixes as fast as I can, but other features and minor bug fixes may take a few days or weeks to implement. 
+
+If you want to help me develop EnvyUpdate, you can start by creating issues with your bug reports and/or feature requests. Pull requests are also welcome, especially regarding translations.
+
+## Other interesting tools
+
+* [TinyNvidiaUpdateChecker](https://github.com/ElPumpo/TinyNvidiaUpdateChecker) - a command line update checker and installer. Inspired EnvyUpdate to begin with.
+* [nvidia-update](https://github.com/ZenitH-AT/nvidia-update) - a Powershell script to check for driver updates
+* [Disable-Nvidia-Telemetry](https://github.com/NateShoffner/Disable-Nvidia-Telemetry) - does pretty much what the name says. It disables Nvidia Telemetry.
+* [NVCleanInstall](https://www.techpowerup.com/nvcleanstall/) - a closed-source application by TechPowerUp which does quite a lot of cool things.
+
+EnvyUpdate is not a replacement for any of these tools. I will still try to implement as many features in EnvyUpdate as possible while keeping the simple interface and as little settings as possible.
+
+## Licenses
+
+* This project: [MIT](https://github.com/fyr77/EnvyUpdate/blob/master/LICENSE)
+* Fody (dependency of Costura.Fody): [MIT](https://github.com/Fody/Fody/blob/master/License.txt)
+* Costura.Fody (for embedding DLLs into the main executable): [MIT](https://github.com/Fody/Costura/blob/develop/LICENSE)
+* Resource Embedder: [MIT](https://www.nuget.org/packages/Resource.Embedder/)
+* Windows Community Toolkit: [MIT](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/License.md)
+* wpfui: [MIT](https://github.com/lepoco/wpfui/blob/main/LICENSE)
+* Icon made by Freepik from www.flaticon.com

From 3fb5799b00c6f3695248a66642963d755f16e875 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 15:13:37 +0200
Subject: [PATCH 26/69] add logging for new features

---
 EnvyUpdate/DashboardPage.xaml.cs | 9 ++++++++-
 EnvyUpdate/Util.cs               | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 2eadc5a..6e7cbb0 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -422,6 +422,8 @@ namespace EnvyUpdate
             if (!Directory.Exists(destinationDir))
                 Directory.CreateDirectory(destinationDir);
 
+            Debug.LogToFile("INFO Starting extraction of driver files.");
+
             Process process = new Process();
             ProcessStartInfo startInfo = new ProcessStartInfo
             {
@@ -442,11 +444,14 @@ namespace EnvyUpdate
             Application.Current.Dispatcher.Invoke(new Action(() => {
                 ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_extract_complete, Properties.Resources.info_extract_complete_title);
             }));
+            Debug.LogToFile("INFO Extraction exited, deleting 7-zip executable.");
             
             File.Delete(Path.Combine(GlobalVars.exedirectory, "7zr.exe"));
 
             Util.CleanInstallConfig(Path.Combine(extractedPath, "setup.cfg"));
 
+            Debug.LogToFile("Starting driver setup.");
+
             Process process = new Process();
             ProcessStartInfo startInfo = new ProcessStartInfo
             {
@@ -464,9 +469,11 @@ namespace EnvyUpdate
         private void InstallFinished(object sender, EventArgs e)
         {
             Application.Current.Dispatcher.Invoke(new Action(() => {
-                ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_install_complete, Properties.Resources.info_install_complete_title);
+                ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_install_complete, Properties.Resources.info_install_complete_title);
             }));
 
+            Debug.LogToFile("INFO Driver setup complete. Cleaning up setup files.");
+
             File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe"));
             Directory.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-extracted"), true);
         }
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 5c41283..b4216eb 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -586,6 +586,8 @@ namespace EnvyUpdate
                 client.DownloadFile(new Uri("https://www.7-zip.org/a/7zr.exe"), path);
             }
 
+            Debug.LogToFile("INFO Downloaded 7-zip.");
+
             return path;
         }
 

From 6233a5d88e282d789772a0f42a42ba463bf9213c Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 15:30:11 +0200
Subject: [PATCH 27/69] add support for system 7zip installations

---
 EnvyUpdate/DashboardPage.xaml.cs |  5 ++++
 EnvyUpdate/Util.cs               | 42 +++++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 6e7cbb0..0aa357f 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -383,6 +383,7 @@ namespace EnvyUpdate
                 progressbarDownload.Value = int.Parse(Math.Truncate(percentage).ToString());
             }));
         }
+
         void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
         {
             Application.Current.Dispatcher.Invoke(new Action(() => {
@@ -412,6 +413,7 @@ namespace EnvyUpdate
         }
         private void buttonInstall_Click(object sender, RoutedEventArgs e)
         {
+            buttonInstall.IsEnabled = false;
             string sevenZipPath = Util.GetSevenZip();
 
             ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Info, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_extracting, Properties.Resources.info_extracting_title);
@@ -470,6 +472,9 @@ namespace EnvyUpdate
         {
             Application.Current.Dispatcher.Invoke(new Action(() => {
                 ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_install_complete, Properties.Resources.info_install_complete_title);
+                buttonInstall.IsEnabled = true;
+                buttonInstall.Visibility = Visibility.Collapsed;
+                buttonDownload.Visibility = Visibility.Visible;
             }));
 
             Debug.LogToFile("INFO Driver setup complete. Cleaning up setup files.");
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index b4216eb..57fb82d 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -576,17 +576,21 @@ namespace EnvyUpdate
 
         public static string GetSevenZip()
         {
-            // Note: This download happens on the main thread. I believe spinning up a whole thread to 
-            //       download a single 600kb file is less efficient than just doing it on the main thread.
-            //       At 1Mbit/s, this download takes 5 seconds, in most cases internet should be faster than that.
-            string path = Path.Combine(GlobalVars.exedirectory, "7zr.exe");
-            using (WebClient client = new WebClient())
+            string path;
+            if (ExistsOnPath("7zg.exe"))
             {
-                client.Headers["User-Agent"] = GlobalVars.useragent;
-                client.DownloadFile(new Uri("https://www.7-zip.org/a/7zr.exe"), path);
+                path = "7zg.exe";
+            }
+            else
+            {
+                path = Path.Combine(GlobalVars.exedirectory, "7zr.exe");
+                using (WebClient client = new WebClient())
+                {
+                    client.Headers["User-Agent"] = GlobalVars.useragent;
+                    client.DownloadFile(new Uri("https://www.7-zip.org/a/7zr.exe"), path);
+                }
+                Debug.LogToFile("INFO Downloaded 7-zip.");
             }
-
-            Debug.LogToFile("INFO Downloaded 7-zip.");
 
             return path;
         }
@@ -644,5 +648,25 @@ namespace EnvyUpdate
 
             Debug.LogToFile("INFO Finished removing GFE content from installer config.");
         }
+
+        private static bool ExistsOnPath(string fileName)
+        {
+            return GetFullPath(fileName) != null;
+        }
+
+        private static string GetFullPath(string fileName)
+        {
+            if (System.IO.File.Exists(fileName))
+                return Path.GetFullPath(fileName);
+
+            var values = Environment.GetEnvironmentVariable("PATH");
+            foreach (var path in values.Split(Path.PathSeparator))
+            {
+                var fullPath = Path.Combine(path, fileName);
+                if (System.IO.File.Exists(fullPath))
+                    return fullPath;
+            }
+            return null;
+        }
     }
 }

From 0599e715b6b927b9250e704d41050ff8165c5bfe Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 15:40:10 +0200
Subject: [PATCH 28/69] update licenses and readme

---
 .gitignore                                 |  1 +
 EnvyUpdate/Properties/Licenses.Designer.cs | 28 +++++------
 EnvyUpdate/Properties/Licenses.resx        | 20 ++++----
 EnvyUpdate/SettingsPage.xaml               |  6 +--
 EnvyUpdate/SettingsPage.xaml.cs            |  2 +-
 README.md                                  |  8 +++-
 README.md.backup                           | 55 ----------------------
 7 files changed, 34 insertions(+), 86 deletions(-)
 delete mode 100644 README.md.backup

diff --git a/.gitignore b/.gitignore
index b248083..a6c2a92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -347,3 +347,4 @@ healthchecksdb
 
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
+
diff --git a/EnvyUpdate/Properties/Licenses.Designer.cs b/EnvyUpdate/Properties/Licenses.Designer.cs
index 4acc90b..ef7ff51 100644
--- a/EnvyUpdate/Properties/Licenses.Designer.cs
+++ b/EnvyUpdate/Properties/Licenses.Designer.cs
@@ -60,6 +60,19 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to GNU LGPL information
+        ///  --------------------
+        ///This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
+        ///
+        ///This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public [rest of string was truncated]&quot;;.
+        /// </summary>
+        internal static string _7zip {
+            get {
+                return ResourceManager.GetString("7zip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The MIT License
         ///
@@ -120,21 +133,6 @@ namespace EnvyUpdate.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to MIT License
-        ///
-        ///Copyright (c) 2017 Alexander Selishchev
-        ///
-        ///Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-        ///
-        ///The above copyrigh [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string SevenZipExtractor {
-            get {
-                return ResourceManager.GetString("SevenZipExtractor", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to # Windows Community Toolkit
         ///
diff --git a/EnvyUpdate/Properties/Licenses.resx b/EnvyUpdate/Properties/Licenses.resx
index be5631f..6fe2a2b 100644
--- a/EnvyUpdate/Properties/Licenses.resx
+++ b/EnvyUpdate/Properties/Licenses.resx
@@ -117,6 +117,15 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="7zip" xml:space="preserve">
+    <value>GNU LGPL information
+  --------------------
+This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+
+You can receive a copy of the GNU Lesser General Public License from http://www.gnu.org/</value>
+  </data>
   <data name="CosturaFody" xml:space="preserve">
     <value>The MIT License
 
@@ -159,17 +168,6 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
-  </data>
-  <data name="SevenZipExtractor" xml:space="preserve">
-    <value>MIT License
-
-Copyright (c) 2017 Alexander Selishchev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</value>
   </data>
   <data name="WindowsCommunityToolkit" xml:space="preserve">
diff --git a/EnvyUpdate/SettingsPage.xaml b/EnvyUpdate/SettingsPage.xaml
index f01e838..e04aa0a 100644
--- a/EnvyUpdate/SettingsPage.xaml
+++ b/EnvyUpdate/SettingsPage.xaml
@@ -49,15 +49,15 @@
                 <Expander Margin="0,4,0,0" Header="ResourceEmbedder">
                     <TextBox x:Name="textBoxLicResourceembedder" IsReadOnly="True" TextWrapping="Wrap"/>
                 </Expander>
-                <Expander Margin="0,4,0,0" Header="SevenZipExtractor">
-                    <TextBox x:Name="textBoxLic7z" IsReadOnly="True" TextWrapping="Wrap"/>
-                </Expander>
                 <Expander Margin="0,4,0,0" Header="Windows Community Toolkit">
                     <TextBox x:Name="textBoxLicWindowscommunitytoolkit" IsReadOnly="True" TextWrapping="Wrap"/>
                 </Expander>
                 <Expander Margin="0,4,0,0" Header="WPF-UI">
                     <TextBox x:Name="textBoxLicWpfui" IsReadOnly="True" TextWrapping="Wrap"/>
                 </Expander>
+                <Expander Margin="0,4,0,0" Header="WPF-UI">
+                    <TextBox x:Name="textBoxLic7zip" IsReadOnly="True" TextWrapping="Wrap"/>
+                </Expander>
             </StackPanel>
         </ScrollViewer>
     </Grid>
diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index bede45d..da4b482 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -28,9 +28,9 @@ namespace EnvyUpdate
             textBoxLicFody.Text = Properties.Licenses.Fody;
             textBoxLicCostura.Text = Properties.Licenses.CosturaFody;
             textBoxLicResourceembedder.Text = Properties.Licenses.ResourceEmbedder;
-            textBoxLic7z.Text = Properties.Licenses.SevenZipExtractor;
             textBoxLicWindowscommunitytoolkit.Text = Properties.Licenses.WindowsCommunityToolkit;
             textBoxLicWpfui.Text = Properties.Licenses.wpfui;
+            textBoxLic7zip.Text = Properties.Licenses._7zip;
         }
 
         private void CardWeb_Click(object sender, RoutedEventArgs e)
diff --git a/README.md b/README.md
index 51ea1ea..4aef543 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,12 @@ The application itself does not update itself. If you notice any bugs or issues,
 
 Enabling Autostart will create a shortcut of EnvyUpdate in the Windows startup folder.
 
+### Virus warnings
+
+Sometimes EnvyUpdate is flagged as a virus by Windows Defender or other antivirus software. This is a **false positive**, caused by EnvyUpdate reading a few values from the Windows registry and looking for files.
+
+For extracting the driver installer 7-Zip is downloaded if it cannot be found on the user's system. This may also trigger antivirus warnings, but is necessary for the automatic driver installation to work.
+
 ## Compatibility
 
 The application should be compatible with all Nvidia GeForce GPUs that have their drivers available on the nvidia.com download page and runs on Windows 10 and up.
@@ -50,7 +56,7 @@ EnvyUpdate is not a replacement for any of these tools. I will still try to impl
 * Fody (dependency of Costura.Fody): [MIT](https://github.com/Fody/Fody/blob/master/License.txt)
 * Costura.Fody (for embedding DLLs into the main executable): [MIT](https://github.com/Fody/Costura/blob/develop/LICENSE)
 * Resource Embedder: [MIT](https://www.nuget.org/packages/Resource.Embedder/)
-* SevenZipExtractor: [MIT](https://github.com/adoconnection/SevenZipExtractor/blob/master/LICENSE)
 * Windows Community Toolkit: [MIT](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/License.md)
 * wpfui: [MIT](https://github.com/lepoco/wpfui/blob/main/LICENSE)
+* 7-Zip R: [GNU LGPL](https://www.7-zip.org/license.txt)
 * Icon made by Freepik from www.flaticon.com
diff --git a/README.md.backup b/README.md.backup
deleted file mode 100644
index 2b6a970..0000000
--- a/README.md.backup
+++ /dev/null
@@ -1,55 +0,0 @@
-![Logo](https://github.com/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
-
-# Important Information
-
-Nvidia has discontinued non-DCH drivers. This means only Windows 10 and Windows 11 can get the most recent driver versions. 
-
-If you are running Standard (non-DCH) drivers right now, EnvyUpdate will **NOT** display newer driver versions until you have manually updated to DCH drivers.
-
-# EnvyUpdate
- A small portable update checker application for Nvidia GPUs
- 
- ![License](https://img.shields.io/github/license/fyr77/envyupdate?style=for-the-badge)
- ![Issues](https://img.shields.io/github/issues/fyr77/envyupdate?style=for-the-badge)
- ![Version](https://img.shields.io/github/v/release/fyr77/envyupdate?style=for-the-badge)
- 
-## How to use
-
-Download the [latest release](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.exe) (or as a [.zip](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.zip)) and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed.
-
-The application itself does not update itself. If you notice any bugs or issues, be sure to check for a new version on GitHub!
-
-Enabling Autostart will create a shortcut of EnvyUpdate in the Windows startup folder.
-
-## Compatibility
-
-The application should be compatible with all Nvidia GeForce GPUs that have their drivers available on the nvidia.com download page and runs on Windows 10 and up.
-
-It is tested with GeForce Series GPUs. Generally others might work, but they are (currently) untested.
-
-## Development
-
-This application is currently maintained and developed by me (fyr77) alone in my free time. 
-
-I always try to implement critical fixes as fast as I can, but other features and minor bug fixes may take a few days or weeks to implement. 
-
-If you want to help me develop EnvyUpdate, you can start by creating issues with your bug reports and/or feature requests. Pull requests are also welcome, especially regarding translations.
-
-## Other interesting tools
-
-* [TinyNvidiaUpdateChecker](https://github.com/ElPumpo/TinyNvidiaUpdateChecker) - a command line update checker and installer. Inspired EnvyUpdate to begin with.
-* [nvidia-update](https://github.com/ZenitH-AT/nvidia-update) - a Powershell script to check for driver updates
-* [Disable-Nvidia-Telemetry](https://github.com/NateShoffner/Disable-Nvidia-Telemetry) - does pretty much what the name says. It disables Nvidia Telemetry.
-* [NVCleanInstall](https://www.techpowerup.com/nvcleanstall/) - a closed-source application by TechPowerUp which does quite a lot of cool things.
-
-EnvyUpdate is not a replacement for any of these tools. I will still try to implement as many features in EnvyUpdate as possible while keeping the simple interface and as little settings as possible.
-
-## Licenses
-
-* This project: [MIT](https://github.com/fyr77/EnvyUpdate/blob/master/LICENSE)
-* Fody (dependency of Costura.Fody): [MIT](https://github.com/Fody/Fody/blob/master/License.txt)
-* Costura.Fody (for embedding DLLs into the main executable): [MIT](https://github.com/Fody/Costura/blob/develop/LICENSE)
-* Resource Embedder: [MIT](https://www.nuget.org/packages/Resource.Embedder/)
-* Windows Community Toolkit: [MIT](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/License.md)
-* wpfui: [MIT](https://github.com/lepoco/wpfui/blob/main/LICENSE)
-* Icon made by Freepik from www.flaticon.com

From 72a714e1f43568e2b22a35dad299ed35e0d7e320 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 15:40:31 +0200
Subject: [PATCH 29/69] add exclusion for md.backup

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index a6c2a92..87d5d82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -348,3 +348,5 @@ healthchecksdb
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
 
+# Markdown backups
+*.md.backup
\ No newline at end of file

From 3e2f389fc32b4b3ffade4b52d4ba8d69f41df96c Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 15:44:32 +0200
Subject: [PATCH 30/69] Remove DCH warning, force update to DCH

---
 EnvyUpdate/Util.cs | 7 +------
 README.md          | 6 ------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 57fb82d..2c7a895 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -421,12 +421,7 @@ namespace EnvyUpdate
         }
         public static int GetDTCID()
         {
-            int dtcid = 0;
-            if (IsDCH())
-            {
-                dtcid = 1;
-            }
-            return dtcid;
+            return 1; // Force update to DCH drivers
         }
 
         public static int GetDTID()
diff --git a/README.md b/README.md
index 4aef543..1172a2f 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,5 @@
 ![Logo](https://github.com/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
 
-# Important Information
-
-Nvidia has discontinued non-DCH drivers. This means only Windows 10 and Windows 11 can get the most recent driver versions. 
-
-If you are running Standard (non-DCH) drivers right now, EnvyUpdate will **NOT** display newer driver versions until you have manually updated to DCH drivers.
-
 # EnvyUpdate
  A small portable update checker application for Nvidia GPUs
  

From 70cef4a361c2b997d7153451c14658f775985278 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 16:10:12 +0200
Subject: [PATCH 31/69] cleanup code

---
 EnvyUpdate/DashboardPage.xaml    |  2 +-
 EnvyUpdate/DashboardPage.xaml.cs | 91 ++++++++++++--------------------
 2 files changed, 36 insertions(+), 57 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index dc9d964..2ea24ab 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -45,7 +45,7 @@
                 Message="..."
                 Severity="Informational" />
 
-                <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Secondary" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
+                <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Dark" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
             
                 <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" Click="buttonDownload_Click" />
                 <ui:Button x:Name="buttonInstall" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="AppsAddIn24" Visibility="Collapsed" Click="buttonInstall_Click" />
diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 0aa357f..973dd00 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -168,74 +168,53 @@ namespace EnvyUpdate
                 Debug.LogToFile("INFO Got online driver version: " + onlineDriv);
             }
 
+            string correctLocalDriv;
+            string correctOnlineDriv;
+
             try
             {
-                if (float.Parse(localDriv) < float.Parse(onlineDriv))
-                {
-                    Debug.LogToFile("INFO Local version is older than online. Setting UI...");
-                    SetInfoBar(false);
-                    buttonDownload.Visibility = Visibility.Visible;
-                    if (skippedVer == null)
-                    {
-                        buttonSkipVersion.ToolTip = Properties.Resources.ui_skipversion;
-                        buttonSkipVersion.IsEnabled = true;
-                        buttonSkipVersion.Visibility = Visibility.Visible;
-                    }
-                    else
-                    {
-                        buttonSkipVersion.IsEnabled = true;
-                        buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped;
-                    }
-
-                    Debug.LogToFile("INFO UI set.");
-
-                    if (skippedVer != onlineDriv)
-                    {
-                        Debug.LogToFile("INFO Showing update popup notification.");
-                        Notify.ShowDrivUpdatePopup();
-                    }
-                }
-                else
-                {
-                    Debug.LogToFile("INFO Local version is up to date.");
-                    buttonSkipVersion.Visibility = Visibility.Collapsed;
-                    SetInfoBar(true);
-                }
+                float.Parse(onlineDriv);
+                correctLocalDriv = localDriv;
+                correctOnlineDriv = onlineDriv;
             }
             catch (FormatException)
             {
                 Debug.LogToFile("INFO Caught FormatException, assuming locale workaround is necessary.");
                 //Thank you locales. Some languages need , instead of . for proper parsing
-                string cLocalDriv = localDriv.Replace('.', ',');
-                string cOnlineDriv = onlineDriv.Replace('.', ',');
-                if (float.Parse(cLocalDriv) < float.Parse(cOnlineDriv))
+                correctLocalDriv = localDriv.Replace('.', ',');
+                correctOnlineDriv = onlineDriv.Replace('.', ',');
+            }
+
+            if (float.Parse(correctLocalDriv) < float.Parse(correctOnlineDriv))
+            {
+                Debug.LogToFile("INFO Local version is older than online. Setting UI...");
+                SetInfoBar(false);
+                buttonDownload.Visibility = Visibility.Visible;
+                buttonSkipVersion.Visibility = Visibility.Visible;
+                if (skippedVer == null)
                 {
-                    Debug.LogToFile("INFO Local version is older than online. Setting UI...");
-                    SetInfoBar(false);
-                    buttonDownload.Visibility = Visibility.Visible;
-                    if (skippedVer == null)
-                    {
-                        buttonSkipVersion.IsEnabled = true;
-                        buttonSkipVersion.Visibility = Visibility.Visible;
-                    }
-                    else
-                    {
-                        buttonSkipVersion.IsEnabled = false;
-                        buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped;
-                    }
-                        
-                    if (skippedVer != onlineDriv)
-                    {
-                        Debug.LogToFile("INFO Showing update popup notification.");
-                        Notify.ShowDrivUpdatePopup();
-                    }
+                    buttonSkipVersion.ToolTip = Properties.Resources.ui_skipversion;
+                    buttonSkipVersion.IsEnabled = true;
                 }
                 else
                 {
-                    Debug.LogToFile("INFO Local version is up to date.");
-                    buttonSkipVersion.Visibility = Visibility.Collapsed;
-                    SetInfoBar(true);
+                    buttonSkipVersion.IsEnabled = false;
+                    buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped;
                 }
+
+                Debug.LogToFile("INFO UI set.");
+
+                if (skippedVer != onlineDriv)
+                {
+                    Debug.LogToFile("INFO Showing update popup notification.");
+                    Notify.ShowDrivUpdatePopup();
+                }
+            }
+            else
+            {
+                Debug.LogToFile("INFO Local version is up to date.");
+                buttonSkipVersion.Visibility = Visibility.Collapsed;
+                SetInfoBar(true);
             }
 
             //Check for different version than skipped version

From 5234ee06e070f1deaeb34c86360a62b2d7f70260 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 17:09:21 +0200
Subject: [PATCH 32/69] fix dark theme again

---
 EnvyUpdate/App.xaml.cs        | 11 -----------
 EnvyUpdate/MainWindow.xaml.cs | 13 +++++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/EnvyUpdate/App.xaml.cs b/EnvyUpdate/App.xaml.cs
index 2d0e158..185bc1d 100644
--- a/EnvyUpdate/App.xaml.cs
+++ b/EnvyUpdate/App.xaml.cs
@@ -19,17 +19,6 @@ namespace EnvyUpdate
     {
         protected override void OnStartup(StartupEventArgs e)
         {
-            // Remove placeholder light theme and apply system app theme
-            Wpf.Ui.Appearance.Accent.ApplySystemAccent();
-            Application.Current.Resources.MergedDictionaries.RemoveAt(0);
-            ThemesDictionary themedict = new ThemesDictionary();
-            if (Util.IsDarkTheme())
-                themedict.Theme = Wpf.Ui.Appearance.ThemeType.Dark;
-            else
-                themedict.Theme = Wpf.Ui.Appearance.ThemeType.Light;
-            Application.Current.Resources.MergedDictionaries.Add(themedict);
-            // TODO: Watch for theme changes and dynamically update
-
             // Listen to notification activation
             ToastNotificationManagerCompat.OnActivated += ToastNotificationManagerCompat_OnActivated;
         }
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index f7729a4..7f95351 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using Microsoft.Toolkit.Uwp.Notifications;
+using Microsoft.Win32;
 using System;
 using System.IO;
 using System.Linq;
@@ -54,6 +55,10 @@ namespace EnvyUpdate
                 Environment.Exit(1);
             }
 
+            // Check dark theme
+            AdjustTheme();
+            SystemEvents.UserPreferenceChanged += AdjustTheme;
+
             // Delete installed legacy versions, required for people upgrading from very old versions.
             if (Directory.Exists(GlobalVars.appdata))
             {
@@ -114,5 +119,13 @@ namespace EnvyUpdate
                 RootNavigation.Navigate(0);
             }
         }
+
+        private void AdjustTheme(object sender = null, UserPreferenceChangedEventArgs e = null)
+        {
+            if (Util.IsDarkTheme())
+                Wpf.Ui.Appearance.Theme.Apply(Wpf.Ui.Appearance.ThemeType.Dark, Wpf.Ui.Appearance.BackgroundType.Mica);
+            else
+                Wpf.Ui.Appearance.Theme.Apply(Wpf.Ui.Appearance.ThemeType.Light, Wpf.Ui.Appearance.BackgroundType.Mica);
+        }
     }
 }
\ No newline at end of file

From 02e92e782f14ea6a9bd54a1355c37f4deda08d83 Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Tue, 29 Aug 2023 20:17:26 +0200
Subject: [PATCH 33/69] fix typo

---
 EnvyUpdate/Util.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 2c7a895..63b3a16 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -299,9 +299,9 @@ namespace EnvyUpdate
             {
                 // This means we are running Windows 10.
                 if (Environment.Is64BitOperatingSystem)
-                    value = 56;
-                else
                     value = 57;
+                else
+                    value = 56;
             }
             else
             {

From a601b8937c57918200a4531f9a6a60504e6ff51a Mon Sep 17 00:00:00 2001
From: Jakob <gh@notjakob.com>
Date: Thu, 31 Aug 2023 09:15:57 +0200
Subject: [PATCH 34/69] remove workaround from old wpfui

---
 EnvyUpdate/MainWindow.xaml    |  2 +-
 EnvyUpdate/MainWindow.xaml.cs | 14 --------------
 EnvyUpdate/SettingsPage.xaml  |  2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/EnvyUpdate/MainWindow.xaml b/EnvyUpdate/MainWindow.xaml
index f12d454..c5a545b 100644
--- a/EnvyUpdate/MainWindow.xaml
+++ b/EnvyUpdate/MainWindow.xaml
@@ -11,7 +11,7 @@
     ExtendsContentIntoTitleBar="True"
     WindowBackdropType="Mica"
     
-    Title="EnvyUpdate" MinHeight="500" Height="500" MinWidth="600" Width="600" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" Activated="UiWindow_Activated" WindowStyle="None">
+    Title="EnvyUpdate" MinHeight="500" Height="500" MinWidth="600" Width="600" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" WindowStyle="None">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 7f95351..5d01b89 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -106,20 +106,6 @@ namespace EnvyUpdate
             Application.Current.Shutdown();
         }
 
-        private void UiWindow_Activated(object sender, EventArgs e)
-        {
-            // This is a workaround for a bug (?) in the UI library, which causes the nav to not load the first item on startup.
-            // Without this, the nav attempts to navigate before the window is shown, which doesn't work.
-            try
-            {
-                var test = RootNavigation.Current.PageType;
-            }
-            catch (NullReferenceException)
-            {
-                RootNavigation.Navigate(0);
-            }
-        }
-
         private void AdjustTheme(object sender = null, UserPreferenceChangedEventArgs e = null)
         {
             if (Util.IsDarkTheme())
diff --git a/EnvyUpdate/SettingsPage.xaml b/EnvyUpdate/SettingsPage.xaml
index e04aa0a..527bd97 100644
--- a/EnvyUpdate/SettingsPage.xaml
+++ b/EnvyUpdate/SettingsPage.xaml
@@ -55,7 +55,7 @@
                 <Expander Margin="0,4,0,0" Header="WPF-UI">
                     <TextBox x:Name="textBoxLicWpfui" IsReadOnly="True" TextWrapping="Wrap"/>
                 </Expander>
-                <Expander Margin="0,4,0,0" Header="WPF-UI">
+                <Expander Margin="0,4,0,0" Header="7-Zip">
                     <TextBox x:Name="textBoxLic7zip" IsReadOnly="True" TextWrapping="Wrap"/>
                 </Expander>
             </StackPanel>

From aa7aeff1f87585f4c7c6936bbefafff977aa4e10 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 25 Sep 2023 20:26:35 +0200
Subject: [PATCH 35/69] fix tray icon

---
 EnvyUpdate/DashboardPage.xaml.cs | 3 +++
 EnvyUpdate/EnvyUpdate.csproj     | 3 +++
 EnvyUpdate/GlobalVars.cs         | 1 +
 EnvyUpdate/MainWindow.xaml.cs    | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 973dd00..5148583 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -26,6 +26,9 @@ namespace EnvyUpdate
         {
             InitializeComponent();
 
+            if (GlobalVars.startMinimized)
+                Application.Current.MainWindow.Hide(); // Hide only AFTER initializing dashboard page, otherwise tray icon doesn't work
+
             if (Debug.isFake)
                 localDriv = Debug.LocalDriv();
             else
diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj
index 894b162..1c1dfd4 100644
--- a/EnvyUpdate/EnvyUpdate.csproj
+++ b/EnvyUpdate/EnvyUpdate.csproj
@@ -244,6 +244,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf">
+      <Version>1.1.0</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
       <Version>7.1.3</Version>
     </PackageReference>
diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs
index e9d8b9b..9b5b943 100644
--- a/EnvyUpdate/GlobalVars.cs
+++ b/EnvyUpdate/GlobalVars.cs
@@ -12,6 +12,7 @@ namespace EnvyUpdate
         public static readonly string appdata = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\envyupdate\\";
         public static readonly string startup = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
         public static bool monitoringInstall = false;
+        public static bool startMinimized = false;
         public static readonly string useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0";
     }
 }
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 5d01b89..c9b0119 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -84,7 +84,7 @@ namespace EnvyUpdate
             {
                 Debug.LogToFile("INFO Launching minimized.");
                 WindowState = WindowState.Minimized;
-                Hide();
+                GlobalVars.startMinimized = true;
             }
 
             GlobalVars.isMobile = Util.IsMobile();

From 8ec0b678969f9b9aa37116b59591b20d81aed1f5 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 25 Sep 2023 20:27:44 +0200
Subject: [PATCH 36/69] remove unnecessary nuget package

---
 EnvyUpdate/EnvyUpdate.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj
index 1c1dfd4..894b162 100644
--- a/EnvyUpdate/EnvyUpdate.csproj
+++ b/EnvyUpdate/EnvyUpdate.csproj
@@ -244,9 +244,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Hardcodet.NotifyIcon.Wpf">
-      <Version>1.1.0</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
       <Version>7.1.3</Version>
     </PackageReference>

From 868a13139d268b32f4ca660d4ec34b79b51a3529 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 25 Sep 2023 21:53:21 +0200
Subject: [PATCH 37/69] fix watcher, fix tray click

---
 EnvyUpdate/DashboardPage.xaml.cs | 24 ++++++++++++++++++------
 EnvyUpdate/GlobalVars.cs         |  1 +
 EnvyUpdate/MainWindow.xaml       |  5 +++--
 EnvyUpdate/MainWindow.xaml.cs    |  5 +++++
 EnvyUpdate/Util.cs               |  1 +
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 5148583..a676e4d 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -21,6 +21,7 @@ namespace EnvyUpdate
         private string onlineDriv = null;
         private string gpuURL = null;
         private string skippedVer = null;
+        private DateTime lastFileChanged = DateTime.MinValue;
 
         public DashboardPage()
         {
@@ -302,13 +303,17 @@ namespace EnvyUpdate
 
         void DriverFileChanged(object sender, FileSystemEventArgs e)
         {
-            Debug.LogToFile("INFO Watched driver file changed! Reloading data.");
-            System.Threading.Thread.Sleep(10000);
-            Application.Current.Dispatcher.Invoke(delegate
+            if (!GlobalVars.isInstalling && (DateTime.UtcNow.Subtract(lastFileChanged).TotalMinutes > 1))
             {
-                UpdateLocalVer();
-                Load();
-            });
+                Debug.LogToFile("INFO Watched driver file changed! Reloading data.");
+                System.Threading.Thread.Sleep(10000);
+                lastFileChanged = DateTime.UtcNow;
+                Application.Current.Dispatcher.Invoke(delegate
+                {
+                    UpdateLocalVer();
+                    Load();
+                });
+            }
         }
 
         private void CardOnline_Click(object sender, RoutedEventArgs e)
@@ -396,6 +401,7 @@ namespace EnvyUpdate
         private void buttonInstall_Click(object sender, RoutedEventArgs e)
         {
             buttonInstall.IsEnabled = false;
+            GlobalVars.isInstalling = true;
             string sevenZipPath = Util.GetSevenZip();
 
             ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Info, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_extracting, Properties.Resources.info_extracting_title);
@@ -463,6 +469,12 @@ namespace EnvyUpdate
 
             File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe"));
             Directory.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-extracted"), true);
+            GlobalVars.isInstalling = false;
+            Application.Current.Dispatcher.Invoke(delegate
+            {
+                UpdateLocalVer();
+                Load();
+            });
         }
 
         private void ShowSnackbar(Wpf.Ui.Common.ControlAppearance appearance, Wpf.Ui.Common.SymbolRegular icon, string message = "", string title = "")
diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs
index 9b5b943..e9dfd32 100644
--- a/EnvyUpdate/GlobalVars.cs
+++ b/EnvyUpdate/GlobalVars.cs
@@ -13,6 +13,7 @@ namespace EnvyUpdate
         public static readonly string startup = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
         public static bool monitoringInstall = false;
         public static bool startMinimized = false;
+        public static bool isInstalling = false;
         public static readonly string useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0";
     }
 }
diff --git a/EnvyUpdate/MainWindow.xaml b/EnvyUpdate/MainWindow.xaml
index c5a545b..af4f6a7 100644
--- a/EnvyUpdate/MainWindow.xaml
+++ b/EnvyUpdate/MainWindow.xaml
@@ -25,10 +25,11 @@
             Icon="/icon.ico">
             <ui:TitleBar.Tray>
                 <ui:NotifyIcon
-                    FocusOnLeftClick="True"
+                    LeftClick="NotifyIcon_LeftClick"
                     Icon="/icon.ico"
                     MenuOnRightClick="False"
-                    TooltipText="EnvyUpdate"></ui:NotifyIcon>
+                    TooltipText="EnvyUpdate">
+                </ui:NotifyIcon>
             </ui:TitleBar.Tray>
         </ui:TitleBar>
         <Grid Grid.Row="1">
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index c9b0119..44b8a6d 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -113,5 +113,10 @@ namespace EnvyUpdate
             else
                 Wpf.Ui.Appearance.Theme.Apply(Wpf.Ui.Appearance.ThemeType.Light, Wpf.Ui.Appearance.BackgroundType.Mica);
         }
+
+        private void NotifyIcon_LeftClick(Wpf.Ui.Controls.NotifyIcon sender, RoutedEventArgs e)
+        {
+            Util.ShowMain();
+        }
     }
 }
\ No newline at end of file
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index 63b3a16..ced5548 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -122,6 +122,7 @@ namespace EnvyUpdate
         {
             Application.Current.MainWindow.Show();
             Application.Current.MainWindow.WindowState = WindowState.Normal;
+            Application.Current.MainWindow.Activate();
         }
 
         /// <summary>

From 624801ceec001c195b54d60c05de2e8b9cc999f4 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 25 Sep 2023 22:05:26 +0200
Subject: [PATCH 38/69] update costura

---
 EnvyUpdate/EnvyUpdate.csproj |  4 ++--
 EnvyUpdate/FodyWeavers.xsd   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj
index 894b162..8f1ae19 100644
--- a/EnvyUpdate/EnvyUpdate.csproj
+++ b/EnvyUpdate/EnvyUpdate.csproj
@@ -236,8 +236,8 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Costura.Fody" PrivateAssets="All">
-      <Version>4.1.0</Version>
+    <PackageReference Include="Costura.Fody" PrivateAssets="all">
+      <Version>5.7.0</Version>
     </PackageReference>
     <PackageReference Include="Fody">
       <Version>6.8.0</Version>
diff --git a/EnvyUpdate/FodyWeavers.xsd b/EnvyUpdate/FodyWeavers.xsd
index 44a5374..05e92c1 100644
--- a/EnvyUpdate/FodyWeavers.xsd
+++ b/EnvyUpdate/FodyWeavers.xsd
@@ -17,6 +17,16 @@
                   <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
                 </xs:annotation>
               </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
                 <xs:annotation>
                   <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
@@ -43,6 +53,16 @@
                 <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="DisableCompression" type="xs:boolean">
               <xs:annotation>
                 <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@@ -73,6 +93,16 @@
                 <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
               <xs:annotation>
                 <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>

From e8af34b79cfc02c14e0eb6e5c8d6fee52e1dbfdc Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 25 Sep 2023 22:17:45 +0200
Subject: [PATCH 39/69] add x64

---
 EnvyUpdate.sln               |  9 +++++++++
 EnvyUpdate/EnvyUpdate.csproj | 31 +++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/EnvyUpdate.sln b/EnvyUpdate.sln
index d7abf71..d029e8c 100644
--- a/EnvyUpdate.sln
+++ b/EnvyUpdate.sln
@@ -8,23 +8,32 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug - ignoregpu|Any CPU = Debug - ignoregpu|Any CPU
+		Debug - ignoregpu|x64 = Debug - ignoregpu|x64
 		Debug - ignoregpu|x86 = Debug - ignoregpu|x86
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|Any CPU.ActiveCfg = Debug - ignoregpu|Any CPU
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|Any CPU.Build.0 = Debug - ignoregpu|Any CPU
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|x64.ActiveCfg = Debug - ignoregpu|x64
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|x64.Build.0 = Debug - ignoregpu|x64
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|x86.ActiveCfg = Debug - ignoregpu|x86
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug - ignoregpu|x86.Build.0 = Debug - ignoregpu|x86
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|x64.ActiveCfg = Debug|x64
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|x64.Build.0 = Debug|x64
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|x86.ActiveCfg = Debug|x86
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Debug|x86.Build.0 = Debug|x86
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|x64.ActiveCfg = Release|x64
+		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|x64.Build.0 = Release|x64
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|x86.ActiveCfg = Release|x86
 		{1BF2468D-9579-462D-9153-4836E9C8721F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj
index 8f1ae19..4dd0c93 100644
--- a/EnvyUpdate/EnvyUpdate.csproj
+++ b/EnvyUpdate/EnvyUpdate.csproj
@@ -103,6 +103,37 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug - ignoregpu|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug - ignoregpu\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />

From 02984e0d2b24e9fc30f9e390472506c67c240f14 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Thu, 28 Sep 2023 22:46:19 +0200
Subject: [PATCH 40/69] bump version, add button labels

---
 EnvyUpdate/DashboardPage.xaml               | 6 +++---
 EnvyUpdate/Properties/AssemblyInfo.cs       | 4 ++--
 EnvyUpdate/Properties/Resources.Designer.cs | 9 +++++++++
 EnvyUpdate/Properties/Resources.de.resx     | 3 +++
 EnvyUpdate/Properties/Resources.resx        | 3 +++
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index 2ea24ab..101d135 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -46,9 +46,9 @@
                 Severity="Informational" />
 
                 <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Dark" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
-            
-                <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="ArrowDownload24" Visibility="Collapsed" Click="buttonDownload_Click" />
-                <ui:Button x:Name="buttonInstall" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Icon="AppsAddIn24" Visibility="Collapsed" Click="buttonInstall_Click" />
+
+                <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Content="{x:Static p:Resources.ui_download}" Icon="ArrowDownload24" Visibility="Visible" Click="buttonDownload_Click" />
+                <ui:Button x:Name="buttonInstall" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Content="{x:Static p:Resources.ui_install}" Icon="AppsAddIn24" Visibility="Collapsed" Click="buttonInstall_Click" />
             </Grid>
 
             <ProgressBar x:Name="progressbarDownload" Grid.Row="2" Value="0" Visibility="Collapsed"/>
diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index 15d4b57..09110e5 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0")]
-[assembly: AssemblyFileVersion("3.0")]
+[assembly: AssemblyVersion("3.1")]
+[assembly: AssemblyFileVersion("3.1")]
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index 727d269..a22ae7c 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -249,6 +249,15 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Download.
+        /// </summary>
+        public static string ui_download {
+            get {
+                return ResourceManager.GetString("ui_download", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enable logging to file.
         /// </summary>
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index 6a71fa2..cb58d0d 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -180,6 +180,9 @@
   <data name="ui_autostart" xml:space="preserve">
     <value>Beim Start von Windows ausführen</value>
   </data>
+  <data name="ui_download" xml:space="preserve">
+    <value>Herunterladen</value>
+  </data>
   <data name="ui_enable_logging" xml:space="preserve">
     <value>Programm-Log in Datei schreiben</value>
   </data>
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index 63c8453..f9f99e7 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -180,6 +180,9 @@
   <data name="ui_autostart" xml:space="preserve">
     <value>Run at Windows startup</value>
   </data>
+  <data name="ui_download" xml:space="preserve">
+    <value>Download</value>
+  </data>
   <data name="ui_enable_logging" xml:space="preserve">
     <value>Enable logging to file</value>
   </data>

From 3db1a2a2e4baa776ab40e0a83eb67d2e894eb329 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Thu, 28 Sep 2023 22:48:11 +0200
Subject: [PATCH 41/69] typo

---
 EnvyUpdate/DashboardPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index 101d135..3761bf6 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -47,7 +47,7 @@
 
                 <ui:Button x:Name="buttonSkipVersion" Margin="8,0,0,0" Grid.Column="1" Appearance="Dark" Icon="ArrowForward24" Visibility="Collapsed" ToolTip="{x:Static p:Resources.ui_skipversion}" Click="buttonSkipVersion_Click" />
 
-                <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Content="{x:Static p:Resources.ui_download}" Icon="ArrowDownload24" Visibility="Visible" Click="buttonDownload_Click" />
+                <ui:Button x:Name="buttonDownload" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Content="{x:Static p:Resources.ui_download}" Icon="ArrowDownload24" Visibility="Collapsed" Click="buttonDownload_Click" />
                 <ui:Button x:Name="buttonInstall" Margin="8,0,0,0" MinWidth="100" Grid.Column="2" Appearance="Primary" Content="{x:Static p:Resources.ui_install}" Icon="AppsAddIn24" Visibility="Collapsed" Click="buttonInstall_Click" />
             </Grid>
 

From fcbac6a19b67a292b8c024343560ed140c45e0b0 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Thu, 28 Sep 2023 22:56:20 +0200
Subject: [PATCH 42/69] add v2 info

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 1172a2f..b343963 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@
 
 Download the [latest release](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.exe) (or as a [.zip](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.zip)) and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed.
 
+Legacy 2.x versions (old UI, no automatic driver installation) will continue to be supported and fixed for the time being. Please see [the v2 branch](https://github.com/fyr77/EnvyUpdate/tree/v2) for these.
+
 The application itself does not update itself. If you notice any bugs or issues, be sure to check for a new version on GitHub!
 
 Enabling Autostart will create a shortcut of EnvyUpdate in the Windows startup folder.

From e932255f596256e3899d58bd300acd83726d1e5d Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 2 Oct 2023 11:04:33 +0200
Subject: [PATCH 43/69] fix download button

---
 EnvyUpdate/DashboardPage.xaml.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index a676e4d..f6ec952 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -462,7 +462,8 @@ namespace EnvyUpdate
                 ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.CheckmarkCircle24, Properties.Resources.info_install_complete, Properties.Resources.info_install_complete_title);
                 buttonInstall.IsEnabled = true;
                 buttonInstall.Visibility = Visibility.Collapsed;
-                buttonDownload.Visibility = Visibility.Visible;
+                buttonDownload.IsEnabled = true;
+                buttonDownload.Visibility = Visibility.Collapsed;
             }));
 
             Debug.LogToFile("INFO Driver setup complete. Cleaning up setup files.");

From babc550b6d0aec4c6b875556992c8f8edcf573da Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 2 Oct 2023 12:30:53 +0200
Subject: [PATCH 44/69] add ability to save to appdata

---
 EnvyUpdate/DashboardPage.xaml               |  4 +-
 EnvyUpdate/DashboardPage.xaml.cs            | 52 +++++++++----------
 EnvyUpdate/Debug.cs                         | 10 ++--
 EnvyUpdate/GlobalVars.cs                    | 10 ++--
 EnvyUpdate/MainWindow.xaml.cs               | 21 ++++++--
 EnvyUpdate/Properties/Resources.Designer.cs |  9 ++++
 EnvyUpdate/Properties/Resources.de.resx     |  3 ++
 EnvyUpdate/Properties/Resources.resx        |  3 ++
 EnvyUpdate/SettingsPage.xaml                | 11 +++--
 EnvyUpdate/SettingsPage.xaml.cs             | 38 ++++++++++++--
 EnvyUpdate/Util.cs                          | 55 ++++++++++++++++-----
 11 files changed, 160 insertions(+), 56 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml b/EnvyUpdate/DashboardPage.xaml
index 3761bf6..546b018 100644
--- a/EnvyUpdate/DashboardPage.xaml
+++ b/EnvyUpdate/DashboardPage.xaml
@@ -77,11 +77,11 @@
             </Grid>
 
             <ui:CardControl Margin="0,12,0,0" Grid.Row="4" Icon="Color24" Header="Studio Driver">
-                <ui:ToggleSwitch x:Name="switchStudioDriver" IsChecked="False" Checked="switchStudioDriver_Checked" Unchecked="switchStudioDriver_Unchecked" />
+                <ui:ToggleSwitch x:Name="switchStudioDriver" Checked="switchStudioDriver_Checked" Unchecked="switchStudioDriver_Unchecked" />
             </ui:CardControl>
 
             <ui:CardControl Margin="0,12,0,0" Grid.Row="5" Icon="LightbulbFilament48" Header="{x:Static p:Resources.ui_autostart}">
-                <ui:ToggleSwitch x:Name="switchAutostart" IsChecked="False" Click="switchAutostart_Click" />
+                <ui:ToggleSwitch x:Name="switchAutostart" Click="switchAutostart_Click" />
             </ui:CardControl>
         </Grid>
         <ui:Snackbar x:Name="snackbarInfo" Timeout="0"/>
diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index f6ec952..78258b7 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -112,10 +112,10 @@ namespace EnvyUpdate
                 switchStudioDriver.IsChecked = false;
             }
 
-            if (File.Exists(GlobalVars.exedirectory + "skip.envy"))
+            if (File.Exists(Path.Combine(GlobalVars.saveDirectory,"skip.envy")))
             {
                 Debug.LogToFile("INFO Found version skip config.");
-                skippedVer = File.ReadLines(GlobalVars.exedirectory + "skip.envy").First();
+                skippedVer = File.ReadLines(Path.Combine(GlobalVars.saveDirectory, "skip.envy")).First();
             }
 
             // This little bool check is necessary for debug fake mode. 
@@ -137,9 +137,9 @@ namespace EnvyUpdate
                 try
                 {
                     // disable SD and try with GRD
-                    if (File.Exists(GlobalVars.exedirectory + "sd.envy"))
+                    if (File.Exists(Path.Combine(GlobalVars.saveDirectory, "sd.envy")))
                     {
-                        File.Delete(GlobalVars.exedirectory + "sd.envy");
+                        File.Delete(Path.Combine(GlobalVars.saveDirectory, "sd.envy"));
                     }
 
                     gpuURL = Util.GetGpuUrl(); //try again with GRD
@@ -226,15 +226,15 @@ namespace EnvyUpdate
             {
                 Debug.LogToFile("INFO Skipped version is surpassed, deleting setting.");
                 skippedVer = null;
-                if (File.Exists(GlobalVars.exedirectory + "skip.envy"))
-                    File.Delete(GlobalVars.exedirectory + "skip.envy");
+                if (File.Exists(Path.Combine(GlobalVars.saveDirectory, "skip.envy")))
+                    File.Delete(Path.Combine(GlobalVars.saveDirectory, "skip.envy"));
                 buttonSkipVersion.ToolTip = Properties.Resources.ui_skipversion;
                 buttonSkipVersion.IsEnabled = true;
                 buttonSkipVersion.Visibility = Visibility.Visible;
             }
 
             // Check if update file already exists and display install button instead
-            if (File.Exists(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe")))
+            if (File.Exists(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe")))
             {
                 Debug.LogToFile("INFO Found downloaded driver installer, no need to redownload.");
                 buttonDownload.Visibility = Visibility.Collapsed;
@@ -244,20 +244,20 @@ namespace EnvyUpdate
 
         private void switchStudioDriver_Unchecked(object sender, RoutedEventArgs e)
         {
-            if (File.Exists(GlobalVars.exedirectory + "sd.envy"))
+            if (File.Exists(Path.Combine(GlobalVars.saveDirectory, "sd.envy")))
             {
                 Debug.LogToFile("INFO Switching to game ready driver.");
-                File.Delete(GlobalVars.exedirectory + "sd.envy");
+                File.Delete(Path.Combine(GlobalVars.saveDirectory, "sd.envy"));
                 Load();
             }
         }
 
         private void switchStudioDriver_Checked(object sender, RoutedEventArgs e)
         {
-            if (!File.Exists(GlobalVars.exedirectory + "sd.envy"))
+            if (!File.Exists(Path.Combine(GlobalVars.saveDirectory, "sd.envy")))
             {
                 Debug.LogToFile("INFO Switching to studio driver.");
-                File.Create(GlobalVars.exedirectory + "sd.envy").Close();
+                File.Create(Path.Combine(GlobalVars.saveDirectory, "sd.envy")).Close();
                 Load();
             }
         }
@@ -272,7 +272,7 @@ namespace EnvyUpdate
             if (switchAutostart.IsChecked == true)
             {
                 Debug.LogToFile("INFO Creating autostart entry.");
-                Util.CreateShortcut("EnvyUpdate", Environment.GetFolderPath(Environment.SpecialFolder.Startup), GlobalVars.exeloc, "NVidia Update Checker", "/minimize");
+                Util.CreateShortcut("EnvyUpdate", Environment.GetFolderPath(Environment.SpecialFolder.Startup), GlobalVars.pathToAppExe, "NVidia Update Checker", "/minimize");
             }
         }
 
@@ -280,7 +280,7 @@ namespace EnvyUpdate
         {
             Debug.LogToFile("INFO Skipping version.");
             skippedVer = onlineDriv;
-            File.WriteAllText(GlobalVars.exedirectory + "skip.envy", onlineDriv);
+            File.WriteAllText(Path.Combine(GlobalVars.saveDirectory, "skip.envy"), onlineDriv);
             buttonSkipVersion.IsEnabled = false;
             buttonSkipVersion.ToolTip = Properties.Resources.ui_skipped;
             MessageBox.Show(Properties.Resources.skip_confirm);
@@ -343,10 +343,10 @@ namespace EnvyUpdate
             progressbarDownload.Visibility = Visibility.Visible;
             buttonDownload.IsEnabled = false;
 
-            if (File.Exists(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading")))
+            if (File.Exists(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading")))
             {
                 Debug.LogToFile("WARN Found previous unfinished download, retrying.");
-                File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+                File.Delete(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
             }
             Thread thread = new Thread(() => {
                 using (WebClient client = new WebClient())
@@ -354,7 +354,7 @@ namespace EnvyUpdate
                     client.Headers["User-Agent"] = GlobalVars.useragent;
                     client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
                     client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
-                    client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+                    client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
                 }
             });
             thread.Start();
@@ -385,13 +385,13 @@ namespace EnvyUpdate
                     buttonInstall.Visibility = Visibility.Visible;
                     Debug.LogToFile("INFO Download successful.");
                 }));
-                if (File.Exists(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe")))
-                    File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe"));
-                File.Move(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"), Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe"));
+                if (File.Exists(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe")))
+                    File.Delete(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe"));
+                File.Move(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"), Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe"));
             }
             else
             {
-                File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+                File.Delete(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
                 Application.Current.Dispatcher.Invoke(new Action(() => {
                     ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_download_error, Properties.Resources.info_download_error_title);
                     Debug.LogToFile("INFO Download NOT successful. Error: " + e.Error.ToString());
@@ -406,8 +406,8 @@ namespace EnvyUpdate
 
             ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Info, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_extracting, Properties.Resources.info_extracting_title);
 
-            string filePath = Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe");
-            string destinationDir = Path.Combine(GlobalVars.exedirectory, onlineDriv + "-extracted");
+            string filePath = Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe");
+            string destinationDir = Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-extracted");
 
             if (!Directory.Exists(destinationDir))
                 Directory.CreateDirectory(destinationDir);
@@ -430,13 +430,13 @@ namespace EnvyUpdate
 
         private void ExtractionFinished(object sender, EventArgs e)
         {
-            string extractedPath = Path.Combine(GlobalVars.exedirectory, onlineDriv + "-extracted");
+            string extractedPath = Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-extracted");
             Application.Current.Dispatcher.Invoke(new Action(() => {
                 ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Success, Wpf.Ui.Common.SymbolRegular.FolderZip24, Properties.Resources.info_extract_complete, Properties.Resources.info_extract_complete_title);
             }));
             Debug.LogToFile("INFO Extraction exited, deleting 7-zip executable.");
             
-            File.Delete(Path.Combine(GlobalVars.exedirectory, "7zr.exe"));
+            File.Delete(Path.Combine(GlobalVars.saveDirectory, "7zr.exe"));
 
             Util.CleanInstallConfig(Path.Combine(extractedPath, "setup.cfg"));
 
@@ -468,8 +468,8 @@ namespace EnvyUpdate
 
             Debug.LogToFile("INFO Driver setup complete. Cleaning up setup files.");
 
-            File.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-nvidia-installer.exe"));
-            Directory.Delete(Path.Combine(GlobalVars.exedirectory, onlineDriv + "-extracted"), true);
+            File.Delete(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe"));
+            Directory.Delete(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-extracted"), true);
             GlobalVars.isInstalling = false;
             Application.Current.Dispatcher.Invoke(delegate
             {
diff --git a/EnvyUpdate/Debug.cs b/EnvyUpdate/Debug.cs
index 43e54b9..35e6e04 100644
--- a/EnvyUpdate/Debug.cs
+++ b/EnvyUpdate/Debug.cs
@@ -15,9 +15,6 @@ namespace EnvyUpdate
         public static bool isVerbose = false;
 #endif
 
-
-        public static string debugFile = Path.Combine(GlobalVars.exedirectory, "envyupdate.log");
-
         public static int LoadFakeIDs(string idType)
         {
             /* 
@@ -52,7 +49,12 @@ namespace EnvyUpdate
         public static void LogToFile(string content)
         {
             if (isVerbose)
-                System.IO.File.AppendAllText(Debug.debugFile, content + "\n");
+            {
+                if (GlobalVars.useAppdata)
+                    File.AppendAllText(Path.Combine(GlobalVars.appdata, "envyupdate.log"), content + "\n");
+                else
+                    File.AppendAllText(Path.Combine(GlobalVars.directoryOfExe, "envyupdate.log"), content + "\n");
+            }    
         }
     }
 }
diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs
index e9dfd32..e830039 100644
--- a/EnvyUpdate/GlobalVars.cs
+++ b/EnvyUpdate/GlobalVars.cs
@@ -6,14 +6,18 @@ namespace EnvyUpdate
     class GlobalVars
     {
         public static bool isMobile = false;
-        public static readonly string exeloc = System.Reflection.Assembly.GetEntryAssembly().Location;
-        public static readonly string exedirectory = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location) + "\\";
+        public static readonly string pathToAppExe = System.Reflection.Assembly.GetEntryAssembly().Location;
+        public static readonly string directoryOfExe = Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location);
+        public static string saveDirectory = directoryOfExe;
         public static readonly string startmenu = Environment.GetFolderPath(Environment.SpecialFolder.StartMenu);
-        public static readonly string appdata = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\envyupdate\\";
+        public static readonly string legacyAppdata = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\envyupdate\\";
+        public static readonly string appdata = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "EnvyUpdate_Data");
         public static readonly string startup = Environment.GetFolderPath(Environment.SpecialFolder.Startup);
         public static bool monitoringInstall = false;
         public static bool startMinimized = false;
         public static bool isInstalling = false;
         public static readonly string useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0";
+        public static bool useAppdata = false;
+        public static bool hasWrite = true;
     }
 }
diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 44b8a6d..51fc08c 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -28,8 +28,22 @@ namespace EnvyUpdate
                 // This is necessary, since .NET throws an exception if you check for a non-existant arg.
             }
 
+            if (!Util.HasWritePermissions())
+            {
+                if (!Directory.Exists(GlobalVars.appdata))
+                    Directory.CreateDirectory(GlobalVars.appdata);
+
+                GlobalVars.hasWrite = false;
+            }
+
+            if (Directory.Exists(GlobalVars.appdata))
+            {
+                GlobalVars.useAppdata = true;
+                GlobalVars.saveDirectory = GlobalVars.appdata;
+            }
+
             // Check if Debug file exists
-            if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
+            if (File.Exists(Path.Combine(GlobalVars.saveDirectory, "envyupdate.log")))
             {
                 Debug.isVerbose = true;
                 Debug.LogToFile("------");
@@ -37,6 +51,7 @@ namespace EnvyUpdate
             }
 
             Debug.LogToFile("INFO Starting EnvyUpdate, version " + System.Diagnostics.FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion);
+            Debug.LogToFile("INFO Save directory: " + GlobalVars.saveDirectory);
 
             // Check if running on supported Windows version.
             if (Environment.OSVersion.Version.Major < 10)
@@ -60,9 +75,9 @@ namespace EnvyUpdate
             SystemEvents.UserPreferenceChanged += AdjustTheme;
 
             // Delete installed legacy versions, required for people upgrading from very old versions.
-            if (Directory.Exists(GlobalVars.appdata))
+            if (Directory.Exists(GlobalVars.legacyAppdata))
             {
-                Debug.LogToFile("INFO Found old appdata installation, uninstalling.");
+                Debug.LogToFile("INFO Found legacy appdata installation, uninstalling.");
                 Util.UninstallAll();
             }
 
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index a22ae7c..4f80cf9 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -258,6 +258,15 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Save files to AppData.
+        /// </summary>
+        public static string ui_enable_appdata {
+            get {
+                return ResourceManager.GetString("ui_enable_appdata", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enable logging to file.
         /// </summary>
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index cb58d0d..40102a4 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -183,6 +183,9 @@
   <data name="ui_download" xml:space="preserve">
     <value>Herunterladen</value>
   </data>
+  <data name="ui_enable_appdata" xml:space="preserve">
+    <value>Programmdaten in AppData speichern</value>
+  </data>
   <data name="ui_enable_logging" xml:space="preserve">
     <value>Programm-Log in Datei schreiben</value>
   </data>
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index f9f99e7..3780249 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -183,6 +183,9 @@
   <data name="ui_download" xml:space="preserve">
     <value>Download</value>
   </data>
+  <data name="ui_enable_appdata" xml:space="preserve">
+    <value>Save files to AppData</value>
+  </data>
   <data name="ui_enable_logging" xml:space="preserve">
     <value>Enable logging to file</value>
   </data>
diff --git a/EnvyUpdate/SettingsPage.xaml b/EnvyUpdate/SettingsPage.xaml
index 527bd97..f00cd4b 100644
--- a/EnvyUpdate/SettingsPage.xaml
+++ b/EnvyUpdate/SettingsPage.xaml
@@ -15,7 +15,8 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition />
         </Grid.RowDefinitions>
         <Grid Grid.Row="0">
@@ -34,8 +35,12 @@
             <ui:ToggleSwitch x:Name="chkLog" Checked="chkLog_Checked" Unchecked="chkLog_Unchecked"/>
         </ui:CardControl>
 
-        <Label Grid.Row="3" Content="{x:Static p:Resources.ui_licenses}" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold"/>
-        <ScrollViewer Grid.Row="4" MaxHeight="700" HorizontalAlignment="Stretch">
+        <ui:CardControl Grid.Row="3" Margin="0,12,0,0" Icon="Folder24" Header="{x:Static p:Resources.ui_enable_appdata}" >
+            <ui:ToggleSwitch x:Name="chkAppdata" Checked="chkAppdata_Checked" Unchecked="chkAppdata_Unchecked"/>
+        </ui:CardControl>
+
+        <Label Grid.Row="4" Content="{x:Static p:Resources.ui_licenses}" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold"/>
+        <ScrollViewer Grid.Row="5" MaxHeight="700" HorizontalAlignment="Stretch">
             <StackPanel>
                 <Expander Header="EnvyUpdate">
                     <TextBox x:Name="textBoxLicEnvyupdate" IsReadOnly="True" TextWrapping="Wrap"/>
diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index da4b482..35e33f1 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -21,9 +21,15 @@ namespace EnvyUpdate
             if (GlobalVars.monitoringInstall)
                 textBlockVer.FontStyle = FontStyles.Italic;
 
-            if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
+            if (File.Exists(Path.Combine(GlobalVars.saveDirectory, "envyupdate.log")) || File.Exists(Path.Combine(GlobalVars.appdata, "envyupdate.log")))
                 chkLog.IsChecked = true;
 
+            if (GlobalVars.useAppdata)
+                chkAppdata.IsChecked = true;
+
+            if (!GlobalVars.hasWrite)
+                chkAppdata.IsEnabled = false;
+
             textBoxLicEnvyupdate.Text = Properties.Licenses.EnvyUpdate;
             textBoxLicFody.Text = Properties.Licenses.Fody;
             textBoxLicCostura.Text = Properties.Licenses.CosturaFody;
@@ -54,10 +60,36 @@ namespace EnvyUpdate
             if (Debug.isVerbose)
             {
                 Debug.LogToFile("INFO Disabled logging to file.");
-                if (File.Exists(Path.Combine(GlobalVars.exedirectory, "envyupdate.log")))
-                    File.Move(Path.Combine(GlobalVars.exedirectory, "envyupdate.log"), Path.Combine(GlobalVars.exedirectory, "envyupdate." + DateTime.Now.ToString("yyyyMMdd-HHmmss") + ".log"));
+                if (File.Exists(Path.Combine(GlobalVars.saveDirectory, "envyupdate.log")))
+                    File.Move(Path.Combine(GlobalVars.saveDirectory, "envyupdate.log"), Path.Combine(GlobalVars.saveDirectory, "envyupdate." + DateTime.Now.ToString("yyyyMMdd-HHmmss") + ".log"));
                 Debug.isVerbose = false;
             }
         }
+
+        private void chkAppdata_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!Directory.Exists(GlobalVars.appdata))
+                Directory.CreateDirectory(GlobalVars.appdata);
+
+            GlobalVars.useAppdata = true;
+            GlobalVars.saveDirectory = GlobalVars.appdata;
+            Util.MoveFilesToAppdata();
+
+            Debug.LogToFile("INFO Switched to AppData directory.");
+        }
+
+        private void chkAppdata_Unchecked(object sender, RoutedEventArgs e)
+        {
+            GlobalVars.useAppdata = false;
+            GlobalVars.saveDirectory = GlobalVars.directoryOfExe;
+
+            if (Directory.Exists(GlobalVars.appdata))
+            {
+                Util.MoveFilesToExe();
+                Directory.Delete(GlobalVars.appdata, true);
+            }
+
+            Debug.LogToFile("INFO Switched to EXE directory.");
+        }
     }
 }
diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index ced5548..df99ebb 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -1,4 +1,5 @@
 using IWshRuntimeLibrary;
+using Microsoft.Build.Framework.XamlTypes;
 using Microsoft.Win32;
 using System;
 using System.Diagnostics;
@@ -130,13 +131,11 @@ namespace EnvyUpdate
         /// </summary>
         public static void SelfDelete()
         {
-            string appdata = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\envyupdate\\";
-
             Process process = new Process();
             ProcessStartInfo startInfo = new ProcessStartInfo
             {
                 WindowStyle = ProcessWindowStyle.Hidden,
-                WorkingDirectory = appdata,
+                WorkingDirectory = GlobalVars.legacyAppdata,
                 FileName = "cmd.exe",
                 Arguments = "/C timeout 5 && del EnvyUpdate.exe"
             };
@@ -433,7 +432,7 @@ namespace EnvyUpdate
              */
             //TODO: find way to differentiate between driver types
 
-            if (System.IO.File.Exists(GlobalVars.exedirectory + "sd.envy"))
+            if (System.IO.File.Exists(Path.Combine(GlobalVars.saveDirectory, "sd.envy")))
                 return 18;
             else
                 return 1;
@@ -510,27 +509,27 @@ namespace EnvyUpdate
 
         public static void UninstallAll()
         {
-            if (System.IO.File.Exists(GlobalVars.startup + "\\EnvyUpdate.lnk"))
+            if (System.IO.File.Exists(Path.Combine(GlobalVars.startup, "\\EnvyUpdate.lnk")))
             {
                 Debug.LogToFile("INFO Deleted startup entry.");
-                System.IO.File.Delete(GlobalVars.startup + "\\EnvyUpdate.lnk");
+                System.IO.File.Delete(Path.Combine(GlobalVars.startup, "\\EnvyUpdate.lnk"));
             }
 
-            if (System.IO.File.Exists(GlobalVars.startmenu + "\\EnvyUpdate.lnk"))
+            if (System.IO.File.Exists(Path.Combine(GlobalVars.startmenu, "\\EnvyUpdate.lnk")))
             {
                 Debug.LogToFile("INFO Deleted start menu entry.");
-                System.IO.File.Delete(GlobalVars.startmenu + "\\EnvyUpdate.lnk");
+                System.IO.File.Delete(Path.Combine(GlobalVars.startmenu, "\\EnvyUpdate.lnk"));
             }
-            if ((GlobalVars.exedirectory == GlobalVars.appdata) && System.IO.File.Exists(GlobalVars.appdata + "EnvyUpdate.exe"))
+            if ((GlobalVars.saveDirectory == GlobalVars.legacyAppdata) && System.IO.File.Exists(Path.Combine(GlobalVars.legacyAppdata, "EnvyUpdate.exe")))
             {
                 Debug.LogToFile("INFO Deleting EnvyUpdate appdata and self.");
                 MessageBox.Show(Properties.Resources.uninstall_legacy_message);
                 Util.SelfDelete();
             }
-            else if (Directory.Exists(GlobalVars.appdata))
+            else if (Directory.Exists(GlobalVars.legacyAppdata))
             {
                 Debug.LogToFile("INFO Deleting EnvyUpdate appdata folder");
-                Directory.Delete(GlobalVars.appdata, true);
+                Directory.Delete(GlobalVars.legacyAppdata, true);
             }
         }
 
@@ -579,7 +578,7 @@ namespace EnvyUpdate
             }
             else
             {
-                path = Path.Combine(GlobalVars.exedirectory, "7zr.exe");
+                path = Path.Combine(GlobalVars.saveDirectory, "7zr.exe");
                 using (WebClient client = new WebClient())
                 {
                     client.Headers["User-Agent"] = GlobalVars.useragent;
@@ -664,5 +663,37 @@ namespace EnvyUpdate
             }
             return null;
         }
+
+        public static bool HasWritePermissions()
+        {
+            try
+            {
+                System.IO.File.Create(Path.Combine(GlobalVars.saveDirectory, "writeable.envy")).Close();
+                System.IO.File.Delete(Path.Combine(GlobalVars.saveDirectory, "writeable.envy"));
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
+        public static void MoveFilesToAppdata()
+        {
+            string[] envyFiles = Directory.GetFiles(GlobalVars.directoryOfExe, "*.envy");
+            foreach (var item in envyFiles)
+                System.IO.File.Move(item, Path.Combine(GlobalVars.appdata, Path.GetFileName(item)));
+            if (System.IO.File.Exists(Path.Combine(GlobalVars.directoryOfExe, "envyupdate.log")))
+                System.IO.File.Move(Path.Combine(GlobalVars.directoryOfExe, "envyupdate.log"), Path.Combine(GlobalVars.appdata, "envyupdate.log"));
+        }
+
+        public static void MoveFilesToExe()
+        {
+            string[] envyFiles = Directory.GetFiles(GlobalVars.appdata, "*.envy");
+            foreach (var item in envyFiles)
+                System.IO.File.Move(item, Path.Combine(GlobalVars.directoryOfExe, Path.GetFileName(item)));
+            if (System.IO.File.Exists(Path.Combine(GlobalVars.appdata, "envyupdate.log")))
+                System.IO.File.Move(Path.Combine(GlobalVars.appdata, "envyupdate.log"), Path.Combine(GlobalVars.directoryOfExe, "envyupdate.log"));
+        }
     }
 }

From a87a6deab42c05b64ff4158f052e5be86ea018db Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 2 Oct 2023 12:32:34 +0200
Subject: [PATCH 45/69] bump version

---
 EnvyUpdate/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index 09110e5..620e972 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1")]
-[assembly: AssemblyFileVersion("3.1")]
+[assembly: AssemblyVersion("3.2")]
+[assembly: AssemblyFileVersion("3.2")]

From aeaae1f827a8387252799d50cf97dcb779de6857 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 2 Oct 2023 12:36:13 +0200
Subject: [PATCH 46/69] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index b343963..b908cbf 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,12 @@ Sometimes EnvyUpdate is flagged as a virus by Windows Defender or other antiviru
 
 For extracting the driver installer 7-Zip is downloaded if it cannot be found on the user's system. This may also trigger antivirus warnings, but is necessary for the automatic driver installation to work.
 
+### Using AppData for configuration files
+
+Starting with 3.2, EnvyUpdate supports saving its configuration files to AppData/Roaming instead of saving it next to the main exe file. You can enable it in the settings of the application.
+
+If EnvyUpdate fails to write to the folder containing the exe file, this option will be enabled automatically.
+
 ## Compatibility
 
 The application should be compatible with all Nvidia GeForce GPUs that have their drivers available on the nvidia.com download page and runs on Windows 10 and up.

From 657ebb0d5fd539dfaed1b9ce924d6b535248f178 Mon Sep 17 00:00:00 2001
From: JohannesIBK <mail@greuter.dev>
Date: Sat, 16 Dec 2023 19:31:13 +0100
Subject: [PATCH 47/69] fix issue with usernames that contain spaces

---
 EnvyUpdate/DashboardPage.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 78258b7..d275b3f 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -420,7 +420,7 @@ namespace EnvyUpdate
                 WindowStyle = ProcessWindowStyle.Minimized,
                 WorkingDirectory = destinationDir,
                 FileName = sevenZipPath,
-                Arguments = "x -aoa -y " + filePath + " Display.Driver Display.Nview Display.Optimus HDAudio MSVCR NVI2 NVPCF PhysX PPC ShieldWirelessController EULA.txt ListDevices.txt setup.cfg setup.exe"
+                Arguments = "x -aoa -y \"" + filePath + "\" Display.Driver Display.Nview Display.Optimus HDAudio MSVCR NVI2 NVPCF PhysX PPC ShieldWirelessController EULA.txt ListDevices.txt setup.cfg setup.exe"
             };
             process.EnableRaisingEvents = true;
             process.StartInfo = startInfo;

From 3231cd4db26c55c07754ca4ae5c6ae1a409b7942 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Sat, 16 Dec 2023 20:44:11 +0100
Subject: [PATCH 48/69] bump version

---
 EnvyUpdate/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index 620e972..dbe3fd6 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.2")]
-[assembly: AssemblyFileVersion("3.2")]
+[assembly: AssemblyVersion("3.3")]
+[assembly: AssemblyFileVersion("3.3")]

From 44c0e0ce9111dae9e19329498a4641d7a09cffaa Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Sun, 4 Feb 2024 15:27:39 +0100
Subject: [PATCH 49/69] Update LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 3051eea..d6dacc4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2023 Jakob Senkl
+Copyright (c) 2019-2024 fyr77
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From b7590538f076ce70e9aa993d502823f0a1a36241 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Fri, 23 Feb 2024 10:33:43 +0100
Subject: [PATCH 50/69] Update README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index b908cbf..1238dbe 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,6 @@
+# Important Information
+NVIDIA is planning to release their new "[NVIDIA App](https://www.nvidia.com/en-us/software/nvidia-app/)", which will **replace** GeForce Experience and the Control Center. I do not yet know how the new driver package will look like, therefore I cannot guarantee that the update to that new driver that includes the new app will work properly when it releases. I will attempt to test it as soon as it is available.
+
 ![Logo](https://github.com/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
 
 # EnvyUpdate

From 9bd5cc3d88f92f92924aa9b217f6af405b0e6c37 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Fri, 23 Feb 2024 11:29:24 +0100
Subject: [PATCH 51/69] bump version

---
 EnvyUpdate/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index dbe3fd6..6eeb6d9 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3")]
-[assembly: AssemblyFileVersion("3.3")]
+[assembly: AssemblyVersion("3.4")]
+[assembly: AssemblyFileVersion("3.4")]

From 3f925ee17abcc9d58285555e0fd85c96f1d67b3f Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Fri, 23 Feb 2024 11:30:29 +0100
Subject: [PATCH 52/69] increase default size

---
 EnvyUpdate/MainWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EnvyUpdate/MainWindow.xaml b/EnvyUpdate/MainWindow.xaml
index af4f6a7..5015f14 100644
--- a/EnvyUpdate/MainWindow.xaml
+++ b/EnvyUpdate/MainWindow.xaml
@@ -11,7 +11,7 @@
     ExtendsContentIntoTitleBar="True"
     WindowBackdropType="Mica"
     
-    Title="EnvyUpdate" MinHeight="500" Height="500" MinWidth="600" Width="600" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" WindowStyle="None">
+    Title="EnvyUpdate" MinHeight="500" Height="550" MinWidth="700" Width="750" Icon="icon.ico" StateChanged="Window_StateChanged" Closing="Window_Closing" ResizeMode="CanMinimize" WindowStyle="None">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />

From b9e7aac55fbb8353ce30669fc682dfd5518ba2d0 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Fri, 23 Feb 2024 20:30:40 +0100
Subject: [PATCH 53/69] add auto download feature

---
 EnvyUpdate/DashboardPage.xaml.cs            |  6 ++++++
 EnvyUpdate/GlobalVars.cs                    |  1 +
 EnvyUpdate/Properties/Resources.Designer.cs |  9 +++++++++
 EnvyUpdate/Properties/Resources.de.resx     |  3 +++
 EnvyUpdate/Properties/Resources.resx        |  3 +++
 EnvyUpdate/SettingsPage.xaml                | 16 +++++++++++++---
 EnvyUpdate/SettingsPage.xaml.cs             | 10 ++++++++++
 7 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index d275b3f..d43e27a 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -210,6 +210,12 @@ namespace EnvyUpdate
 
                 if (skippedVer != onlineDriv)
                 {
+                    if (GlobalVars.autoDownload)
+                    {
+                        Debug.LogToFile("INFO Auto-Downloading driver.");
+                        buttonDownload_Click(null, null);
+                    }
+
                     Debug.LogToFile("INFO Showing update popup notification.");
                     Notify.ShowDrivUpdatePopup();
                 }
diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs
index e830039..b56e851 100644
--- a/EnvyUpdate/GlobalVars.cs
+++ b/EnvyUpdate/GlobalVars.cs
@@ -19,5 +19,6 @@ namespace EnvyUpdate
         public static readonly string useragent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:115.0) Gecko/20100101 Firefox/115.0";
         public static bool useAppdata = false;
         public static bool hasWrite = true;
+        public static bool autoDownload = false;
     }
 }
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index 4f80cf9..2442daa 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -267,6 +267,15 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Download updates automatically.
+        /// </summary>
+        public static string ui_enable_autodownload {
+            get {
+                return ResourceManager.GetString("ui_enable_autodownload", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Enable logging to file.
         /// </summary>
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index 40102a4..296e7c4 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -186,6 +186,9 @@
   <data name="ui_enable_appdata" xml:space="preserve">
     <value>Programmdaten in AppData speichern</value>
   </data>
+  <data name="ui_enable_autodownload" xml:space="preserve">
+    <value>Updates automatisch herunterladen</value>
+  </data>
   <data name="ui_enable_logging" xml:space="preserve">
     <value>Programm-Log in Datei schreiben</value>
   </data>
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index 3780249..304ee61 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -186,6 +186,9 @@
   <data name="ui_enable_appdata" xml:space="preserve">
     <value>Save files to AppData</value>
   </data>
+  <data name="ui_enable_autodownload" xml:space="preserve">
+    <value>Download updates automatically</value>
+  </data>
   <data name="ui_enable_logging" xml:space="preserve">
     <value>Enable logging to file</value>
   </data>
diff --git a/EnvyUpdate/SettingsPage.xaml b/EnvyUpdate/SettingsPage.xaml
index f00cd4b..ab6f973 100644
--- a/EnvyUpdate/SettingsPage.xaml
+++ b/EnvyUpdate/SettingsPage.xaml
@@ -35,9 +35,19 @@
             <ui:ToggleSwitch x:Name="chkLog" Checked="chkLog_Checked" Unchecked="chkLog_Unchecked"/>
         </ui:CardControl>
 
-        <ui:CardControl Grid.Row="3" Margin="0,12,0,0" Icon="Folder24" Header="{x:Static p:Resources.ui_enable_appdata}" >
-            <ui:ToggleSwitch x:Name="chkAppdata" Checked="chkAppdata_Checked" Unchecked="chkAppdata_Unchecked"/>
-        </ui:CardControl>
+        <Grid Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="5"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <ui:CardControl Grid.Column="0" Margin="0,12,0,0" Icon="Folder24" Header="{x:Static p:Resources.ui_enable_appdata}" VerticalAlignment="Top" >
+                <ui:ToggleSwitch x:Name="chkAppdata" Checked="chkAppdata_Checked" Unchecked="chkAppdata_Unchecked"/>
+            </ui:CardControl>
+            <ui:CardControl Grid.Column="2" Margin="0,12,0,0" Icon="ArrowDownload24" Header="{x:Static p:Resources.ui_enable_autodownload}" VerticalAlignment="Top">
+                <ui:ToggleSwitch x:Name="chkAutodl" Checked="chkAutodl_Checked" Unchecked="chkAutodl_Unchecked"/>
+            </ui:CardControl>
+        </Grid>
 
         <Label Grid.Row="4" Content="{x:Static p:Resources.ui_licenses}" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="Bold"/>
         <ScrollViewer Grid.Row="5" MaxHeight="700" HorizontalAlignment="Stretch">
diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index 35e33f1..6534512 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -91,5 +91,15 @@ namespace EnvyUpdate
 
             Debug.LogToFile("INFO Switched to EXE directory.");
         }
+
+        private void chkAutodl_Checked(object sender, RoutedEventArgs e)
+        {
+            GlobalVars.autoDownload = true;
+        }
+
+        private void chkAutodl_Unchecked(object sender, RoutedEventArgs e)
+        {
+            GlobalVars.autoDownload = false;
+        }
     }
 }

From 19cf5fb38e64987cfb9595bca7f37fc25dbb45bd Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Fri, 23 Feb 2024 20:36:05 +0100
Subject: [PATCH 54/69] fix non-gtx detection

---
 EnvyUpdate/Util.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EnvyUpdate/Util.cs b/EnvyUpdate/Util.cs
index df99ebb..8a504cd 100644
--- a/EnvyUpdate/Util.cs
+++ b/EnvyUpdate/Util.cs
@@ -337,7 +337,7 @@ namespace EnvyUpdate
                     {
                         GPUName = obj["VideoProcessor"].ToString().ToLower();
                         // Remove any 3GB, 6GB or similar from name. We don't need to know the VRAM to get results.
-                        GPUName = Regex.Match(GPUName, "(geforce )((.tx )|(mx))?\\w*\\d*( ti)?").Value;
+                        GPUName = Regex.Match(GPUName, "(geforce )((.t.? )|(mx ))?\\w*\\d*( ti)?").Value;
                     }
                     else
                         GPUName = obj["VideoProcessor"].ToString();

From 8ce6a921464f64feae5725149d8f1dd527586afc Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Sat, 24 Feb 2024 13:44:34 +0100
Subject: [PATCH 55/69] add notification exception handling

---
 EnvyUpdate/Notify.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/EnvyUpdate/Notify.cs b/EnvyUpdate/Notify.cs
index ac317c1..d889163 100644
--- a/EnvyUpdate/Notify.cs
+++ b/EnvyUpdate/Notify.cs
@@ -6,9 +6,16 @@ namespace EnvyUpdate
     {
         public static void ShowDrivUpdatePopup()
         {
-            var toast = new ToastContentBuilder();
-            toast.AddText(Properties.Resources.update_popup_message);
-            toast.Show();
+            try
+            {
+                var toast = new ToastContentBuilder();
+                toast.AddText(Properties.Resources.update_popup_message);
+                toast.Show();
+            }
+            catch (System.Exception ex)
+            {
+                Debug.LogToFile("WARN Could not show notification. Error: " + ex.Message);
+            }
         }
     }
 }
\ No newline at end of file

From 1aa93e2267dc7d95d026df4843fdb856d9c02959 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Sun, 25 Feb 2024 15:09:21 +0100
Subject: [PATCH 56/69] bump version

---
 EnvyUpdate/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index 6eeb6d9..7420f2a 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.4")]
-[assembly: AssemblyFileVersion("3.4")]
+[assembly: AssemblyVersion("3.5")]
+[assembly: AssemblyFileVersion("3.5")]

From 48bb49671a7935fd0052686d95ebbe9332dd8ec7 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 26 Feb 2024 19:23:07 +0100
Subject: [PATCH 57/69] handle unfinished downloads

---
 EnvyUpdate/MainWindow.xaml.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index 51fc08c..d139842 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -102,6 +102,17 @@ namespace EnvyUpdate
                 GlobalVars.startMinimized = true;
             }
 
+            //Check for old unfinished downloads
+            string[] leftovers = Directory.GetFiles(GlobalVars.directoryOfExe, "*-nvidia-installer.exe.downloading");
+            if (leftovers.Length > 0)
+            {
+                foreach (string leftover in leftovers)
+                {
+                    Debug.LogToFile("INFO Deleting leftover download " + leftover);
+                    File.Delete(leftover);
+                }
+            }
+
             GlobalVars.isMobile = Util.IsMobile();
             Debug.LogToFile("INFO Mobile: " + GlobalVars.isMobile);
         }

From a271150b0c5da36d02f094d8c3aca9c106e9d655 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 26 Feb 2024 19:42:06 +0100
Subject: [PATCH 58/69] handle running download

---
 EnvyUpdate/DashboardPage.xaml.cs            | 41 +++++++++++++--------
 EnvyUpdate/Properties/Resources.Designer.cs | 11 +++++-
 EnvyUpdate/Properties/Resources.de.resx     |  3 ++
 EnvyUpdate/Properties/Resources.resx        |  3 ++
 4 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index d43e27a..1dfbc68 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -22,6 +22,7 @@ namespace EnvyUpdate
         private string gpuURL = null;
         private string skippedVer = null;
         private DateTime lastFileChanged = DateTime.MinValue;
+        private bool isDownloading = false;
 
         public DashboardPage()
         {
@@ -346,25 +347,34 @@ namespace EnvyUpdate
 
         private void buttonDownload_Click(object sender, RoutedEventArgs e)
         {
-            progressbarDownload.Visibility = Visibility.Visible;
-            buttonDownload.IsEnabled = false;
-
-            if (File.Exists(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading")))
+            if (isDownloading)
             {
-                Debug.LogToFile("WARN Found previous unfinished download, retrying.");
-                File.Delete(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+                Debug.LogToFile("WARN A download is already running.");
+                ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_install_complete, Properties.Resources.info_install_complete_title);
             }
-            Thread thread = new Thread(() => {
-                using (WebClient client = new WebClient())
+            else
+            {
+                progressbarDownload.Visibility = Visibility.Visible;
+                buttonDownload.IsEnabled = false;
+                isDownloading = true;
+
+                if (File.Exists(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading")))
                 {
-                    client.Headers["User-Agent"] = GlobalVars.useragent;
-                    client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
-                    client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
-                    client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+                    Debug.LogToFile("WARN Found previous unfinished download, retrying.");
+                    File.Delete(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
                 }
-            });
-            thread.Start();
-            Debug.LogToFile("INFO Started installer download.");
+                Thread thread = new Thread(() => {
+                    using (WebClient client = new WebClient())
+                    {
+                        client.Headers["User-Agent"] = GlobalVars.useragent;
+                        client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
+                        client.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
+                        client.DownloadFileAsync(new Uri(Util.GetDirectDownload(gpuURL)), Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading"));
+                    }
+                });
+                thread.Start();
+                Debug.LogToFile("INFO Started installer download.");
+            }
         }
 
         void client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
@@ -382,6 +392,7 @@ namespace EnvyUpdate
             Application.Current.Dispatcher.Invoke(new Action(() => {
                 buttonDownload.IsEnabled = true;
                 progressbarDownload.Visibility = Visibility.Collapsed;
+                isDownloading = false;
             }));
             if (e.Error == null)
             {
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index 2442daa..feea38c 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -105,6 +105,15 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to A download process is already running!.
+        /// </summary>
+        public static string info_download_running {
+            get {
+                return ResourceManager.GetString("info_download_running", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Driver installer successfully downloaded..
         /// </summary>
@@ -275,7 +284,7 @@ namespace EnvyUpdate.Properties {
                 return ResourceManager.GetString("ui_enable_autodownload", resourceCulture);
             }
         }
-
+        
         /// <summary>
         ///   Looks up a localized string similar to Enable logging to file.
         /// </summary>
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index 296e7c4..96ebd90 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -132,6 +132,9 @@
   <data name="info_download_error_title" xml:space="preserve">
     <value>Fehler beim Herunterladen</value>
   </data>
+  <data name="info_download_running" xml:space="preserve">
+    <value>Ein Downloadvorgang läuft bereits!</value>
+  </data>
   <data name="info_download_success" xml:space="preserve">
     <value>Treiber-Installationsdatei erfolgreich heruntergeladen.</value>
   </data>
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index 304ee61..f003fa4 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -132,6 +132,9 @@
   <data name="info_download_error_title" xml:space="preserve">
     <value>Error while downloading</value>
   </data>
+  <data name="info_download_running" xml:space="preserve">
+    <value>A download process is already running!</value>
+  </data>
   <data name="info_download_success" xml:space="preserve">
     <value>Driver installer successfully downloaded.</value>
   </data>

From 9eba20f28aef6a1e5f2a1590cf2b3a385f7e7c1e Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 26 Feb 2024 19:46:46 +0100
Subject: [PATCH 59/69] save autodl setting

---
 EnvyUpdate/MainWindow.xaml.cs   | 6 ++++++
 EnvyUpdate/SettingsPage.xaml.cs | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/EnvyUpdate/MainWindow.xaml.cs b/EnvyUpdate/MainWindow.xaml.cs
index d139842..6522ee3 100644
--- a/EnvyUpdate/MainWindow.xaml.cs
+++ b/EnvyUpdate/MainWindow.xaml.cs
@@ -115,6 +115,12 @@ namespace EnvyUpdate
 
             GlobalVars.isMobile = Util.IsMobile();
             Debug.LogToFile("INFO Mobile: " + GlobalVars.isMobile);
+
+            if (File.Exists(Path.Combine(GlobalVars.saveDirectory, "autodl.envy")))
+            {
+                Debug.LogToFile("INFO Auto-download is enabled.");
+                GlobalVars.autoDownload = true;
+            }
         }
         private void Window_StateChanged(object sender, EventArgs e)
         {
diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index 6534512..77698d7 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -95,11 +95,19 @@ namespace EnvyUpdate
         private void chkAutodl_Checked(object sender, RoutedEventArgs e)
         {
             GlobalVars.autoDownload = true;
+            if (!File.Exists(Path.Combine(GlobalVars.saveDirectory, "autodl.envy")))
+            {
+                File.Create(Path.Combine(GlobalVars.saveDirectory, "autodl.envy"));
+            }
         }
 
         private void chkAutodl_Unchecked(object sender, RoutedEventArgs e)
         {
             GlobalVars.autoDownload = false;
+            if (File.Exists(Path.Combine(GlobalVars.saveDirectory, "autodl.envy")))
+            {
+                File.Delete(Path.Combine(GlobalVars.saveDirectory, "autodl.envy"));
+            }
         }
     }
 }

From 76425a3c505dfe04fdae5f98322a74873bb1c07a Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 26 Feb 2024 19:50:56 +0100
Subject: [PATCH 60/69] fix button

---
 EnvyUpdate/SettingsPage.xaml.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index 77698d7..1aa8e7f 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -30,6 +30,9 @@ namespace EnvyUpdate
             if (!GlobalVars.hasWrite)
                 chkAppdata.IsEnabled = false;
 
+            if (GlobalVars.autoDownload)
+                chkAutodl.IsChecked = true;
+
             textBoxLicEnvyupdate.Text = Properties.Licenses.EnvyUpdate;
             textBoxLicFody.Text = Properties.Licenses.Fody;
             textBoxLicCostura.Text = Properties.Licenses.CosturaFody;

From a4a97f7b99d18ab49df44e0fff4265380c78d35f Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 26 Feb 2024 20:02:16 +0100
Subject: [PATCH 61/69] finalize download check

---
 EnvyUpdate/DashboardPage.xaml.cs            | 16 +++++++++-------
 EnvyUpdate/GlobalVars.cs                    |  1 +
 EnvyUpdate/Properties/Resources.Designer.cs |  9 +++++++++
 EnvyUpdate/Properties/Resources.de.resx     |  3 +++
 EnvyUpdate/Properties/Resources.resx        |  3 +++
 EnvyUpdate/SettingsPage.xaml.cs             |  7 +++++++
 6 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/EnvyUpdate/DashboardPage.xaml.cs b/EnvyUpdate/DashboardPage.xaml.cs
index 1dfbc68..f53ef42 100644
--- a/EnvyUpdate/DashboardPage.xaml.cs
+++ b/EnvyUpdate/DashboardPage.xaml.cs
@@ -22,7 +22,6 @@ namespace EnvyUpdate
         private string gpuURL = null;
         private string skippedVer = null;
         private DateTime lastFileChanged = DateTime.MinValue;
-        private bool isDownloading = false;
 
         public DashboardPage()
         {
@@ -213,8 +212,11 @@ namespace EnvyUpdate
                 {
                     if (GlobalVars.autoDownload)
                     {
-                        Debug.LogToFile("INFO Auto-Downloading driver.");
-                        buttonDownload_Click(null, null);
+                        if (buttonDownload.IsVisible)
+                        {
+                            Debug.LogToFile("INFO Auto-Downloading driver.");
+                            buttonDownload_Click(null, null);
+                        }
                     }
 
                     Debug.LogToFile("INFO Showing update popup notification.");
@@ -347,16 +349,16 @@ namespace EnvyUpdate
 
         private void buttonDownload_Click(object sender, RoutedEventArgs e)
         {
-            if (isDownloading)
+            if (GlobalVars.isDownloading)
             {
                 Debug.LogToFile("WARN A download is already running.");
-                ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_install_complete, Properties.Resources.info_install_complete_title);
+                ShowSnackbar(Wpf.Ui.Common.ControlAppearance.Danger, Wpf.Ui.Common.SymbolRegular.ErrorCircle24, Properties.Resources.info_download_running, Properties.Resources.info_download_running_title);
             }
             else
             {
                 progressbarDownload.Visibility = Visibility.Visible;
                 buttonDownload.IsEnabled = false;
-                isDownloading = true;
+                GlobalVars.isDownloading = true;
 
                 if (File.Exists(Path.Combine(GlobalVars.saveDirectory, onlineDriv + "-nvidia-installer.exe.downloading")))
                 {
@@ -392,7 +394,7 @@ namespace EnvyUpdate
             Application.Current.Dispatcher.Invoke(new Action(() => {
                 buttonDownload.IsEnabled = true;
                 progressbarDownload.Visibility = Visibility.Collapsed;
-                isDownloading = false;
+                GlobalVars.isDownloading = false;
             }));
             if (e.Error == null)
             {
diff --git a/EnvyUpdate/GlobalVars.cs b/EnvyUpdate/GlobalVars.cs
index b56e851..f52b4af 100644
--- a/EnvyUpdate/GlobalVars.cs
+++ b/EnvyUpdate/GlobalVars.cs
@@ -20,5 +20,6 @@ namespace EnvyUpdate
         public static bool useAppdata = false;
         public static bool hasWrite = true;
         public static bool autoDownload = false;
+        public static bool isDownloading = false;
     }
 }
diff --git a/EnvyUpdate/Properties/Resources.Designer.cs b/EnvyUpdate/Properties/Resources.Designer.cs
index feea38c..466a9c0 100644
--- a/EnvyUpdate/Properties/Resources.Designer.cs
+++ b/EnvyUpdate/Properties/Resources.Designer.cs
@@ -114,6 +114,15 @@ namespace EnvyUpdate.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Download running.
+        /// </summary>
+        public static string info_download_running_title {
+            get {
+                return ResourceManager.GetString("info_download_running_title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Driver installer successfully downloaded..
         /// </summary>
diff --git a/EnvyUpdate/Properties/Resources.de.resx b/EnvyUpdate/Properties/Resources.de.resx
index 96ebd90..b5a18f5 100644
--- a/EnvyUpdate/Properties/Resources.de.resx
+++ b/EnvyUpdate/Properties/Resources.de.resx
@@ -135,6 +135,9 @@
   <data name="info_download_running" xml:space="preserve">
     <value>Ein Downloadvorgang läuft bereits!</value>
   </data>
+  <data name="info_download_running_title" xml:space="preserve">
+    <value>Download läuft</value>
+  </data>
   <data name="info_download_success" xml:space="preserve">
     <value>Treiber-Installationsdatei erfolgreich heruntergeladen.</value>
   </data>
diff --git a/EnvyUpdate/Properties/Resources.resx b/EnvyUpdate/Properties/Resources.resx
index f003fa4..2623dae 100644
--- a/EnvyUpdate/Properties/Resources.resx
+++ b/EnvyUpdate/Properties/Resources.resx
@@ -135,6 +135,9 @@
   <data name="info_download_running" xml:space="preserve">
     <value>A download process is already running!</value>
   </data>
+  <data name="info_download_running_title" xml:space="preserve">
+    <value>Download running</value>
+  </data>
   <data name="info_download_success" xml:space="preserve">
     <value>Driver installer successfully downloaded.</value>
   </data>
diff --git a/EnvyUpdate/SettingsPage.xaml.cs b/EnvyUpdate/SettingsPage.xaml.cs
index 1aa8e7f..e65aa94 100644
--- a/EnvyUpdate/SettingsPage.xaml.cs
+++ b/EnvyUpdate/SettingsPage.xaml.cs
@@ -33,6 +33,13 @@ namespace EnvyUpdate
             if (GlobalVars.autoDownload)
                 chkAutodl.IsChecked = true;
 
+            if (GlobalVars.isDownloading)
+            {
+                chkAppdata.IsEnabled = false;
+            }
+            else
+                chkAppdata.IsEnabled = true;
+
             textBoxLicEnvyupdate.Text = Properties.Licenses.EnvyUpdate;
             textBoxLicFody.Text = Properties.Licenses.Fody;
             textBoxLicCostura.Text = Properties.Licenses.CosturaFody;

From b0190233441dc23f05d3ac7fce538e7679945ef8 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 26 Feb 2024 20:05:47 +0100
Subject: [PATCH 62/69] bump version

---
 EnvyUpdate/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/Properties/AssemblyInfo.cs b/EnvyUpdate/Properties/AssemblyInfo.cs
index 7420f2a..b9441b1 100644
--- a/EnvyUpdate/Properties/AssemblyInfo.cs
+++ b/EnvyUpdate/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.5")]
-[assembly: AssemblyFileVersion("3.5")]
+[assembly: AssemblyVersion("3.6")]
+[assembly: AssemblyFileVersion("3.6")]

From 09730bfbaf9e9f413c45286f7dd72a9fbde1f1ca Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Tue, 12 Mar 2024 18:24:51 +0100
Subject: [PATCH 63/69] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1238dbe..2335707 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ If EnvyUpdate fails to write to the folder containing the exe file, this option
 
 The application should be compatible with all Nvidia GeForce GPUs that have their drivers available on the nvidia.com download page and runs on Windows 10 and up.
 
-It is tested with GeForce Series GPUs. Generally others might work, but they are (currently) untested.
+It is tested with GeForce Series GPUs. Other series (e.g. Quadro) are unlikely to work and are not supported - if you have a Quadro card and are willing to implement support for them, feel free to reach out or create a PR.
 
 ## Development
 

From 672449fb3ec9bfb24b54fe6aa0ca04f5c516f692 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Tue, 6 Aug 2024 10:39:45 +0200
Subject: [PATCH 64/69] Update Nuget

---
 EnvyUpdate/EnvyUpdate.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/EnvyUpdate/EnvyUpdate.csproj b/EnvyUpdate/EnvyUpdate.csproj
index 4dd0c93..cc7331b 100644
--- a/EnvyUpdate/EnvyUpdate.csproj
+++ b/EnvyUpdate/EnvyUpdate.csproj
@@ -271,7 +271,7 @@
       <Version>5.7.0</Version>
     </PackageReference>
     <PackageReference Include="Fody">
-      <Version>6.8.0</Version>
+      <Version>6.8.1</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -282,7 +282,7 @@
       <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Json">
-      <Version>7.0.3</Version>
+      <Version>8.0.4</Version>
     </PackageReference>
     <PackageReference Include="WPF-UI">
       <Version>2.1.0</Version>

From c46294b46b31bec34a543d3117747fe8704d0c13 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Thu, 24 Oct 2024 09:29:38 +0200
Subject: [PATCH 65/69] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2335707..235b75a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Important Information
-NVIDIA is planning to release their new "[NVIDIA App](https://www.nvidia.com/en-us/software/nvidia-app/)", which will **replace** GeForce Experience and the Control Center. I do not yet know how the new driver package will look like, therefore I cannot guarantee that the update to that new driver that includes the new app will work properly when it releases. I will attempt to test it as soon as it is available.
+I am no longer working on this project and I am looking for a new maintainer. Please see [the corresponding issue](https://github.com/fyr77/EnvyUpdate/issues/53) for more details.
 
 ![Logo](https://github.com/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
 

From 0a5227b0719ca7adf3c0e274193a47b47e9db525 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Thu, 24 Oct 2024 15:54:30 +0200
Subject: [PATCH 66/69] Update README.md

---
 README.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 235b75a..67f3438 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Important Information
-I am no longer working on this project and I am looking for a new maintainer. Please see [the corresponding issue](https://github.com/fyr77/EnvyUpdate/issues/53) for more details.
+## I am no longer working on this project and I am looking for a new maintainer. Please see [the corresponding issue](https://github.com/fyr77/EnvyUpdate/issues/53) for more details.
 
 ![Logo](https://github.com/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
 
@@ -14,11 +14,9 @@ I am no longer working on this project and I am looking for a new maintainer. Pl
 
 Download the [latest release](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.exe) (or as a [.zip](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.zip)) and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed.
 
-Legacy 2.x versions (old UI, no automatic driver installation) will continue to be supported and fixed for the time being. Please see [the v2 branch](https://github.com/fyr77/EnvyUpdate/tree/v2) for these.
-
 The application itself does not update itself. If you notice any bugs or issues, be sure to check for a new version on GitHub!
 
-Enabling Autostart will create a shortcut of EnvyUpdate in the Windows startup folder.
+Enabling Autostart will create a shortcut of EnvyUpdate in the Windows startup folder (shell:startup).
 
 ### Virus warnings
 
@@ -40,7 +38,7 @@ It is tested with GeForce Series GPUs. Other series (e.g. Quadro) are unlikely t
 
 ## Development
 
-This application is currently maintained and developed by me (fyr77) alone in my free time. 
+This application is currently unmaintained and developed by me (fyr77) alone in my free time. 
 
 I always try to implement critical fixes as fast as I can, but other features and minor bug fixes may take a few days or weeks to implement. 
 

From 625e509ede2e5159fa0430bb6980010b97aee1ea Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Fri, 18 Jul 2025 12:03:32 +0200
Subject: [PATCH 67/69] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 67f3438..05d6f89 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Important Information
-## I am no longer working on this project and I am looking for a new maintainer. Please see [the corresponding issue](https://github.com/fyr77/EnvyUpdate/issues/53) for more details.
+## I am no longer working on this project and I am looking for a new maintainer. Please see [the corresponding issue](https://vcs.diluvian.cc/fyr77/EnvyUpdate/issues/53) for more details.
 
 ![Logo](https://github.com/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
 

From 18816f3fbeea3dedc1fc5b27e45f4709af0f9ccb Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 21 Jul 2025 11:15:54 +0200
Subject: [PATCH 68/69] fix links

---
 README.md | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 05d6f89..28b452c 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,14 @@
 # Important Information
 ## I am no longer working on this project and I am looking for a new maintainer. Please see [the corresponding issue](https://vcs.diluvian.cc/fyr77/EnvyUpdate/issues/53) for more details.
 
-![Logo](https://github.com/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
+![Logo](https://https://vcs.diluvian.cc/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
 
 # EnvyUpdate
- A small portable update checker application for Nvidia GPUs
- 
- ![License](https://img.shields.io/github/license/fyr77/envyupdate?style=for-the-badge)
- ![Issues](https://img.shields.io/github/issues/fyr77/envyupdate?style=for-the-badge)
- ![Version](https://img.shields.io/github/v/release/fyr77/envyupdate?style=for-the-badge)
+A small portable update checker application for Nvidia GPUs
  
 ## How to use
 
-Download the [latest release](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.exe) (or as a [.zip](https://github.com/fyr77/EnvyUpdate/releases/latest/download/EnvyUpdate.zip)) and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed.
+Download the latest release and run it. Windows SmartScreen Messages can be safely ignored. They only happen because this project is not digitally signed.
 
 The application itself does not update itself. If you notice any bugs or issues, be sure to check for a new version on GitHub!
 
@@ -55,7 +51,7 @@ EnvyUpdate is not a replacement for any of these tools. I will still try to impl
 
 ## Licenses
 
-* This project: [MIT](https://github.com/fyr77/EnvyUpdate/blob/master/LICENSE)
+* This project: [MIT](https://https://vcs.diluvian.cc/fyr77/EnvyUpdate/blob/master/LICENSE)
 * Fody (dependency of Costura.Fody): [MIT](https://github.com/Fody/Fody/blob/master/License.txt)
 * Costura.Fody (for embedding DLLs into the main executable): [MIT](https://github.com/Fody/Costura/blob/develop/LICENSE)
 * Resource Embedder: [MIT](https://www.nuget.org/packages/Resource.Embedder/)

From 84dc1367d8491d864879c75bc55d6ced6b4517e1 Mon Sep 17 00:00:00 2001
From: fyr77 <git@notjakob.com>
Date: Mon, 21 Jul 2025 11:16:15 +0200
Subject: [PATCH 69/69] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 28b452c..cd44814 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Important Information
 ## I am no longer working on this project and I am looking for a new maintainer. Please see [the corresponding issue](https://vcs.diluvian.cc/fyr77/EnvyUpdate/issues/53) for more details.
 
-![Logo](https://https://vcs.diluvian.cc/fyr77/envyupdate/blob/master/res/banner_bg.png?raw=true)
+![Logo](https://vcs.diluvian.cc/fyr77/EnvyUpdate/raw/branch/master/res/banner.png)
 
 # EnvyUpdate
 A small portable update checker application for Nvidia GPUs