diff --git a/src/TF2HUD.Editor/App.config b/src/TF2HUD.Editor/App.config
index ad90766a..62ebfefe 100644
--- a/src/TF2HUD.Editor/App.config
+++ b/src/TF2HUD.Editor/App.config
@@ -10,61 +10,61 @@
 	</configSections>
 	<userSettings>
 		<HUDEditor.Properties.Settings>
-			<setting name="hud_selected" serializeAs="String">
-				<value />
-			</setting>
-			<setting name="hud_directory" serializeAs="String">
-				<value />
-			</setting>
-			<setting name="user_language" serializeAs="String">
-				<value>en-US</value>
-			</setting>
-			<setting name="app_update_auto" serializeAs="String">
-				<value>True</value>
-			</setting>
-			<setting name="app_xhair_persist" serializeAs="String">
-				<value>False</value>
-			</setting>
-			<setting name="app_xhair_enabled" serializeAs="String">
-				<value>False</value>
-			</setting>
-			<setting name="app_xhair_style" serializeAs="String">
-				<value>$</value>
-			</setting>
-			<setting name="app_xhair_color" serializeAs="String">
-				<value />
-			</setting>
-			<setting name="app_xhair_size" serializeAs="String">
-				<value>0</value>
-			</setting>
-			<setting name="app_default_bg" serializeAs="String">
-				<value>https://user-images.githubusercontent.com/6818236/220803776-12f85855-a409-4555-8f76-e3877d04bab9.png</value>
-			</setting>
-		</HUDEditor.Properties.Settings>
+   <setting name="hud_selected" serializeAs="String">
+    <value />
+   </setting>
+   <setting name="hud_directory" serializeAs="String">
+    <value />
+   </setting>
+   <setting name="user_language" serializeAs="String">
+    <value>en-US</value>
+   </setting>
+   <setting name="app_update_auto" serializeAs="String">
+    <value>False</value>
+   </setting>
+   <setting name="app_xhair_persist" serializeAs="String">
+    <value>False</value>
+   </setting>
+   <setting name="app_xhair_enabled" serializeAs="String">
+    <value>False</value>
+   </setting>
+   <setting name="app_xhair_style" serializeAs="String">
+    <value>$</value>
+   </setting>
+   <setting name="app_xhair_color" serializeAs="String">
+    <value />
+   </setting>
+   <setting name="app_xhair_size" serializeAs="String">
+    <value>0</value>
+   </setting>
+   <setting name="app_default_bg" serializeAs="String">
+    <value>https://user-images.githubusercontent.com/6818236/220803776-12f85855-a409-4555-8f76-e3877d04bab9.png</value>
+   </setting>
+  </HUDEditor.Properties.Settings>
 	</userSettings>
 	<applicationSettings>
 		<HUDEditor.Properties.Settings>
-			<setting name="app_docs" serializeAs="String">
-				<value>https://criticalflaw.ca/TF2HUD.Editor/</value>
-			</setting>
-			<setting name="json_file" serializeAs="String">
-				<value>https://raw.githubusercontent.com/CriticalFlaw/TF2HUD.Editor/master/src/TF2HUD.Editor/JSON/{0}</value>
-			</setting>
-			<setting name="json_list" serializeAs="String">
-				<value>https://api.github.com/repos/CriticalFlaw/TF2HUD.Editor/contents/src/TF2HUD.Editor/JSON</value>
-			</setting>
-			<setting name="app_tracker" serializeAs="String">
-				<value>https://github.com/CriticalFlaw/TF2HUD.Editor/issues</value>
-			</setting>
-			<setting name="app_update" serializeAs="String">
-				<value>https://github.com/CriticalFlaw/TF2HUD.Editor/releases/latest</value>
-			</setting>
-			<setting name="mastercomfig_vpk" serializeAs="String">
-				<value>https://github.com/mastercomfig/mastercomfig/releases/download/9.5.2/mastercomfig-transparent-viewmodels-addon.vpk</value>
-			</setting>
-			<setting name="tf2_hud_crosshairs_zip" serializeAs="String">
-				<value>https://github.com/Hypnootize/TF2-HUD-Crosshairs/archive/refs/heads/master.zip</value>
-			</setting>
-		</HUDEditor.Properties.Settings>
+   <setting name="app_docs" serializeAs="String">
+    <value>https://criticalflaw.ca/TF2HUD.Editor/</value>
+   </setting>
+   <setting name="json_file" serializeAs="String">
+    <value>https://raw.githubusercontent.com/CriticalFlaw/TF2HUD.Editor/master/src/TF2HUD.Editor/JSON/{0}</value>
+   </setting>
+   <setting name="json_list" serializeAs="String">
+    <value>https://api.github.com/repos/CriticalFlaw/TF2HUD.Editor/contents/src/TF2HUD.Editor/JSON</value>
+   </setting>
+   <setting name="app_tracker" serializeAs="String">
+    <value>https://github.com/CriticalFlaw/TF2HUD.Editor/issues</value>
+   </setting>
+   <setting name="app_update" serializeAs="String">
+    <value>https://github.com/CriticalFlaw/TF2HUD.Editor/releases/latest</value>
+   </setting>
+   <setting name="mastercomfig_vpk" serializeAs="String">
+    <value>https://github.com/mastercomfig/mastercomfig/releases/download/9.5.2/mastercomfig-transparent-viewmodels-addon.vpk</value>
+   </setting>
+   <setting name="tf2_hud_crosshairs_zip" serializeAs="String">
+    <value>https://github.com/Hypnootize/TF2-HUD-Crosshairs/archive/refs/heads/master.zip</value>
+   </setting>
+  </HUDEditor.Properties.Settings>
 	</applicationSettings>
 </configuration>
\ No newline at end of file
diff --git a/src/TF2HUD.Editor/App.xaml b/src/TF2HUD.Editor/App.xaml
index 294fcd1e..30cc9ca2 100644
--- a/src/TF2HUD.Editor/App.xaml
+++ b/src/TF2HUD.Editor/App.xaml
@@ -82,7 +82,7 @@
             <Setter Property="FormatString" Value="N0" />
             <Setter Property="Increment" Value="1" />
             <Setter Property="Width" Value="125" />
-            <Setter Property="AllowTextInput" Value="False" />
+            <Setter Property="AllowTextInput" Value="True" />
         </Style>
 
         <Style x:Key="CrosshairLabel" TargetType="Label">
@@ -166,28 +166,17 @@
         </Style>
 
         <Style x:Key="SettingButton" TargetType="Button" BasedOn="{StaticResource HudButton}">
-            <Setter Property="Width" Value="400" />
+            <Setter Property="Width" Value="263" />
+            <Setter Property="Margin" Value="10,10,0,20"/>
         </Style>
 
-        <Style x:Key="ToggleButton" TargetType="ToggleButton">
+        <Style x:Key="SettingCheckBox" TargetType="CheckBox">
             <Setter Property="FontFamily" Value="../Resources/Fonts/TF2Build.ttf #TF2 Build" />
-            <Setter Property="FontSize" Value="16px" />
+            <Setter Property="FontSize" Value="18px" />
             <Setter Property="Foreground" Value="#EBE2CA" />
-            <Setter Property="Background" Value="#776B5F" />
-            <Setter Property="Margin" Value="5" />
-            <Setter Property="Width" Value="400" />
+            <Setter Property="Margin" Value="10,0,0,0"/>
+            <Setter Property="Width" Value="700" />
             <Setter Property="Height" Value="40" />
-            <Style.Triggers>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="#934739" />
-                </Trigger>
-                <Trigger Property="IsEnabled" Value="False">
-                    <Setter Property="Foreground" Value="#2B2724" />
-                </Trigger>
-                <Trigger Property="IsChecked" Value="True">
-                    <Setter Property="Foreground" Value="#2B2724" />
-                </Trigger>
-            </Style.Triggers>
         </Style>
 
         <Style x:Key="LinkButton" TargetType="Button">
diff --git a/src/TF2HUD.Editor/HUDEditor.csproj b/src/TF2HUD.Editor/HUDEditor.csproj
index 88097c99..010d3bcc 100644
--- a/src/TF2HUD.Editor/HUDEditor.csproj
+++ b/src/TF2HUD.Editor/HUDEditor.csproj
@@ -11,9 +11,9 @@
 		<Company>CriticalFlaw</Company>
 		<Copyright>CriticalFlaw</Copyright>
 		<PackageProjectUrl>http://criticalflaw.ca/TF2HUD.Editor/</PackageProjectUrl>
-		<AssemblyVersion>3.3.0</AssemblyVersion>
-		<FileVersion>3.3.0</FileVersion>
-		<Version>3.3.0</Version>
+		<AssemblyVersion>3.4.0</AssemblyVersion>
+		<FileVersion>3.4.0</FileVersion>
+		<Version>3.4.0</Version>
 		<RepositoryUrl>https://github.com/CriticalFlaw/TF2HUD.Editor</RepositoryUrl>
 		<PackageIcon>logo.png</PackageIcon>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -55,11 +55,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
 		<PackageReference Include="CountryFlag.Wpf" Version="1.0.0" />
 		<PackageReference Include="Crews.Utility.TgaSharp" Version="1.0.0" />
 		<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.115" />
-		<PackageReference Include="log4net" Version="2.0.17" />
+		<PackageReference Include="log4net" Version="3.0.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="Octokit" Version="13.0.1" />
 		<PackageReference Include="WPFLocalizeExtension" Version="3.10.0" />
@@ -111,6 +111,13 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <None Update="Properties\Settings.settings">
+	    <Generator>SettingsSingleFileGenerator</Generator>
+	    <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+	  </None>
+	</ItemGroup>
+
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
 		<Exec Command="RD /S /Q &quot;$(TargetDir)ar&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)cs&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)cs-CZ&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)da&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)de&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)es&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)fr&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)hu&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)it&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)ja-JP&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)ko&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)nl&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)pl&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)pt&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)ro&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)ru&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)sk&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)th&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)tr&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)sv&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)zh&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)zh-Hans&quot;&#xD;&#xA;RD /S /Q &quot;$(TargetDir)zh-tw&quot;" />
 	</Target>
diff --git a/src/TF2HUD.Editor/JSON/budhud.json b/src/TF2HUD.Editor/JSON/budhud.json
index 0b8a852a..649b27cd 100644
--- a/src/TF2HUD.Editor/JSON/budhud.json
+++ b/src/TF2HUD.Editor/JSON/budhud.json
@@ -14,7 +14,7 @@
     "0 1 2 3",
     "0 1 2 3",
     "4 5 6 6",
-    "4 7 7 7"
+    "7 7 8 8"
   ],
   "Links": {
     "GitHub": "https://github.com/rbjaxter/budhud",
@@ -128,6 +128,13 @@
         "Type": "Checkbox",
         "Value": "false",
         "FileName": "bh_game_hidecontracker.res"
+      },
+      {
+        "Name": "bh_speedometer",
+        "Label": "Speedometer",
+        "Type": "Checkbox",
+        "Value": "false",
+        "FileName": "bh_speedometer.res"
       }
     ],
     "Health and Ammo": [
@@ -367,28 +374,61 @@
         }
       }
     ],
-    "Crosshair (Hypnotize's Unified Crosshair Pack)": [
+    "Engineer Customizations": [
       {
-        "Name": "bh_toggle_xhair_enable",
-        "Label": "Toggle Crosshair",
+        "Name": "bh_building_display_h",
+        "Label": "Building Display\nHorizontal Pos.",
+        "Type": "IntegerUpDown",
+        "Value": "0",
+        "Minimum": "0",
+        "Maximum": "1000",
+        "Increment": "1",
+        "Width": 140,
+        "ToolTip": "Increase the number to move the display to the right.",
+        "Files": {
+          "_budhud/scripts/hudlayout.res": {
+            "bh_BuildPin": {
+              "xpos": "$value"
+            }
+          }
+        }
+      },
+      {
+        "Name": "bh_building_display_v",
+        "Label": "Building Display\nVertical Pos.",
+        "Type": "IntegerUpDown",
+        "Value": "105",
+        "Minimum": "0",
+        "Maximum": "1000",
+        "Increment": "1",
+        "Width": 140,
+        "ToolTip": "Increase the number to move the display down.",
+        "Files": {
+          "_budhud/scripts/hudlayout.res": {
+            "bh_BuildPin": {
+              "ypos": "$value"
+            }
+          }
+        }
+      },
+      {
+        "Name": "bh_metal_position",
+        "Label": "Metal Count Under XHair",
         "Type": "Checkbox",
-        "ToolTip": "Toggle crosshair feature.",
         "Value": "false",
         "Files": {
-          "#customization/_enabled/bh_crosshairs.res": {
-            "hud_crosshair_1": {
-              "visible": {
-                "true": "1",
-                "false": "0"
-              },
-              "enabled": {
-                "true": "1",
-                "false": "0"
+          "_budhud/scripts/hudlayout.res": {
+            "CHudAccountPanel": {
+              "ypos": {
+                "true": "c-3",
+                "false": "c110"
               }
             }
           }
         }
-      },
+      }
+    ],
+    "Crosshair (Hypnotize's Unified Crosshair Pack)": [
       {
         "Name": "bh_val_xhair_style",
         "Label": "Style",
@@ -451,6 +491,27 @@
             }
           }
         }
+      },
+      {
+        "Name": "bh_toggle_xhair_enable",
+        "Label": "Show Crosshair",
+        "Type": "Checkbox",
+        "ToolTip": "Toggle crosshair feature.",
+        "Value": "false",
+        "Files": {
+          "#customization/_enabled/bh_crosshairs.res": {
+            "hud_crosshair_1": {
+              "visible": {
+                "true": "1",
+                "false": "0"
+              },
+              "enabled": {
+                "true": "1",
+                "false": "0"
+              }
+            }
+          }
+        }
       }
     ]
   }
diff --git a/src/TF2HUD.Editor/MainWindow.xaml b/src/TF2HUD.Editor/MainWindow.xaml
index 33fc800d..9d28158d 100644
--- a/src/TF2HUD.Editor/MainWindow.xaml
+++ b/src/TF2HUD.Editor/MainWindow.xaml
@@ -12,7 +12,7 @@
         WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
-        ResizeMode="NoResize"
+        ResizeMode="CanResizeWithGrip"
         FontFamily="../Resources/Fonts/TF2Secondary.ttf #TF2 Secondary"
         FontSize="20px">
 
@@ -23,6 +23,8 @@
                 <Grid>
                     <Image Source="../Resources/Images/favicon.ico" Height="20" HorizontalAlignment="Left" Margin="5"/>
                     <TextBlock Text="{lex:Loc ui_title}" VerticalAlignment="Center" Margin="30,0,0,0" Foreground="#EBE2CA" FontFamily="../Resources/Fonts/TF2Build.ttf #TF2 Build" FontSize="16px" />
+                    <Button Content="_" HorizontalAlignment="Right" Margin="0,0,60,0" Width="30" Height="30" Click="Minimize_Click"  FontFamily="../Resources/Fonts/TF2Build.ttf #TF2 Build" />
+                    <Button Content="&#9744;" HorizontalAlignment="Right" Margin="0,0,30,0" Width="30" Height="30" Click="Maximize_Click"  FontFamily="../Resources/Fonts/TF2Build.ttf #TF2 Build" />
                     <Button Content="X" HorizontalAlignment="Right" Width="30" Height="30" Click="CloseButton_Click" FontFamily="../Resources/Fonts/TF2Build.ttf #TF2 Build" />
                 </Grid>
             </Border>
diff --git a/src/TF2HUD.Editor/MainWindow.xaml.cs b/src/TF2HUD.Editor/MainWindow.xaml.cs
index 63254228..f0922406 100644
--- a/src/TF2HUD.Editor/MainWindow.xaml.cs
+++ b/src/TF2HUD.Editor/MainWindow.xaml.cs
@@ -45,11 +45,9 @@ public MainWindow()
 
             // Check for tf/custom directory
             SetupDirectory();
-
-#if !DEBUG
+          
             // Check for updates
-            UpdateAppSchema(true);
-#endif
+            if (Settings.Default.app_update_auto == true) UpdateAppSchema(true);
         }
 
         private void MainWindowViewModelPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -236,5 +234,15 @@ private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
             Close();
         }
+
+        private void Minimize_Click(object sender, RoutedEventArgs e)
+        {
+            this.WindowState = WindowState.Minimized;
+        }
+
+        private void Maximize_Click(object sender, RoutedEventArgs e)
+        {
+            this.WindowState = this.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/TF2HUD.Editor/Properties/Resources.Designer.cs b/src/TF2HUD.Editor/Properties/Resources.Designer.cs
index caf8912a..09309a5f 100644
--- a/src/TF2HUD.Editor/Properties/Resources.Designer.cs
+++ b/src/TF2HUD.Editor/Properties/Resources.Designer.cs
@@ -403,7 +403,7 @@ public static string ui_browse {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Automatically check for updates..
+        ///   Looks up a localized string similar to Auto-update files (Disable if doing local edits).
         /// </summary>
         public static string ui_check_updates {
             get {
@@ -421,7 +421,7 @@ public static string ui_clear {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Clear Cache.
+        ///   Looks up a localized string similar to Clear Cache Files.
         /// </summary>
         public static string ui_clear_cache {
             get {
@@ -439,7 +439,7 @@ public static string ui_customize {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Set path to tf/custom.
+        ///   Looks up a localized string similar to Change tf/custom path.
         /// </summary>
         public static string ui_directory {
             get {
diff --git a/src/TF2HUD.Editor/Properties/Resources.resx b/src/TF2HUD.Editor/Properties/Resources.resx
index 151b150e..8bcf4bc0 100644
--- a/src/TF2HUD.Editor/Properties/Resources.resx
+++ b/src/TF2HUD.Editor/Properties/Resources.resx
@@ -229,7 +229,7 @@
     <value>Browse</value>
   </data>
   <data name="ui_check_updates" xml:space="preserve">
-    <value>Automatically check for updates.</value>
+    <value>Auto-update files (Disable if doing local edits)</value>
   </data>
   <data name="ui_clear" xml:space="preserve">
     <value>Clear</value>
@@ -238,7 +238,7 @@
     <value>Customize</value>
   </data>
   <data name="ui_directory" xml:space="preserve">
-    <value>Set path to tf/custom</value>
+    <value>Change tf/custom path</value>
   </data>
   <data name="ui_download" xml:space="preserve">
     <value>Download:</value>
@@ -280,7 +280,7 @@
     <value>Options</value>
   </data>
   <data name="ui_clear_cache" xml:space="preserve">
-    <value>Clear Cache</value>
+    <value>Clear Cache Files</value>
   </data>
   <data name="info_clear_cache" xml:space="preserve">
     <value>This option will delete all local schema and editor data files then restart the app. Would you like to continue?</value>
diff --git a/src/TF2HUD.Editor/Properties/Settings.Designer.cs b/src/TF2HUD.Editor/Properties/Settings.Designer.cs
index 4e0d0e1e..c257aa12 100644
--- a/src/TF2HUD.Editor/Properties/Settings.Designer.cs
+++ b/src/TF2HUD.Editor/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace HUDEditor.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.11.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -118,7 +118,7 @@ public string mastercomfig_vpk {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
         public bool app_update_auto {
             get {
                 return ((bool)(this["app_update_auto"]));
diff --git a/src/TF2HUD.Editor/Properties/Settings.settings b/src/TF2HUD.Editor/Properties/Settings.settings
index f2db2d0e..7e371e28 100644
--- a/src/TF2HUD.Editor/Properties/Settings.settings
+++ b/src/TF2HUD.Editor/Properties/Settings.settings
@@ -30,7 +30,7 @@
       <Value Profile="(Default)">https://github.com/mastercomfig/mastercomfig/releases/download/9.5.2/mastercomfig-transparent-viewmodels-addon.vpk</Value>
     </Setting>
     <Setting Name="app_update_auto" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
+      <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="app_xhair_persist" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
diff --git a/src/TF2HUD.Editor/SettingsWindow.xaml b/src/TF2HUD.Editor/SettingsWindow.xaml
index 71ddb53e..4cb88622 100644
--- a/src/TF2HUD.Editor/SettingsWindow.xaml
+++ b/src/TF2HUD.Editor/SettingsWindow.xaml
@@ -71,20 +71,28 @@
                                 <Button
                                     Content="{lex:Loc ui_directory}"
                                     Click="BtnSetDirectory_OnClick"
+                                    Width="263"
                                     Style="{StaticResource SettingButton}" />
                                 <Button
                                     Content="{lex:Loc ui_refresh}"
                                     Click="BtnRefresh_OnClick"
+                                    Width="263"
                                     Style="{StaticResource SettingButton}" />
                                 <Button
                                     Content="{lex:Loc ui_clear_cache}"
                                     Click="btnClearCache_Click"
+                                    Width="263"
                                     Style="{StaticResource SettingButton}" />
-                                <ToggleButton
+                                <CheckBox
                                     x:Name="BtnPersistXhair"
                                     Content="{lex:Loc ui_persist_xhair}"
                                     Click="BtnPersistXhair_Click"
-                                    Style="{StaticResource ToggleButton}" />
+                                    Style="{StaticResource SettingCheckBox}" />
+                                <CheckBox
+                                    x:Name="BtnAutoUpdate"
+                                    Content="{lex:Loc ui_check_updates}"
+                                    Click="BtnAutoUpdate_OnClick"
+                                    Style="{StaticResource SettingCheckBox}" />
                             </WrapPanel>
                         </GroupBox>
                     </StackPanel>
diff --git a/src/TF2HUD.Editor/SettingsWindow.xaml.cs b/src/TF2HUD.Editor/SettingsWindow.xaml.cs
index 55f8397f..157ba71f 100644
--- a/src/TF2HUD.Editor/SettingsWindow.xaml.cs
+++ b/src/TF2HUD.Editor/SettingsWindow.xaml.cs
@@ -18,6 +18,7 @@ public SettingsWindow()
             InitializeComponent();
 
             // Check for user selected settings.
+            BtnAutoUpdate.IsChecked = Settings.Default.app_update_auto;
             BtnPersistXhair.IsChecked = Settings.Default.app_xhair_persist;
         }
 
@@ -55,6 +56,12 @@ private void BtnRefresh_OnClick(object sender, RoutedEventArgs e)
             MainWindow.UpdateAppSchema(false);
         }
 
+        private void BtnAutoUpdate_OnClick(object sender, RoutedEventArgs e)
+        {
+            Settings.Default.app_update_auto = BtnAutoUpdate.IsChecked ?? true;
+            Settings.Default.Save();
+        }
+
         private void BtnPersistXhair_Click(object sender, RoutedEventArgs e)
         {
             Settings.Default.app_xhair_persist = BtnPersistXhair.IsChecked ?? true;
diff --git a/src/TF2HUD.Editor/Views/AppInfoView.xaml b/src/TF2HUD.Editor/Views/AppInfoView.xaml
index d1714f6f..cbab1619 100644
--- a/src/TF2HUD.Editor/Views/AppInfoView.xaml
+++ b/src/TF2HUD.Editor/Views/AppInfoView.xaml
@@ -19,14 +19,13 @@
             <Run Text="linked below." />
         </TextBlock>
         <Border Background="#A49E9E" HorizontalAlignment="Stretch" Height="1" Margin="0,15,0,10" />
-        <Label Content="Version 3.3" Style="{StaticResource HeaderText}" Margin="0,0,0,10" />
+        <Label Content="Version 3.4" Style="{StaticResource HeaderText}" Margin="0,0,0,10" />
         <TextBlock Style="{StaticResource BodyText}" FontSize="22" TextAlignment="Left">
-            <Run Text="> Updated the user interface." /><LineBreak />
-            <Run Text="> Updated to work with 64-bit TF2." /><LineBreak />
-            <Run Text="> Updated logging to be more detailed." /><LineBreak />
-            <Run Text="> Added a clear cache option to fix schema issues." /><LineBreak />
-            <Run Text="> Fixed a crash on startup caused by missing schemas." /><LineBreak />
-            <Run Text="> Upgraded the app to .NET 8.0." /><LineBreak />
+            <Run Text="> Reimplemented window resizing" /><LineBreak />
+            <Run Text="> Reimplemented automated update checking" /><LineBreak />
+            <Run Text="> Fixed local schema changes being overwritten" /><LineBreak />
+            <Run Text="> Fixed number pickers not allowing user input" /><LineBreak />
+            <Run Text="> Updated nuget packages to latest versions" /><LineBreak />
             <LineBreak />
         </TextBlock>
     </StackPanel>