From 46997c6e71e1760a3738e2474886b74563281805 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Sat, 18 Jun 2022 15:29:22 +1000
Subject: [PATCH] Setting Find Changes

- added a find window to find setting in the settings control.
---
 src/ARKServerManager/ARKServerManager.csproj  |   7 +
 .../Globalization/en-US/en-US.xaml            |  10 +
 src/ARKServerManager/Styles/Default.xaml      |   6 +
 .../UserControls/ServerSettingsControl.xaml   | 477 +++++++++---------
 .../ServerSettingsControl.xaml.cs             | 107 +++-
 src/ARKServerManager/VersionFeed.xml          |  13 +-
 src/ARKServerManager/VersionFeedBeta.xml      |  25 +-
 .../Windows/FindSettingWindow.xaml            |  36 ++
 .../Windows/FindSettingWindow.xaml.cs         | 164 ++++++
 .../AnnotatedCheckBoxAndFloatSlider.xaml.cs   |   9 +
 .../AnnotatedCheckBoxAndIntegerSlider.xaml.cs |   9 +
 .../AnnotatedCheckBoxAndLongSlider.xaml.cs    |   9 +
 .../Controls/AnnotatedSlider.xaml.cs          |  20 +-
 .../Controls/CheckBoxAndTextBlock.xaml        |  19 +
 .../Controls/CheckBoxAndTextBlock.xaml.cs     |  48 ++
 .../Extensions/StringExtensions.cs            |  17 +
 .../ServerManager.Common.csproj               |   5 +
 src/ServerManager.Common/Utils/WindowUtils.cs |  56 +-
 18 files changed, 774 insertions(+), 263 deletions(-)
 create mode 100644 src/ARKServerManager/Windows/FindSettingWindow.xaml
 create mode 100644 src/ARKServerManager/Windows/FindSettingWindow.xaml.cs
 create mode 100644 src/ServerManager.Common/Controls/CheckBoxAndTextBlock.xaml
 create mode 100644 src/ServerManager.Common/Controls/CheckBoxAndTextBlock.xaml.cs
 create mode 100644 src/ServerManager.Common/Extensions/StringExtensions.cs

diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj
index d17c1431..ad86fc83 100644
--- a/src/ARKServerManager/ARKServerManager.csproj
+++ b/src/ARKServerManager/ARKServerManager.csproj
@@ -264,6 +264,9 @@
     <Compile Include="Windows\DataDirectoryWindow.xaml.cs">
       <DependentUpon>DataDirectoryWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Windows\FindSettingWindow.xaml.cs">
+      <DependentUpon>FindSettingWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\PlayerListWindow.xaml.cs">
       <DependentUpon>PlayerListWindow.xaml</DependentUpon>
     </Compile>
@@ -458,6 +461,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Windows\FindSettingWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Windows\PlayerListWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index 17dfe7f8..c41346d9 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -993,6 +993,8 @@
     <!--#endregion-->
 
     <!--#region Server Settings - General Buttons -->
+    <sys:String x:Key="ServerSettings_SettingFindButtonLabel">Find</sys:String>
+    <sys:String x:Key="ServerSettings_SettingFindButtonTooltip">Find Setting</sys:String>
     <sys:String x:Key="ServerSettings_SupportZipButtonLabel">Create Support Zip</sys:String>
     <sys:String x:Key="ServerSettings_SupportZipButtonTooltip">Create a zip file that contains all the files necessary for use by the server manager support team to diagnose a problem.</sys:String>
     <sys:String x:Key="ServerSettings_SyncProfileButtonLabel">Sync</sys:String>
@@ -5741,5 +5743,13 @@
     <sys:String x:Key="DiscordBot_CountLabel">Count:</sys:String>
     <sys:String x:Key="DiscordBot_MapLabel">Map:</sys:String>
     <!--#endregion-->
+    
+    <!--#region Find Setting Window -->
+    <sys:String x:Key="FindSettingWindow_Title">Find Settings</sys:String>
+
+    <sys:String x:Key="FindSettingWindow_NotFoundErrorLabel">The setting was not found: {0}</sys:String>
+
+    <sys:String x:Key="FindSettingWindow_FindButtonLabel">Find</sys:String>
+    <!--#endregion-->
 
 </Globalization:GlobalizationResourceDictionary>
\ No newline at end of file
diff --git a/src/ARKServerManager/Styles/Default.xaml b/src/ARKServerManager/Styles/Default.xaml
index 761bb608..23d2a652 100644
--- a/src/ARKServerManager/Styles/Default.xaml
+++ b/src/ARKServerManager/Styles/Default.xaml
@@ -576,6 +576,12 @@
             <Label Content="{DynamicResource ServerMonitor_Title}" VerticalAlignment="Center" Padding="0"/>
         </StackPanel>
     </ContentControl>
+    <ContentControl x:Key="SettingFindButtonContent">
+        <StackPanel Orientation="Horizontal" Height="27">
+            <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Find.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
+            <Label Content="{DynamicResource ServerSettings_SettingFindButtonLabel}" VerticalAlignment="Center"/>
+        </StackPanel>
+    </ContentControl>
     <ContentControl x:Key="SupportZipButtonContent">
         <StackPanel Orientation="Horizontal" Height="27">
             <Image Margin="5,0,5,0" Source="{com:Icon Path=/Ark Server Manager;component/Art/Zip.ico,Size=32}" Width="16" VerticalAlignment="Center"/>
diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
index 3dac235a..9a3055e6 100644
--- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
@@ -210,16 +210,18 @@
                         <ColumnDefinition Width="Auto" MinWidth="60"/>
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
                     <StackPanel Grid.Row="0" Grid.Column="0" DataContext="{Binding Profile}" Orientation="Horizontal" >
                         <Label Margin="2,0,0,0" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_ProfileIdLabel}" ToolTip="{DynamicResource ServerSettings_ProfileIdTooltip}"/>
                         <Label VerticalAlignment="Center" Content="{Binding ProfileID}" ToolTip="{DynamicResource ServerSettings_ProfileIdTooltip}"/>
                     </StackPanel>
-                    <Button Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Margin="2" Click="CreateSupportZip_Click" Content="{StaticResource SupportZipButtonContent}" ToolTip="{DynamicResource ServerSettings_SupportZipButtonTooltip}"/>
-                    <Button Grid.Row="0" Grid.Column="3" Margin="2" Click="SyncProfile_Click" Content="{StaticResource SyncProfileButtonContent}" ToolTip="{DynamicResource ServerSettings_SyncProfileButtonTooltip}"/>
+                    <Button Grid.Row="0" Grid.Column="1" Margin="2" Click="SettingFind_Click" Content="{StaticResource SettingFindButtonContent}" ToolTip="{DynamicResource ServerSettings_SettingFindButtonTooltip}"/>
+                    <Button Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Margin="2" Click="CreateSupportZip_Click" Content="{StaticResource SupportZipButtonContent}" ToolTip="{DynamicResource ServerSettings_SupportZipButtonTooltip}"/>
+                    <Button Grid.Row="0" Grid.Column="4" Margin="2" Click="SyncProfile_Click" Content="{StaticResource SyncProfileButtonContent}" ToolTip="{DynamicResource ServerSettings_SyncProfileButtonTooltip}"/>
 
-                    <DockPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" VerticalAlignment="Center" >
+                    <DockPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="2" DataContext="{Binding Profile}" VerticalAlignment="Center" >
                         <Label DockPanel.Dock="Left" FontSize="15" Content="{DynamicResource ServerSettings_ProfileLabel}" ToolTip="{Binding ProfileToolTip}"/>
                         <TextBox VerticalContentAlignment="Center" SourceUpdated="ProfileName_SourceUpdated">
                             <Validation.ErrorTemplate>
@@ -239,10 +241,10 @@
                             </TextBox.Text>
                         </TextBox>
                     </DockPanel>
-                    <Button Grid.Row="1" Grid.Column="2" Margin="2" Content="{StaticResource ImportButtonContent}" ToolTip="{DynamicResource ServerSettings_ImportButtonTooltip}" Click="Load_Click" />
-                    <Button Grid.Row="1" Grid.Column="3" Margin="2" Content="{StaticResource SaveButtonContent}" ToolTip="{DynamicResource ServerSettings_SaveButtonTooltip}" Command="{Binding SaveCommand, ElementName=SettingsControl}" CommandParameter="{Binding}" />
+                    <Button Grid.Row="1" Grid.Column="3" Margin="2" Content="{StaticResource ImportButtonContent}" ToolTip="{DynamicResource ServerSettings_ImportButtonTooltip}" Click="Load_Click" />
+                    <Button Grid.Row="1" Grid.Column="4" Margin="2" Content="{StaticResource SaveButtonContent}" ToolTip="{DynamicResource ServerSettings_SaveButtonTooltip}" Command="{Binding SaveCommand, ElementName=SettingsControl}" CommandParameter="{Binding}" />
 
-                    <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" Style="{StaticResource BorderFillLightStyle}">
+                    <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Margin="2" DataContext="{Binding Profile}" Style="{StaticResource BorderFillLightStyle}">
                         <Grid VerticalAlignment="Center">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
@@ -303,7 +305,7 @@
                             </Button>
                         </Grid>
                     </Border>
-                    <Button Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Runtime}" Click="Upgrade_Click">
+                    <Button Grid.Row="2" Grid.Column="3" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Runtime}" Click="Upgrade_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Style.Triggers>
@@ -346,7 +348,7 @@
                         </Button.Style>
                     </Button>
 
-                    <Border Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="2" DataContext="{Binding Profile}" ToolTip="{DynamicResource ServerSettings_InstallLocationTooltip}" Style="{StaticResource BorderFillLightStyle}">
+                    <Border Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Margin="2" DataContext="{Binding Profile}" ToolTip="{DynamicResource ServerSettings_InstallLocationTooltip}" Style="{StaticResource BorderFillLightStyle}">
                         <Grid VerticalAlignment="Center" >
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
@@ -361,7 +363,7 @@
                             </Button>
                         </Grid>
                     </Border>
-                    <Button Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" Margin="2" Content="{StaticResource LocationButtonContent}" DataContext="{Binding Runtime}" Click="SelectInstallDirectory_Click">
+                    <Button Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="2" Margin="2" Content="{StaticResource LocationButtonContent}" DataContext="{Binding Runtime}" Click="SelectInstallDirectory_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Style.Triggers>
@@ -396,7 +398,7 @@
                         </Button.Style>
                     </Button>
 
-                    <Grid Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" DataContext="{Binding Runtime}" >
+                    <Grid Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="3" DataContext="{Binding Runtime}" >
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"/>
                             <ColumnDefinition Width="*"/>
@@ -446,7 +448,7 @@
                             </StackPanel>
                         </Border>
                     </Grid>
-                    <Button Grid.Row="4" Grid.Column="2" Margin="2" DataContext="{Binding Runtime}" Click="Start_Click">
+                    <Button Grid.Row="4" Grid.Column="3" Margin="2" DataContext="{Binding Runtime}" Click="Start_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Style.Triggers>
@@ -490,7 +492,7 @@
                             </Style>
                         </Button.Style>
                     </Button>
-                    <Button Grid.Row="4" Grid.Column="3" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource OpenRCONButtonContent}" ToolTip="{DynamicResource ServerSettings_RCONButtonTooltip}" Click="OpenRCON_Click">
+                    <Button Grid.Row="4" Grid.Column="4" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource OpenRCONButtonContent}" ToolTip="{DynamicResource ServerSettings_RCONButtonTooltip}" Click="OpenRCON_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Setter Property="Visibility" Value="Visible"/>
@@ -502,7 +504,7 @@
                             </Style>
                         </Button.Style>
                     </Button>
-                    <Button Grid.Row="4" Grid.Column="3" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource PlayerListButtonContent}" ToolTip="{DynamicResource ServerSettings_PlayerListButtonTooltip}" Click="OpenPlayerList_Click">
+                    <Button Grid.Row="4" Grid.Column="4" Margin="2" DataContext="{Binding Profile}" Content="{StaticResource PlayerListButtonContent}" ToolTip="{DynamicResource ServerSettings_PlayerListButtonTooltip}" Click="OpenPlayerList_Click">
                         <Button.Style>
                             <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
                                 <Setter Property="Visibility" Value="Visible"/>
@@ -683,7 +685,7 @@
 
                                 <GroupBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="6" Style="{StaticResource GroupBoxStyle}">
                                     <GroupBox.Header>
-                                        <CheckBox IsChecked="{Binding RCONEnabled}" Content="{DynamicResource ServerSettings_RCONEnabledLabel}" ToolTip="{DynamicResource ServerSettings_RCONEnabledTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock IsChecked="{Binding RCONEnabled, Mode=TwoWay}" Text="{DynamicResource ServerSettings_RCONEnabledLabel}" ToolTip="{DynamicResource ServerSettings_RCONEnabledTooltip}"/>
                                     </GroupBox.Header>
 
                                     <Grid>
@@ -980,10 +982,10 @@
 
                                 <GroupBox Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="6" Style="{StaticResource GroupBoxStyle}">
                                     <GroupBox.Header>
-                                        <CheckBox Name="EnableExtinctionEvent" IsChecked="{Binding EnableExtinctionEvent}" Content="{DynamicResource ServerSettings_EnableExtinctionEventLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableExtinctionEventTooltip}" />
+                                        <cctl:CheckBoxAndTextBlock HorizontalAlignment="Left" IsChecked="{Binding EnableExtinctionEvent, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableExtinctionEventLabel}" ToolTip="{DynamicResource ServerSettings_EnableExtinctionEventTooltip}" />
                                     </GroupBox.Header>
 
-                                    <Grid Margin="1" IsEnabled="{Binding ElementName=EnableExtinctionEvent, Path=IsChecked}">
+                                    <Grid Margin="1" IsEnabled="{Binding EnableExtinctionEvent}">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="1*"/>
                                             <ColumnDefinition Width="Auto"/>
@@ -1038,30 +1040,30 @@
                                         <cctl:AnnotatedCheckBoxAndIntegerSlider Grid.Row="0" Grid.Column="2" Margin="20,1,5,1" Grid.ColumnSpan="2" Label="{DynamicResource ServerSettings_EnableIdleTimeoutLabel}" Suffix="{DynamicResource ServerSettings_IdleTimeoutUnits}" Value="{Binding KickIdlePlayersPeriod}" ToolTip="{DynamicResource ServerSettings_IdleTimeoutTooltip}" Minimum="60" Maximum="7200" VerticalAlignment="Center" LargeChange="300" SmallChange="60" TickFrequency="300" LabelRelativeWidth="Auto" SliderRelativeWidth="15*" SuffixRelativeWidth="Auto"/>
                                         
                                         <DockPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch">
-                                            <CheckBox DockPanel.Dock="Left" Margin="5" Name="EnableBanListCheckbox" IsChecked="{Binding EnableBanListURL}" Content="{DynamicResource ServerSettings_UseBanListLabel}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_UseBanListTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock DockPanel.Dock="Left" Margin="5" VerticalAlignment="Center" IsChecked="{Binding EnableBanListURL, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseBanListLabel}" ToolTip="{DynamicResource ServerSettings_UseBanListTooltip}"/>
                                             
                                             <Button  DockPanel.Dock="Right" ToolTip="{DynamicResource ServerSettings_ResetBanlistTooltip}" Style="{StaticResource ButtonStyle1}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.BanListProperty}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                             </Button>
 
-                                            <TextBox DockPanel.Dock="Left" Margin="1" Text="{Binding BanListURL}" ToolTip="{DynamicResource ServerSettings_BanListTooltip}" IsEnabled="{Binding ElementName=EnableBanListCheckbox, Path=IsChecked}"/>
+                                            <TextBox DockPanel.Dock="Left" Margin="1" Text="{Binding BanListURL}" ToolTip="{DynamicResource ServerSettings_BanListTooltip}" IsEnabled="{Binding EnableBanListURL}"/>
                                         </DockPanel>
 
-                                        <CheckBox Grid.Row="2" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding DisableValveAntiCheatSystem}" Content="{DynamicResource ServerSettings_DisableVACLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableVACTooltip}"/>
-                                        <CheckBox Grid.Row="3" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseBattlEye}" Content="{DynamicResource ServerSettings_UseBattlEyeLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseBattlEyeTooltip}"/>
-                                        <CheckBox Grid.Row="4" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding DisablePlayerMovePhysicsOptimization}" Content="{DynamicResource ServerSettings_DisablePMVOptimizationLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisablePMVOptimizationTooltip}"/>
-                                        <CheckBox Grid.Row="5" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding OutputServerLog}" Content="{DynamicResource ServerSettings_OutputServerLogLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_OutputServerLogTooltip}"/>
-                                        <CheckBox Grid.Row="6" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseAllAvailableCores}" Content="{DynamicResource ServerSettings_UseAllAvailableCoresLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseAllAvailableCoresTooltip}"/>
-                                        <CheckBox Grid.Row="7" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseCache}" Content="{DynamicResource ServerSettings_UseCacheLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseCacheTooltip}"/>
-                                        <CheckBox Grid.Row="8" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseNoHangDetection}" Content="{DynamicResource ServerSettings_UseNoHangDetectionLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseNoHangDetectionTooltip}"/>
-                                        <CheckBox Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5,5,0" IsChecked="{Binding NoDinos}" Content="{DynamicResource ServerSettings_NoDinosLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoDinosTooltip}"/>
-                                        <CheckBox Grid.Row="10" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding NoUnderMeshChecking}" Content="{DynamicResource ServerSettings_NoUnderMeshCheckingLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoUnderMeshCheckingTooltip}"/>
-                                        <CheckBox Grid.Row="11" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding NoUnderMeshKilling}" Content="{DynamicResource ServerSettings_NoUnderMeshKillingLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoUnderMeshKillingTooltip}"/>
-                                        <CheckBox Grid.Row="12" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseVivox}" Content="{DynamicResource ServerSettings_UseVivoxLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseVivoxTooltip}"/>
-                                        <CheckBox Grid.Row="13" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding AllowSharedConnections}" Content="{DynamicResource ServerSettings_AllowSharedConnectionsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowSharedConnectionsTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding DisableValveAntiCheatSystem, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableVACLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableVACTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="3" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseBattlEye, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseBattlEyeLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseBattlEyeTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="4" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding DisablePlayerMovePhysicsOptimization, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisablePMVOptimizationLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisablePMVOptimizationTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="5" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding OutputServerLog, Mode=TwoWay}" Text="{DynamicResource ServerSettings_OutputServerLogLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_OutputServerLogTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="6" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseAllAvailableCores, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseAllAvailableCoresLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseAllAvailableCoresTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="7" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseCache, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseCacheLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseCacheTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="8" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseNoHangDetection, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseNoHangDetectionLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseNoHangDetectionTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="9" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding NoDinos, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoDinosLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoDinosTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="10" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding NoUnderMeshChecking, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoUnderMeshCheckingLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoUnderMeshCheckingTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="11" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding NoUnderMeshKilling, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoUnderMeshKillingLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoUnderMeshKillingTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="12" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseVivox, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseVivoxLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseVivoxTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="13" Grid.Column="0" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding AllowSharedConnections, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowSharedConnectionsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowSharedConnectionsTooltip}"/>
 
-                                        <CheckBox Grid.Row="14" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" IsChecked="{Binding ForceRespawnDinos}" Content="{DynamicResource ServerSettings_ForceRespawnDinosLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceRespawnDinosTooltip}"/>
-                                        <CheckBox Grid.Row="15" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" IsChecked="{Binding EnableServerAutoForceRespawnWildDinosInterval}" Content="{DynamicResource ServerSettings_EnableServerAutoForceRespawnWildDinosIntervalLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableServerAutoForceRespawnWildDinosIntervalTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="14" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" IsChecked="{Binding ForceRespawnDinos, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ForceRespawnDinosLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceRespawnDinosTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="15" Grid.Column="0" Grid.ColumnSpan="4" Margin="5,5,5,0" IsChecked="{Binding EnableServerAutoForceRespawnWildDinosInterval, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableServerAutoForceRespawnWildDinosIntervalLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableServerAutoForceRespawnWildDinosIntervalTooltip}"/>
 
                                         <cctl:AnnotatedSlider Grid.Row="16" Grid.Column="0" Grid.ColumnSpan="4" Margin="20,1,5,1" Label="{DynamicResource ServerSettings_ServerAutoForceRespawnWildDinosIntervalLabel}" Value="{Binding ServerAutoForceRespawnWildDinosInterval, Converter={StaticResource SecondsToHoursConverter}}" Suffix="{DynamicResource SliderUnits_Hours}" Minimum="1" Maximum="720" SmallChange="1" LargeChange="24" TickFrequency="24" LabelRelativeWidth="Auto" SliderRelativeWidth="15*" SuffixRelativeWidth="Auto" ToolTip="{DynamicResource ServerSettings_ServerAutoForceRespawnWildDinosIntervalTooltip}" IsEnabled="{Binding EnableServerAutoForceRespawnWildDinosInterval, FallbackValue=False}"/>
 
@@ -1087,21 +1089,21 @@
 
                                         <Label Grid.Row="18" Grid.Column="0" Margin="20,0,5,0" Grid.ColumnSpan="2" Content="{DynamicResource ServerSettings_CrossArkClusterIdLabel}" ToolTip="{DynamicResource ServerSettings_CrossArkClusterIdTooltip}" VerticalAlignment="Center" MinWidth="200"/>
                                         <TextBox Grid.Row="18" Grid.Column="2" Margin="1,1,0,1" VerticalContentAlignment="Center" HorizontalAlignment="Stretch" Text="{Binding CrossArkClusterId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True}" ToolTip="{DynamicResource ServerSettings_CrossArkClusterIdTooltip}"/>
-                                        <CheckBox Grid.Row="18" Grid.Column="3" Margin="5,1,0,0" IsEnabled="{Binding CrossArkClusterId, Converter={StaticResource HasStringValueConverter}, FallbackValue=false}" IsChecked="{Binding ClusterDirOverride}" Content="{DynamicResource ServerSettings_ClusterDirOverrideLabel}" ToolTip="{DynamicResource ServerSettings_ClusterDirOverrideTooltip}" VerticalAlignment="Center" HorizontalAlignment="Left" UseLayoutRounding="False"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="18" Grid.Column="3" Margin="5,1,0,0" IsEnabled="{Binding CrossArkClusterId, Converter={StaticResource HasStringValueConverter}, FallbackValue=false}" IsChecked="{Binding ClusterDirOverride, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ClusterDirOverrideLabel}" ToolTip="{DynamicResource ServerSettings_ClusterDirOverrideTooltip}" VerticalAlignment="Center" HorizontalAlignment="Left" UseLayoutRounding="False"/>
 
-                                        <CheckBox Grid.Row="2" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding DisableAntiSpeedHackDetection}" Content="{DynamicResource ServerSettings_DisableAntiSpeedHackLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableAntiSpeedHackTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding DisableAntiSpeedHackDetection, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableAntiSpeedHackLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableAntiSpeedHackTooltip}"/>
                                         <cctl:AnnotatedSlider Grid.Row="3" Grid.Column="2" Margin="20,1,5,1" Grid.ColumnSpan="2" Label="{DynamicResource ServerSettings_AntiSpeedHackBiasLabel}" Value="{Binding SpeedHackBias}" Suffix="{DynamicResource ServerSettings_AntiSpeedHackBiasUnits}" Minimum="0.0" Maximum="1.0" SmallChange="0.1" LargeChange="0.25" TickFrequency="60" LabelRelativeWidth="Auto" SliderRelativeWidth="15*" SuffixRelativeWidth="Auto" ToolTip="{DynamicResource ServerSettings_AntiSpeedHackBiasTooltip}" />
-                                        <CheckBox Grid.Row="4" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ForceDirectX10}" Content="{DynamicResource ServerSettings_ForceDirectX10Label}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceDirectX10Tooltip}"/>
-                                        <CheckBox Grid.Row="5" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ForceShaderModel4}" Content="{DynamicResource ServerSettings_ForceShaderModel4Label}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceShaderModel4Tooltip}"/>
-                                        <CheckBox Grid.Row="6" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ForceLowMemory}" Content="{DynamicResource ServerSettings_ForceLowMemoryLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceLowMemoryTooltip}"/>
-                                        <CheckBox Grid.Row="7" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ForceNoManSky}" Content="{DynamicResource ServerSettings_ForceNoManSkyLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceNoManSkyTooltip}"/>
-                                        <CheckBox Grid.Row="8" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseNoMemoryBias}" Content="{DynamicResource ServerSettings_UseNoMemoryBiasLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseNoMemoryBiasTooltip}"/>
-                                        <CheckBox Grid.Row="9" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding StasisKeepControllers}" Content="{DynamicResource ServerSettings_StasisKeepControllersLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_StasisKeepControllersTooltip}"/>
-                                        <CheckBox Grid.Row="10" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ServerAllowAnsel}" Content="{DynamicResource ServerSettings_ServerAllowAnselLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ServerAllowAnselTooltip}"/>
-                                        <CheckBox Grid.Row="11" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding StructureMemoryOptimizations}" Content="{DynamicResource ServerSettings_StructureMemoryOptimizationsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_StructureMemoryOptimizationsTooltip}"/>
-                                        <CheckBox Grid.Row="12" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding Crossplay}" Content="{DynamicResource ServerSettings_CrossplayLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_CrossplayTooltip}">
-                                            <CheckBox.Style>
-                                                <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="4" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ForceDirectX10, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ForceDirectX10Label}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceDirectX10Tooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="5" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ForceShaderModel4, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ForceShaderModel4Label}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceShaderModel4Tooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="6" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ForceLowMemory, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ForceLowMemoryLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceLowMemoryTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="7" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ForceNoManSky, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ForceNoManSkyLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ForceNoManSkyTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="8" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding UseNoMemoryBias, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseNoMemoryBiasLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseNoMemoryBiasTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="9" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding StasisKeepControllers, Mode=TwoWay}" Text="{DynamicResource ServerSettings_StasisKeepControllersLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_StasisKeepControllersTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="10" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding ServerAllowAnsel, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ServerAllowAnselLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ServerAllowAnselTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="11" Grid.Column="2" Margin="5,5,5,0" Grid.ColumnSpan="2" IsChecked="{Binding StructureMemoryOptimizations, Mode=TwoWay}" Text="{DynamicResource ServerSettings_StructureMemoryOptimizationsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_StructureMemoryOptimizationsTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="12" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding Crossplay, Mode=TwoWay}" Text="{DynamicResource ServerSettings_CrossplayLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_CrossplayTooltip}">
+                                            <cctl:CheckBoxAndTextBlock.Style>
+                                                <Style TargetType="{x:Type cctl:CheckBoxAndTextBlock}">
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding Runtime.Status, ElementName=SettingsControl}" Value="{x:Null}">
                                                             <Setter Property="IsEnabled" Value="False"/>
@@ -1129,11 +1131,11 @@
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
-                                            </CheckBox.Style>
-                                        </CheckBox>
-                                        <CheckBox Grid.Row="12" Grid.Column="3" Margin="5,5,5,0" IsChecked="{Binding EnablePublicIPForEpic}" Content="{DynamicResource ServerSettings_EnablePublicIPForEpicLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePublicIPForEpicTooltip}">
-                                            <CheckBox.Style>
-                                                <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
+                                            </cctl:CheckBoxAndTextBlock.Style>
+                                        </cctl:CheckBoxAndTextBlock>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="12" Grid.Column="3" Margin="5,5,5,0" IsChecked="{Binding EnablePublicIPForEpic, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnablePublicIPForEpicLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePublicIPForEpicTooltip}">
+                                            <cctl:CheckBoxAndTextBlock.Style>
+                                                <Style TargetType="{x:Type cctl:CheckBoxAndTextBlock}">
                                                     <Setter Property="IsEnabled" Value="False"/>
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding Runtime.Status, ElementName=SettingsControl}" Value="{x:Null}">
@@ -1184,11 +1186,11 @@
                                                         </MultiDataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
-                                            </CheckBox.Style>
-                                        </CheckBox>
-                                        <CheckBox Grid.Row="13" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding EpicOnly}" Content="{DynamicResource ServerSettings_EpicOnlyLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EpicOnlyTooltip}">
-                                            <CheckBox.Style>
-                                                <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
+                                            </cctl:CheckBoxAndTextBlock.Style>
+                                        </cctl:CheckBoxAndTextBlock>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="13" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding EpicOnly, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EpicOnlyLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EpicOnlyTooltip}">
+                                            <cctl:CheckBoxAndTextBlock.Style>
+                                                <Style TargetType="{x:Type cctl:CheckBoxAndTextBlock}">
                                                     <Style.Triggers>
                                                         <DataTrigger Binding="{Binding Runtime.Status, ElementName=SettingsControl}" Value="{x:Null}">
                                                             <Setter Property="IsEnabled" Value="False"/>
@@ -1216,8 +1218,8 @@
                                                         </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
-                                            </CheckBox.Style>
-                                        </CheckBox>
+                                            </cctl:CheckBoxAndTextBlock.Style>
+                                        </cctl:CheckBoxAndTextBlock>
                                     </Grid>
                                 </GroupBox>
 
@@ -1244,24 +1246,24 @@
                                             <ColumnDefinition Width="1*"/>
                                         </Grid.ColumnDefinitions>
 
-                                        <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableServerAdminLogs}" Content="{DynamicResource ServerSettings_EnableAdminLogsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableAdminLogsTooltip}"/>
-                                        <CheckBox Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding ServerAdminLogsIncludeTribeLogs}" Content="{DynamicResource ServerSettings_ServerAdminLogsIncludeTribeLogsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ServerAdminLogsIncludeTribeLogsTooltip}"/>
-                                        <CheckBox Grid.Row="2" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding ServerRCONOutputTribeLogs}" Content="{DynamicResource ServerSettings_ServerRCONOutputTribeLogsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ServerRCONOutputTribeLogsTooltip}"/>
-                                        <CheckBox Grid.Row="3" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding AllowHideDamageSourceFromLogs}" Content="{DynamicResource ServerSettings_AllowHideDamageSourceFromLogsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowHideDamageSourceFromLogsTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableServerAdminLogs, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableAdminLogsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableAdminLogsTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding ServerAdminLogsIncludeTribeLogs, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ServerAdminLogsIncludeTribeLogsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ServerAdminLogsIncludeTribeLogsTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding ServerRCONOutputTribeLogs, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ServerRCONOutputTribeLogsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ServerRCONOutputTribeLogsTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="3" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding AllowHideDamageSourceFromLogs, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowHideDamageSourceFromLogsLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowHideDamageSourceFromLogsTooltip}"/>
 
                                         <StackPanel Grid.Row="0" Grid.Column="1" Margin="20,0,5,0" Orientation="Horizontal">
                                             <Label Content="{DynamicResource ServerSettings_MaxTribeLogsLabel}" ToolTip="{DynamicResource ServerSettings_MaxTribeLogsTooltip}" VerticalAlignment="Center"/>
                                             <TextBox Text="{Binding MaxTribeLogs}" Margin="10,1,0,1" VerticalContentAlignment="Center" Width="100" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_MaxTribeLogsTooltip}"/>
                                         </StackPanel>
-                                        <CheckBox Grid.Row="1" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AdminLogging}" Content="{DynamicResource ServerSettings_LogAdminChatLabel}" ToolTip="{DynamicResource ServerSettings_LogAdminChatTooltip}" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding NotifyAdminCommandsInChat}" Content="{DynamicResource ServerSettings_NotifyAdminCommandsInChatLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NotifyAdminCommandsInChatTooltip}"/>
-                                        <CheckBox Grid.Row="3" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding TribeLogDestroyedEnemyStructures}" Content="{DynamicResource ServerSettings_TribeLogDestroyedEnemyStructuresLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_TribeLogDestroyedEnemyStructuresTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AdminLogging, Mode=TwoWay}" Text="{DynamicResource ServerSettings_LogAdminChatLabel}" ToolTip="{DynamicResource ServerSettings_LogAdminChatTooltip}" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding NotifyAdminCommandsInChat, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NotifyAdminCommandsInChatLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NotifyAdminCommandsInChatTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="3" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding TribeLogDestroyedEnemyStructures, Mode=TwoWay}" Text="{DynamicResource ServerSettings_TribeLogDestroyedEnemyStructuresLabel}" VerticalAlignment="Center" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_TribeLogDestroyedEnemyStructuresTooltip}"/>
                                     </Grid>
                                 </GroupBox>
 
                                 <GroupBox Grid.Row="10" Grid.Column="0" Grid.ColumnSpan="6" Style="{StaticResource GroupBoxStyle}">
                                     <GroupBox.Header>
-                                        <CheckBox Name="EnableWebAlarmCheckbox" IsChecked="{Binding EnableWebAlarm}" Content="{DynamicResource ServerSettings_EnableWebAlarmLabel}" ToolTip="{DynamicResource ServerSettings_EnableWebAlarmTooltip}" />
+                                        <cctl:CheckBoxAndTextBlock Name="EnableWebAlarmCheckbox" IsChecked="{Binding EnableWebAlarm, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableWebAlarmLabel}" ToolTip="{DynamicResource ServerSettings_EnableWebAlarmTooltip}" />
                                     </GroupBox.Header>
 
                                     <Grid IsEnabled="{Binding ElementName=EnableWebAlarmCheckbox, Path=IsChecked}">
@@ -1314,9 +1316,9 @@
 
                                         <Label      Grid.Row="1" Grid.Column="0" Content="{DynamicResource ServerSettings_LauncherArgsLabel}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_LauncherArgsTooltip}"/>
                                         <TextBox    Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Margin="1" Text="{Binding LauncherArgs}" VerticalContentAlignment="Center" ToolTip="{DynamicResource ServerSettings_LauncherArgsTooltip}"/>
-                                        
-                                        <CheckBox   Grid.Row="2" Grid.Column="1" Margin="1" IsChecked="{Binding LauncherArgsOverride}" Content="{DynamicResource ServerSettings_LauncherArgsOverrideLabel}" ToolTip="{DynamicResource ServerSettings_LauncherArgsOverrideTooltip}" VerticalAlignment="Center" HorizontalAlignment="Left"/>
-                                        <CheckBox   Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="1" IsChecked="{Binding LauncherArgsPrefix}" IsEnabled="{Binding LauncherArgsOverride, Converter={StaticResource InvertBooleanConverter}}" Content="{DynamicResource ServerSettings_LauncherArgsPrefixLabel}" ToolTip="{DynamicResource ServerSettings_LauncherArgsPrefixTooltip}" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+
+                                        <cctl:CheckBoxAndTextBlock   Grid.Row="2" Grid.Column="1" Margin="1" IsChecked="{Binding LauncherArgsOverride, Mode=TwoWay}" Text="{DynamicResource ServerSettings_LauncherArgsOverrideLabel}" ToolTip="{DynamicResource ServerSettings_LauncherArgsOverrideTooltip}" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock   Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="1" IsChecked="{Binding LauncherArgsPrefix, Mode=TwoWay}" IsEnabled="{Binding LauncherArgsOverride, Converter={StaticResource InvertBooleanConverter}}" Text="{DynamicResource ServerSettings_LauncherArgsPrefixLabel}" ToolTip="{DynamicResource ServerSettings_LauncherArgsPrefixTooltip}" VerticalAlignment="Center" HorizontalAlignment="Left"/>
 
                                         <Label      Grid.Row="3" Grid.Column="0" Content="{DynamicResource ServerSettings_ServerArgsLabel}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_ServerArgsTooltip}"/>
                                         <TextBox    Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Margin="1" Text="{Binding AdditionalArgs}" VerticalContentAlignment="Center" ToolTip="{DynamicResource ServerSettings_ServerArgsTooltip}"/>
@@ -1391,10 +1393,10 @@
                                                 </Style>
                                             </Grid.Style>
 
-                                            <CheckBox Grid.Row="0" Margin="5,5,5,0" Content="{DynamicResource ServerSettings_AutoStartLabel}" IsChecked="{Binding EnableAutoStart}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_AutoStartTooltip}" HorizontalAlignment="Left"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Margin="5,5,5,0" Text="{DynamicResource ServerSettings_AutoStartLabel}" IsChecked="{Binding EnableAutoStart, Mode=TwoWay}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_AutoStartTooltip}" HorizontalAlignment="Left"/>
 
                                             <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="5,5,5,0" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" >
-                                                <CheckBox Name="EnableAutoShutdown1Checkbox" IsChecked="{Binding EnableAutoShutdown1}" Content="{DynamicResource ServerSettings_EnableAutoShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_EnableAutoShutdownTooltip}"/>
+                                                <cctl:CheckBoxAndTextBlock Name="EnableAutoShutdown1Checkbox" IsChecked="{Binding EnableAutoShutdown1, Mode=TwoWay}" Content="{DynamicResource ServerSettings_EnableAutoShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_EnableAutoShutdownTooltip}"/>
                                                 <TextBox Margin="10,0,0,0" Width="60" Height="20" IsEnabled="{Binding EnableAutoShutdown1}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_EnableAutoShutdownTooltip}">
                                                     <Validation.ErrorTemplate>
                                                         <ControlTemplate>
@@ -1416,39 +1418,39 @@
                                                 <StackPanel Orientation="Horizontal">
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[0], ElementName=SettingsControl, FallbackValue=Sun}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Sunday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Sunday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[1], ElementName=SettingsControl, FallbackValue=Mon}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Monday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Monday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[2], ElementName=SettingsControl, FallbackValue=Tue}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Tuesday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Tuesday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[3], ElementName=SettingsControl, FallbackValue=Wed}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Wednesday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Wednesday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[4], ElementName=SettingsControl, FallbackValue=Thu}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Thursday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Thursday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[5], ElementName=SettingsControl, FallbackValue=Fri}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Friday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Friday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[6], ElementName=SettingsControl, FallbackValue=Sat}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Saturday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding ShutdownDaysOfTheWeek1, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Saturday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                 </StackPanel>
-                                                <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding UpdateAfterShutdown1}" Content="{DynamicResource ServerSettings_UpdateAfterShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_UpdateAfterShutdownTooltip}" FlowDirection="RightToLeft" Margin="10,0,0,0" />
-                                                <CheckBox IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding RestartAfterShutdown1}" Content="{DynamicResource ServerSettings_RestartAfterShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_RestartAfterShutdownTooltip}" FlowDirection="RightToLeft" Margin="10,0,0,0" />
+                                                <cctl:CheckBoxAndTextBlock IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding UpdateAfterShutdown1, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UpdateAfterShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_UpdateAfterShutdownTooltip}" FlowDirection="RightToLeft" Margin="10,0,0,0" />
+                                                <cctl:CheckBoxAndTextBlock IsEnabled="{Binding EnableAutoShutdown1}" IsChecked="{Binding RestartAfterShutdown1, Mode=TwoWay}" Text="{DynamicResource ServerSettings_RestartAfterShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_RestartAfterShutdownTooltip}" FlowDirection="RightToLeft" Margin="10,0,0,0" />
                                             </StackPanel>
 
                                             <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="5,5,5,0" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" >
-                                                <CheckBox Name="EnableAutoShutdown2Checkbox" IsChecked="{Binding EnableAutoShutdown2}" Content="{DynamicResource ServerSettings_EnableAutoShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_EnableAutoShutdownTooltip}"/>
+                                                <cctl:CheckBoxAndTextBlock Name="EnableAutoShutdown2Checkbox" IsChecked="{Binding EnableAutoShutdown2, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableAutoShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_EnableAutoShutdownTooltip}"/>
                                                 <TextBox Margin="10,0,0,0" Width="60" Height="20" IsEnabled="{Binding EnableAutoShutdown2}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_EnableAutoShutdownTooltip}">
                                                     <Validation.ErrorTemplate>
                                                         <ControlTemplate>
@@ -1470,41 +1472,41 @@
                                                 <StackPanel Orientation="Horizontal">
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[0], ElementName=SettingsControl, FallbackValue=Sun}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Sunday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Sunday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[1], ElementName=SettingsControl, FallbackValue=Mon}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Monday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Monday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[2], ElementName=SettingsControl, FallbackValue=Tue}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Tuesday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Tuesday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[3], ElementName=SettingsControl, FallbackValue=Wed}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Wednesday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Wednesday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[4], ElementName=SettingsControl, FallbackValue=Thu}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Thursday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Thursday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[5], ElementName=SettingsControl, FallbackValue=Fri}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Friday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Friday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                     <StackPanel>
                                                         <Label    Content="{Binding CurrentCulture.DateTimeFormat.AbbreviatedDayNames[6], ElementName=SettingsControl, FallbackValue=Sat}" HorizontalAlignment="Center" Margin="0,-5,0,-5"/>
-                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Saturday}}" HorizontalAlignment="Center"/>
+                                                        <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding ShutdownDaysOfTheWeek2, Mode=TwoWay, Converter={StaticResource FlagsEnumToBooleanConverter}, ConverterParameter={x:Static mts:DaysOfTheWeek.Saturday}}" HorizontalAlignment="Center"/>
                                                     </StackPanel>
                                                 </StackPanel>
-                                                <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding UpdateAfterShutdown2}" Content="{DynamicResource ServerSettings_UpdateAfterShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_UpdateAfterShutdownTooltip}" FlowDirection="RightToLeft" Padding="4,-1,0,0" Margin="10,0,0,0"/>
-                                                <CheckBox IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding RestartAfterShutdown2}" Content="{DynamicResource ServerSettings_RestartAfterShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_RestartAfterShutdownTooltip}" FlowDirection="RightToLeft" Padding="4,-1,0,0" Margin="10,0,0,0"/>
+                                                <cctl:CheckBoxAndTextBlock IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding UpdateAfterShutdown2, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UpdateAfterShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_UpdateAfterShutdownTooltip}" FlowDirection="RightToLeft" Padding="4,-1,0,0" Margin="10,0,0,0"/>
+                                                <cctl:CheckBoxAndTextBlock IsEnabled="{Binding EnableAutoShutdown2}" IsChecked="{Binding RestartAfterShutdown2, Mode=TwoWay}" Text="{DynamicResource ServerSettings_RestartAfterShutdownLabel}" VerticalAlignment="Bottom" ToolTip="{DynamicResource ServerSettings_RestartAfterShutdownTooltip}" FlowDirection="RightToLeft" Padding="4,-1,0,0" Margin="10,0,0,0"/>
                                             </StackPanel>
                                         </Grid>
 
-                                        <CheckBox Grid.Row="1" Margin="5,5,5,0" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" IsChecked="{Binding EnableAutoBackup}" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_PeriodicBackupsLabel}" ToolTip="{DynamicResource ServerSettings_PeriodicBackupsTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="2" Margin="5,5,5,0" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" IsChecked="{Binding EnableAutoUpdate}" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_PeriodicUpdatesLabel}" ToolTip="{DynamicResource ServerSettings_PeriodicUpdatesTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="3" Margin="5,5,5,0" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" IsChecked="{Binding AutoRestartIfShutdown}" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_RestartIfShutdownLabel}" ToolTip="{DynamicResource ServerSettings_RestartIfShutdownTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Margin="5,5,5,0" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" IsChecked="{Binding EnableAutoBackup, Mode=TwoWay}" VerticalAlignment="Center" Text="{DynamicResource ServerSettings_PeriodicBackupsLabel}" ToolTip="{DynamicResource ServerSettings_PeriodicBackupsTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Margin="5,5,5,0" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" IsChecked="{Binding EnableAutoUpdate, Mode=TwoWay}" VerticalAlignment="Center" Text="{DynamicResource ServerSettings_PeriodicUpdatesLabel}" ToolTip="{DynamicResource ServerSettings_PeriodicUpdatesTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="3" Margin="5,5,5,0" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" IsChecked="{Binding AutoRestartIfShutdown, Mode=TwoWay}" VerticalAlignment="Center" Text="{DynamicResource ServerSettings_RestartIfShutdownLabel}" ToolTip="{DynamicResource ServerSettings_RestartIfShutdownTooltip}" HorizontalAlignment="Left"/>
                                     </Grid>
                                 </GroupBox>
                             </StackPanel>
@@ -1572,15 +1574,15 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <CheckBox Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordClusterAlias, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordClusterAliasLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordClusterAliasTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="4" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordClusterAlias, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowDiscordClusterAliasLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordClusterAliasTooltip}"/>
 
-                                <CheckBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordBackup, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordBackupLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordBackupTooltip}"/>
-                                <CheckBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordUpdate, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordUpdateLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordUpdateTooltip}"/>
-                                <CheckBox Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordStart, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordStartLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordStartTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordBackup, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowDiscordBackupLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordBackupTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordUpdate, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowDiscordUpdateLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordUpdateTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordStart, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowDiscordStartLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordStartTooltip}"/>
 
-                                <CheckBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordRestart, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordRestartLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordRestartTooltip}"/>
-                                <CheckBox Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordShutdown, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordShutdownLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordShutdownTooltip}"/>
-                                <CheckBox Grid.Row="2" Grid.Column="4" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordStop, Mode=TwoWay}" Content="{DynamicResource ServerSettings_AllowDiscordStopLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordStopTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordRestart, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowDiscordRestartLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordRestartTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordShutdown, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowDiscordShutdownLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordShutdownTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="4" Grid.ColumnSpan="2" Margin="5" IsChecked="{Binding AllowDiscordStop, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowDiscordStopLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowDiscordStopTooltip}"/>
                             </Grid>
                         </Expander>
 
@@ -1783,33 +1785,33 @@
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
 
-                                        <CheckBox Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableHardcore}" Content="{DynamicResource ServerSettings_EnableHardcoreLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableHardcoreTooltip}"/>
-                                        <CheckBox Grid.Row="1" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding EnablePVP}" Content="{DynamicResource ServerSettings_EnablePvPLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePvPTooltip}"/>
-                                        <CheckBox Grid.Row="1" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding EnableCreativeMode}" Content="{DynamicResource ServerSettings_EnableCreativeModeLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableCreativeModeTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableHardcore, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableHardcoreLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableHardcoreTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding EnablePVP, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnablePvPLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePvPTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding EnableCreativeMode, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableCreativeModeLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableCreativeModeTooltip}"/>
 
-                                        <CheckBox Grid.Row="2" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableFriendlyFirePvE}" Content="{DynamicResource ServerSettings_DisablePvEFriendlyFireLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisablePvEFriendlyFireTooltip}" />
-                                        <CheckBox Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AllowCaveBuildingPvE}" Content="{DynamicResource ServerSettings_EnablePvECaveBuildingLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePvECaveBuildingTooltip}"/>
-                                        <CheckBox Grid.Row="2" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding EnableCryoSicknessPVE}" Content="{DynamicResource ServerSettings_EnableCryoSicknessPVELabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableCryoSicknessPVETooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableFriendlyFirePvE, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisablePvEFriendlyFireLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisablePvEFriendlyFireTooltip}" />
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AllowCaveBuildingPvE, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnablePvECaveBuildingLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePvECaveBuildingTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding EnableCryoSicknessPVE, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableCryoSicknessPVELabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableCryoSicknessPVETooltip}"/>
 
-                                        <CheckBox Grid.Row="3" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableFriendlyFirePvP}" Content="{DynamicResource ServerSettings_DisablePvPFriendlyFireLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisablePvPFriendlyFireTooltip}" />
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="3" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableFriendlyFirePvP, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisablePvPFriendlyFireLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisablePvPFriendlyFireTooltip}" />
 
-                                        <CheckBox Grid.Row="4" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableExtraStructurePreventionVolumes}" Content="{DynamicResource ServerSettings_EnableExtraStructurePreventionVolumesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableExtraStructurePreventionVolumesTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="4" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableExtraStructurePreventionVolumes, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableExtraStructurePreventionVolumesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableExtraStructurePreventionVolumesTooltip}"/>
 
-                                        <CheckBox Grid.Row="5" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableLootCrates}" Content="{DynamicResource ServerSettings_DisableLootCratesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableLootCratesTooltip}" />
-                                        <CheckBox Grid.Row="5" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AllowCrateSpawnsOnTopOfStructures}" Content="{DynamicResource ServerSettings_AllowCrateSpawnsOnTopOfStructuresLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowCrateSpawnsOnTopOfStructuresTooltip}" />
-                                        <CheckBox Grid.Row="5" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding RandomSupplyCratePoints}" Content="{DynamicResource ServerSettings_RandomSupplyCratePointsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_RandomSupplyCratePointsTooltip}" />
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="5" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableLootCrates, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableLootCratesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableLootCratesTooltip}" />
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="5" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AllowCrateSpawnsOnTopOfStructures, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowCrateSpawnsOnTopOfStructuresLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowCrateSpawnsOnTopOfStructuresTooltip}" />
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="5" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding RandomSupplyCratePoints, Mode=TwoWay}" Text="{DynamicResource ServerSettings_RandomSupplyCratePointsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_RandomSupplyCratePointsTooltip}" />
 
                                         <cctl:AnnotatedSlider Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="3" Label="{DynamicResource ServerSettings_SupplyCrateLootQualityMultiplierLabel}" Value="{Binding SupplyCrateLootQualityMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="5" SmallChange="0.1" LargeChange="1" TickFrequency="1"  ToolTip="{DynamicResource ServerSettings_SupplyCrateLootQualityMultiplierTooltip}" />
 
-                                        <CheckBox Grid.Row="7" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableNoFishLoot}" Content="{DynamicResource ServerSettings_EnableNoFishLootLabel}" ToolTip="{DynamicResource ServerSettings_EnableNoFishLootTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="7" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableNoFishLoot, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableNoFishLootLabel}" ToolTip="{DynamicResource ServerSettings_EnableNoFishLootTooltip}" HorizontalAlignment="Left"/>
 
                                         <cctl:AnnotatedSlider Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="3" Label="{DynamicResource ServerSettings_FishingLootQualityMultiplierLabel}" Value="{Binding FishingLootQualityMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="5" SmallChange="0.1" LargeChange="1" TickFrequency="1"  ToolTip="{DynamicResource ServerSettings_FishingLootQualityMultiplierTooltip}" />
 
-                                        <CheckBox Grid.Row="9" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding UseCorpseLocator}" Content="{DynamicResource ServerSettings_UseCorpseLocatorLabel}" ToolTip="{DynamicResource ServerSettings_UseCorpseLocatorTooltip}" HorizontalAlignment="Left" />
-                                        <CheckBox Grid.Row="9" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding PreventSpawnAnimations}" Content="{DynamicResource ServerSettings_PreventSpawnAnimationsLabel}" ToolTip="{DynamicResource ServerSettings_PreventSpawnAnimationsTooltip}" HorizontalAlignment="Left" />
-                                        <CheckBox Grid.Row="9" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding AllowUnlimitedRespecs}" Content="{DynamicResource ServerSettings_AllowUnlimitedRespecsLabel}" ToolTip="{DynamicResource ServerSettings_AllowUnlimitedRespecsTooltip}" HorizontalAlignment="Left" />
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="9" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding UseCorpseLocator, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseCorpseLocatorLabel}" ToolTip="{DynamicResource ServerSettings_UseCorpseLocatorTooltip}" HorizontalAlignment="Left" />
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="9" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding PreventSpawnAnimations, Mode=TwoWay}" Text="{DynamicResource ServerSettings_PreventSpawnAnimationsLabel}" ToolTip="{DynamicResource ServerSettings_PreventSpawnAnimationsTooltip}" HorizontalAlignment="Left" />
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="9" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding AllowUnlimitedRespecs, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowUnlimitedRespecsLabel}" ToolTip="{DynamicResource ServerSettings_AllowUnlimitedRespecsTooltip}" HorizontalAlignment="Left" />
 
-                                        <CheckBox Grid.Row="10" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding AllowPlatformSaddleMultiFloors}" Content="{DynamicResource ServerSettings_AllowPlatformSaddleMultiFloorsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowPlatformSaddleMultiFloorsTooltip}" />
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="10" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding AllowPlatformSaddleMultiFloors, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowPlatformSaddleMultiFloorsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowPlatformSaddleMultiFloorsTooltip}" />
 
                                         <cctl:AnnotatedSlider Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="3" Label="{DynamicResource ServerSettings_PlatformSaddleBuildAreaBoundsMultiplierLabel}" Value="{Binding PlatformSaddleBuildAreaBoundsMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="5" SmallChange="0.1" LargeChange="1" TickFrequency="1"  ToolTip="{DynamicResource ServerSettings_PlatformSaddleBuildAreaBoundsMultiplierTooltip}" />
                                         <cctl:AnnotatedSlider Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="3" Label="{DynamicResource ServerSettings_MaxGateFrameOnSaddlesLabel}" Value="{Binding MaxGateFrameOnSaddles}" Minimum="0" Maximum="10" SmallChange="1" LargeChange="5" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_MaxGateFrameOnSaddlesTooltip}" />
@@ -1817,7 +1819,7 @@
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox Name="EnableDifficultyOverrideCheckbox" IsChecked="{Binding EnableDifficultyOverride}" Content="{DynamicResource ServerSettings_EnableDifficultyOverrideLabel}" ToolTip="{DynamicResource ServerSettings_EnableDifficultyOverrideTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Name="EnableDifficultyOverrideCheckbox" IsChecked="{Binding EnableDifficultyOverride, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableDifficultyOverrideLabel}" ToolTip="{DynamicResource ServerSettings_EnableDifficultyOverrideTooltip}"/>
                                         </GroupBox.Header>
 
                                         <StackPanel IsEnabled="{Binding ElementName=EnableDifficultyOverrideCheckbox, Path=IsChecked}">
@@ -1830,7 +1832,7 @@
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox IsChecked="{Binding EnableTributeDownloads}" Content="{DynamicResource ServerSettings_EnableTributeLabel}" ToolTip="{DynamicResource ServerSettings_EnableTributeTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock IsChecked="{Binding EnableTributeDownloads, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableTributeLabel}" ToolTip="{DynamicResource ServerSettings_EnableTributeTooltip}"/>
                                         </GroupBox.Header>
 
                                         <Grid IsEnabled="{Binding EnableTributeDownloads}">
@@ -1844,10 +1846,10 @@
                                                 <ColumnDefinition Width="1*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding PreventDownloadSurvivors}"  Content="{DynamicResource ServerSettings_NoSurvivorDownloadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoSurvivorDownloadsTooltip}"/>
-                                            <CheckBox Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding PreventDownloadItems}" Content="{DynamicResource ServerSettings_NoItemDownloadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoItemDownloadsTooltip}"/>
-                                            <CheckBox Grid.Row="0" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding PreventDownloadDinos}" Content="{DynamicResource ServerSettings_NoDinoDownloadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoDinoDownloadsTooltip}"/>
-                                            <CheckBox Grid.Row="1" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding CrossARKAllowForeignDinoDownloads}"  Content="{DynamicResource ServerSettings_CrossARKAllowForeignDinoDownloadsLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_CrossARKAllowForeignDinoDownloadsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding PreventDownloadSurvivors, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoSurvivorDownloadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoSurvivorDownloadsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding PreventDownloadItems, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoItemDownloadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoItemDownloadsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding PreventDownloadDinos, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoDinoDownloadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoDinoDownloadsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding CrossARKAllowForeignDinoDownloads, Mode=TwoWay}" Text="{DynamicResource ServerSettings_CrossARKAllowForeignDinoDownloadsLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_CrossARKAllowForeignDinoDownloadsTooltip}"/>
                                         </Grid>
                                     </GroupBox>
 
@@ -1868,9 +1870,9 @@
                                                 <ColumnDefinition Width="1*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding PreventUploadSurvivors}"  Content="{DynamicResource ServerSettings_NoSurvivorUploadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoSurvivorUploadsTooltip}"/>
-                                            <CheckBox Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding PreventUploadItems}" Content="{DynamicResource ServerSettings_NoItemUploadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoItemUploadsTooltip}"/>
-                                            <CheckBox Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding PreventUploadDinos}" Content="{DynamicResource ServerSettings_NoDinoUploadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoDinoUploadsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding PreventUploadSurvivors, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoSurvivorUploadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoSurvivorUploadsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding PreventUploadItems, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoItemUploadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoItemUploadsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding PreventUploadDinos, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoDinoUploadsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoDinoUploadsTooltip}"/>
 
                                             <cctl:AnnotatedCheckBoxAndIntegerSlider Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="1" Label="{DynamicResource ServerSettings_MaxTributeDinosLabel}" Suffix="{DynamicResource SliderUnits_Dinos}" Value="{Binding MaxTributeDinos}" ToolTip="{DynamicResource ServerSettings_MaxTributeDinosTooltip}" Minimum="0" Maximum="200" VerticalAlignment="Center" LargeChange="5" SmallChange="1" TickFrequency="10"/>
 
@@ -1897,23 +1899,23 @@
                                                 <ColumnDefinition Width="12*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding NoTransferFromFiltering}"  Content="{DynamicResource ServerSettings_NoTransferFromFilteringLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoTransferFromFilteringTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding NoTransferFromFiltering, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoTransferFromFilteringLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoTransferFromFilteringTooltip}"/>
 
-                                            <CheckBox Grid.Row="1" Grid.Column="0" Margin="5,5,5,5" IsChecked="{Binding OverrideTributeCharacterExpirationSeconds}"  Content="{DynamicResource ServerSettings_OverrideTributeCharacterExpirationSecondsLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OverrideTributeCharacterExpirationSecondsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5,5,5,5" IsChecked="{Binding OverrideTributeCharacterExpirationSeconds, Mode=TwoWay}" Text="{DynamicResource ServerSettings_OverrideTributeCharacterExpirationSecondsLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OverrideTributeCharacterExpirationSecondsTooltip}"/>
                                             <cctl:AnnotatedSlider Grid.Row="1" Grid.Column="1" Margin="1" IsEnabled="{Binding OverrideTributeCharacterExpirationSeconds}" Value="{Binding TributeCharacterExpirationSeconds, Converter={StaticResource TributeExpirationConverter}}" Suffix="{DynamicResource SliderUnits_Minutes}" Minimum="1" Maximum="20000" SmallChange="1" LargeChange="5" TickFrequency="60" LabelRelativeWidth="Auto" ToolTip="{DynamicResource ServerSettings_OverrideTributeCharacterExpirationSecondsTooltip}" />
-                                            <CheckBox Grid.Row="2" Grid.Column="0" Margin="5,5,5,5" IsChecked="{Binding OverrideTributeItemExpirationSeconds}"  Content="{DynamicResource ServerSettings_OverrideTributeItemExpirationSecondsLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OverrideTributeItemExpirationSecondsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="0" Margin="5,5,5,5" IsChecked="{Binding OverrideTributeItemExpirationSeconds, Mode=TwoWay}" Text="{DynamicResource ServerSettings_OverrideTributeItemExpirationSecondsLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OverrideTributeItemExpirationSecondsTooltip}"/>
                                             <cctl:AnnotatedSlider Grid.Row="2" Grid.Column="1" Margin="1" IsEnabled="{Binding OverrideTributeItemExpirationSeconds}" Value="{Binding TributeItemExpirationSeconds, Converter={StaticResource TributeExpirationConverter}}" Suffix="{DynamicResource SliderUnits_Minutes}" Minimum="1" Maximum="20000" SmallChange="1" LargeChange="5" TickFrequency="60" LabelRelativeWidth="Auto" ToolTip="{DynamicResource ServerSettings_OverrideTributeItemExpirationSecondsTooltip}" />
-                                            <CheckBox Grid.Row="3" Grid.Column="0" Margin="5,5,5,5" IsChecked="{Binding OverrideTributeDinoExpirationSeconds}"  Content="{DynamicResource ServerSettings_OverrideTributeDinoExpirationSecondsLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OverrideTributeDinoExpirationSecondsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="3" Grid.Column="0" Margin="5,5,5,5" IsChecked="{Binding OverrideTributeDinoExpirationSeconds, Mode=TwoWay}" Text="{DynamicResource ServerSettings_OverrideTributeDinoExpirationSecondsLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OverrideTributeDinoExpirationSecondsTooltip}"/>
                                             <cctl:AnnotatedSlider Grid.Row="3" Grid.Column="1" Margin="1" IsEnabled="{Binding OverrideTributeDinoExpirationSeconds}" Value="{Binding TributeDinoExpirationSeconds, Converter={StaticResource TributeExpirationConverter}}" Suffix="{DynamicResource SliderUnits_Minutes}" Minimum="1" Maximum="20000" SmallChange="1" LargeChange="5" TickFrequency="60" LabelRelativeWidth="Auto" ToolTip="{DynamicResource ServerSettings_OverrideTributeDinoExpirationSecondsTooltip}" />
 
-                                            <CheckBox Grid.Row="4" Grid.Column="0" Margin="5,5,5,5" IsChecked="{Binding OverrideMinimumDinoReuploadInterval}"  Content="{DynamicResource ServerSettings_OverrideMinimumDinoReuploadIntervalLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OverrideMinimumDinoReuploadIntervalTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="4" Grid.Column="0" Margin="5,5,5,5" IsChecked="{Binding OverrideMinimumDinoReuploadInterval, Mode=TwoWay}" Text="{DynamicResource ServerSettings_OverrideMinimumDinoReuploadIntervalLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OverrideMinimumDinoReuploadIntervalTooltip}"/>
                                             <cctl:AnnotatedSlider Grid.Row="4" Grid.Column="1" Margin="1" IsEnabled="{Binding OverrideMinimumDinoReuploadInterval}" Value="{Binding MinimumDinoReuploadInterval, Converter={StaticResource TributeExpirationConverter}}" Suffix="{DynamicResource SliderUnits_Minutes}" Minimum="1" Maximum="20000" SmallChange="1" LargeChange="5" TickFrequency="60" LabelRelativeWidth="Auto" ToolTip="{DynamicResource ServerSettings_OverrideMinimumDinoReuploadIntervalTooltip}" />
                                         </Grid>
                                     </GroupBox>
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox Name="EnableIncreasePvPRespawnInterval" IsChecked="{Binding IncreasePvPRespawnInterval}" Content="{DynamicResource ServerSettings_PvPRespawnLabel}" ToolTip="{DynamicResource ServerSettings_PvPRespawnTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Name="EnableIncreasePvPRespawnInterval" IsChecked="{Binding IncreasePvPRespawnInterval, Mode=TwoWay}" Text="{DynamicResource ServerSettings_PvPRespawnLabel}" ToolTip="{DynamicResource ServerSettings_PvPRespawnTooltip}"/>
                                         </GroupBox.Header>
 
                                         <StackPanel  IsEnabled="{Binding ElementName=EnableIncreasePvPRespawnInterval, Path=IsChecked}">
@@ -1925,7 +1927,7 @@
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox Name="EnablePreventOfflinePvP" IsChecked="{Binding PreventOfflinePvP}" Content="{DynamicResource ServerSettings_PreventOfflinePvPLabel}" ToolTip="{DynamicResource ServerSettings_PreventOfflinePvPTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Name="EnablePreventOfflinePvP" IsChecked="{Binding PreventOfflinePvP, Mode=TwoWay}" Text="{DynamicResource ServerSettings_PreventOfflinePvPLabel}" ToolTip="{DynamicResource ServerSettings_PreventOfflinePvPTooltip}"/>
                                         </GroupBox.Header>
 
                                         <StackPanel IsEnabled="{Binding ElementName=EnablePreventOfflinePvP, Path=IsChecked}">
@@ -1936,7 +1938,7 @@
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox Name="EnableAutoPvETimer" IsChecked="{Binding AutoPvETimer}" Content="{DynamicResource ServerSettings_PvEScheduleLabel}" ToolTip="{DynamicResource ServerSettings_PvEScheduleTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Name="EnableAutoPvETimer" IsChecked="{Binding AutoPvETimer, Mode=TwoWay}" Text="{DynamicResource ServerSettings_PvEScheduleLabel}" ToolTip="{DynamicResource ServerSettings_PvEScheduleTooltip}"/>
                                         </GroupBox.Header>
 
                                         <Grid IsEnabled="{Binding ElementName=EnableAutoPvETimer, Path=IsChecked}">
@@ -1946,7 +1948,7 @@
                                                 <ColumnDefinition/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Column="0" IsChecked="{Binding AutoPvEUseSystemTime}" Content="{DynamicResource ServerSettings_UseServerTimeLabel}" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_UseServerTimeTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Column="0" IsChecked="{Binding AutoPvEUseSystemTime, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseServerTimeLabel}" HorizontalAlignment="Left" Margin="5,0,0,0" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_UseServerTimeTooltip}"/>
                                             <StackPanel Grid.Column="1" Orientation="Horizontal">
                                                 <Label   Content="{DynamicResource ServerSettings_StartTimeLabel}" ToolTip="{DynamicResource ServerSettings_StartTimeTooltip}" VerticalAlignment="Center"/>
                                                 <TextBox FontSize="12" Width="100" Margin="5,1,0,1" VerticalContentAlignment="Center" ToolTip="{DynamicResource ServerSettings_StartTimeTooltip}" >
@@ -1996,7 +1998,7 @@
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_TribeNameChangeCooldownLabel}" Value="{Binding TribeNameChangeCooldown}" Minimum="1" Maximum="300" SmallChange="1" LargeChange="5" TickFrequency="10" Suffix="{DynamicResource SliderUnits_Minutes}" ToolTip="{DynamicResource ServerSettings_TribeNameChangeCooldownTooltip}" />
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_TribeSlotReuseCooldownLabel}" Value="{Binding TribeSlotReuseCooldown, Converter={StaticResource SecondsToMinutesConverter}}" Minimum="0" Maximum="300" SmallChange="1" LargeChange="5" TickFrequency="10" Suffix="{DynamicResource SliderUnits_Minutes}" ToolTip="{DynamicResource ServerSettings_TribeSlotReuseCooldownTooltip}" />
 
-                                    <CheckBox Margin="5" IsChecked="{Binding AllowTribeAlliances}" Content="{DynamicResource ServerSettings_AllowTribeAlliancesLabel}" ToolTip="{DynamicResource ServerSettings_AllowTribeAlliancesTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock Margin="5" IsChecked="{Binding AllowTribeAlliances}" Text="{DynamicResource ServerSettings_AllowTribeAlliancesLabel}" ToolTip="{DynamicResource ServerSettings_AllowTribeAlliancesTooltip}" HorizontalAlignment="Left"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_MaxAlliancesPerTribeLabel}" Value="{Binding MaxAlliancesPerTribe}" IsEnabled="{Binding AllowTribeAlliances, FallbackValue=False}" Minimum="0" Maximum="100" SmallChange="1" LargeChange="10" TickFrequency="10"  ToolTip="{DynamicResource ServerSettings_MaxAlliancesPerTribeTooltip}" />
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_MaxTribesPerAllianceLabel}" Value="{Binding MaxTribesPerAlliance}" IsEnabled="{Binding AllowTribeAlliances, FallbackValue=False}" Minimum="0" Maximum="100" SmallChange="1" LargeChange="10" TickFrequency="10"  ToolTip="{DynamicResource ServerSettings_MaxTribesPerAllianceTooltip}" />
 
@@ -2008,14 +2010,14 @@
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Column="0" Margin="5,5,5,0" Name="AllowTribeWarPvECheckbox"  IsChecked="{Binding AllowTribeWarPvE}" Content="{DynamicResource ServerSettings_AllowTribeWarfareLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowTribeWarfareTooltip}"/>
-                                            <CheckBox Grid.Column="1" Margin="5,5,5,0" IsEnabled="{Binding ElementName=AllowTribeWarPvECheckbox, Path=IsChecked}" IsChecked="{Binding AllowTribeWarCancelPvE}" Content="{DynamicResource ServerSettings_AllowCancelTribeWarfareLabel}" ToolTip="{DynamicResource ServerSettings_AllowCancelTribeWarfareTooltip}" HorizontalAlignment="Left"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Column="0" Margin="5,5,5,0" Name="AllowTribeWarPvECheckbox"  IsChecked="{Binding AllowTribeWarPvE, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowTribeWarfareLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowTribeWarfareTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Column="1" Margin="5,5,5,0" IsEnabled="{Binding ElementName=AllowTribeWarPvECheckbox, Path=IsChecked}" IsChecked="{Binding AllowTribeWarCancelPvE, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowCancelTribeWarfareLabel}" ToolTip="{DynamicResource ServerSettings_AllowCancelTribeWarfareTooltip}" HorizontalAlignment="Left"/>
                                         </Grid>
                                     </GroupBox>
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox Name="EnableAllowCustomRecipes" IsChecked="{Binding AllowCustomRecipes}" Content="{DynamicResource ServerSettings_AllowCustomRecipesLabel}" ToolTip="{DynamicResource ServerSettings_AllowCustomRecipesTooltip}" />
+                                            <cctl:CheckBoxAndTextBlock Name="EnableAllowCustomRecipes" IsChecked="{Binding AllowCustomRecipes, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowCustomRecipesLabel}" ToolTip="{DynamicResource ServerSettings_AllowCustomRecipesTooltip}" />
                                         </GroupBox.Header>
 
                                         <StackPanel  IsEnabled="{Binding ElementName=EnableAllowCustomRecipes, Path=IsChecked}">
@@ -2026,7 +2028,7 @@
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox Name="EnableDiseasesCheckbox" IsChecked="{Binding EnableDiseases}" Content="{DynamicResource ServerSettings_EnableDiseasesLabel}" ToolTip="{DynamicResource ServerSettings_EnableDiseasesTooltip}" />
+                                            <cctl:CheckBoxAndTextBlock Name="EnableDiseasesCheckbox" IsChecked="{Binding EnableDiseases, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableDiseasesLabel}" ToolTip="{DynamicResource ServerSettings_EnableDiseasesTooltip}" />
                                         </GroupBox.Header>
 
                                         <Grid IsEnabled="{Binding ElementName=EnableDiseasesCheckbox, Path=IsChecked}">
@@ -2036,13 +2038,13 @@
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding NonPermanentDiseases}" Content="{DynamicResource ServerSettings_NonPermanentDiseasesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NonPermanentDiseasesTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding NonPermanentDiseases, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NonPermanentDiseasesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NonPermanentDiseasesTooltip}"/>
                                         </Grid>
                                     </GroupBox>
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox Name="OverrideNPCNetworkStasisRangeScaleCheckbox" IsChecked="{Binding OverrideNPCNetworkStasisRangeScale}" Content="{DynamicResource ServerSettings_NPCNetworkStasisRangeScaleLabel}" ToolTip="{DynamicResource ServerSettings_NPCNetworkStasisRangeScaleTooltip}" />
+                                            <cctl:CheckBoxAndTextBlock Name="OverrideNPCNetworkStasisRangeScaleCheckbox" IsChecked="{Binding OverrideNPCNetworkStasisRangeScale, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NPCNetworkStasisRangeScaleLabel}" ToolTip="{DynamicResource ServerSettings_NPCNetworkStasisRangeScaleTooltip}" />
                                         </GroupBox.Header>
 
                                         <Grid IsEnabled="{Binding ElementName=OverrideNPCNetworkStasisRangeScaleCheckbox, Path=IsChecked}">
@@ -2069,7 +2071,7 @@
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox IsChecked="{Binding EnableCryopodNerf}" Content="{DynamicResource ServerSettings_EnableCryopodNerfLabel}" ToolTip="{DynamicResource ServerSettings_EnableCryopodNerfTooltip}" />
+                                            <cctl:CheckBoxAndTextBlock IsChecked="{Binding EnableCryopodNerf, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableCryopodNerfLabel}" ToolTip="{DynamicResource ServerSettings_EnableCryopodNerfTooltip}" />
                                         </GroupBox.Header>
 
                                         <Grid>
@@ -2096,8 +2098,8 @@
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableGenesisMissions}" Content="{DynamicResource ServerSettings_DisableGenesisMissionsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableGenesisMissionsTooltip}"/>
-                                            <CheckBox Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AllowTekSuitPowersInGenesis}" Content="{DynamicResource ServerSettings_AllowTekSuitPowersInGenesisLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowTekSuitPowersInGenesisTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableGenesisMissions, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableGenesisMissionsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableGenesisMissionsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AllowTekSuitPowersInGenesis, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowTekSuitPowersInGenesisLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowTekSuitPowersInGenesisTooltip}"/>
                                         </Grid>
                                     </GroupBox>
 
@@ -2114,9 +2116,9 @@
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableDefaultMapItemSets}" Content="{DynamicResource ServerSettings_DisableDefaultMapItemSetsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableDefaultMapItemSetsTooltip}"/>
-                                            <CheckBox Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding DisableWorldBuffs}" Content="{DynamicResource ServerSettings_DisableWorldBuffsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableWorldBuffsTooltip}"/>
-                                            <CheckBox Grid.Row="0" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding EnableWorldBuffScaling}" Content="{DynamicResource ServerSettings_EnableWorldBuffScalingLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableWorldBuffScalingTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableDefaultMapItemSets, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableDefaultMapItemSetsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableDefaultMapItemSetsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding DisableWorldBuffs, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableWorldBuffsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableWorldBuffsTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding EnableWorldBuffScaling, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableWorldBuffScalingLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableWorldBuffScalingTooltip}"/>
 
                                             <cctl:AnnotatedSlider Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="5,5,5,0" IsEnabled="{Binding EnableWorldBuffScaling}" Label="{DynamicResource ServerSettings_WorldBuffScalingEfficacyLabel}" Value="{Binding WorldBuffScalingEfficacy}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="5000" SmallChange="1" LargeChange="10" TickFrequency="50" ToolTip="{DynamicResource ServerSettings_WorldBuffScalingEfficacyTooltip}"/>
                                         </Grid>
@@ -2136,8 +2138,8 @@
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableHexagonStore}" Content="{DynamicResource ServerSettings_DisableHexagonStoreLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableHexagonStoreTooltip}"/>
-                                            <CheckBox Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding HexStoreAllowOnlyEngramTradeOption}" Content="{DynamicResource ServerSettings_HexStoreAllowOnlyEngramTradeOptionLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_HexStoreAllowOnlyEngramTradeOptionTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableHexagonStore, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableHexagonStoreLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableHexagonStoreTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding HexStoreAllowOnlyEngramTradeOption, Mode=TwoWay}" Text="{DynamicResource ServerSettings_HexStoreAllowOnlyEngramTradeOptionLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_HexStoreAllowOnlyEngramTradeOptionTooltip}"/>
 
                                             <cctl:AnnotatedSlider Grid.Row="1" Grid.ColumnSpan="3" Margin="5,5,5,0" Label="{DynamicResource ServerSettings_MaxHexagonsPerCharacterLabel}" Value="{Binding MaxHexagonsPerCharacter}" Suffix="" Minimum="0" Maximum="100000000" SmallChange="100" LargeChange="1000" TickFrequency="5000" ToolTip="{DynamicResource ServerSettings_MaxHexagonsPerCharacterTooltip}"/>
                                             <cctl:AnnotatedSlider Grid.Row="2" Grid.ColumnSpan="3" Margin="5,5,5,0" Label="{DynamicResource ServerSettings_HexagonRewardMultiplierLabel}" Value="{Binding HexagonRewardMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_HexagonRewardMultiplierTooltip}"/>
@@ -2156,7 +2158,10 @@
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding UseFjordurTraversalBuff}" Content="{DynamicResource ServerSettings_UseFjordurTraversalBuffLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseFjordurTraversalBuffTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" HorizontalAlignment="Left" 
+                                                      IsChecked="{Binding UseFjordurTraversalBuff, Mode=TwoWay}" 
+                                                      Text="{DynamicResource ServerSettings_UseFjordurTraversalBuffLabel}" 
+                                                      ToolTip="{DynamicResource ServerSettings_UseFjordurTraversalBuffTooltip}"/>
                                         </Grid>
                                     </GroupBox>
 
@@ -2229,11 +2234,11 @@
                                         <ColumnDefinition Width="*"/>
                                     </Grid.ColumnDefinitions>
 
-                                    <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableGlobalVoiceChat}" Content="{DynamicResource ServerSettings_EnableGlobalVoiceChatLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableGlobalVoiceChatTooltip}"/>
-                                    <CheckBox Grid.Row="1" Grid.Column="0" Margin="5" IsChecked="{Binding EnableProximityChat}" Content="{DynamicResource ServerSettings_EnableProximityChatLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableProximityChatTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableGlobalVoiceChat, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableGlobalVoiceChatLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableGlobalVoiceChatTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5" IsChecked="{Binding EnableProximityChat, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableProximityChatLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableProximityChatTooltip}"/>
 
-                                    <CheckBox Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding EnablePlayerLeaveNotifications}" Content="{DynamicResource ServerSettings_EnablePlayerLeftLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePlayerLeftTooltip}"/>
-                                    <CheckBox Grid.Row="1" Grid.Column="1" Margin="5" IsChecked="{Binding EnablePlayerJoinedNotifications}" Content="{DynamicResource ServerSettings_EnablePlayerJoinedLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePlayerJoinedTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding EnablePlayerLeaveNotifications, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnablePlayerLeftLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePlayerLeftTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="1" Margin="5" IsChecked="{Binding EnablePlayerJoinedNotifications, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnablePlayerJoinedLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePlayerJoinedTooltip}"/>
                                 </Grid>
                             </Grid>
                         </Expander>
@@ -2277,16 +2282,16 @@
                                     <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
 
-                                <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding AllowCrosshair}" Content="{DynamicResource ServerSettings_AllowCrosshairLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowCrosshairTooltip}"/>
-                                <CheckBox Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding AllowHUD}" Content="{DynamicResource ServerSettings_AllowHUDLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowHUDTooltip}"/>
-                                <CheckBox Grid.Row="2" Grid.Column="0" Margin="5" IsChecked="{Binding AllowMapPlayerLocation}" Content="{DynamicResource ServerSettings_AllowMapPlayerLocationLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowMapPlayerLocationTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding AllowCrosshair, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowCrosshairLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowCrosshairTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding AllowHUD, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowHUDLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowHUDTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="0" Margin="5" IsChecked="{Binding AllowMapPlayerLocation, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowMapPlayerLocationLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowMapPlayerLocationTooltip}"/>
 
-                                <CheckBox Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AllowThirdPersonView}" Content="{DynamicResource ServerSettings_AllowThirdPersonViewLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowThirdPersonViewTooltip}"/>
-                                <CheckBox Grid.Row="1" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding ShowFloatingDamageText}" Content="{DynamicResource ServerSettings_ShowFloatingDamageTextLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ShowFloatingDamageTextTooltip}"/>
-                                <CheckBox Grid.Row="2" Grid.Column="1" Margin="5" IsChecked="{Binding AllowHitMarkers}" Content="{DynamicResource ServerSettings_AllowHitMarkersLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowHitMarkersTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AllowThirdPersonView, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowThirdPersonViewLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowThirdPersonViewTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding ShowFloatingDamageText, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ShowFloatingDamageTextLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ShowFloatingDamageTextTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="1" Margin="5" IsChecked="{Binding AllowHitMarkers, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowHitMarkersLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowHitMarkersTooltip}"/>
 
-                                <CheckBox Grid.Row="0" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding AllowPVPGamma}" Content="{DynamicResource ServerSettings_AllowPlayerGammaInPvPLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowPlayerGammaInPvPTooltip}"/>
-                                <CheckBox Grid.Row="1" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding AllowPvEGamma}" Content="{DynamicResource ServerSettings_AllowPlayerGammaInPvELabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowPlayerGammaInPvETooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding AllowPVPGamma, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowPlayerGammaInPvPLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowPlayerGammaInPvPTooltip}"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding AllowPvEGamma, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowPlayerGammaInPvELabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowPlayerGammaInPvETooltip}"/>
                             </Grid>
                         </Expander>
 
@@ -2318,7 +2323,7 @@
 
                             <Grid Margin="-8,0,2,0">
                                 <StackPanel Grid.Column="0">
-                                    <CheckBox Margin="5" IsChecked="{Binding EnableFlyerCarry}" Content="{DynamicResource ServerSettings_EnableFlyerCarryLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableFlyerCarryTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Margin="5" IsChecked="{Binding EnableFlyerCarry, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableFlyerCarryLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableFlyerCarryTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1,1,22,1" Label="{DynamicResource ServerSettings_XPMultiplierLabel}" Value="{Binding XPMultiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" Suffix="{DynamicResource SliderUnits_Multiplier}" ToolTip="{DynamicResource ServerSettings_XPMultiplierTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1,1,22,1" Label="{DynamicResource ServerSettings_DamageLabel}" Value="{Binding PlayerDamageMultiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" Suffix="{DynamicResource SliderUnits_Multiplier}" ToolTip="{DynamicResource ServerSettings_DamageTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1,1,22,1" Label="{DynamicResource ServerSettings_ResistanceLabel}" Value="{Binding PlayerResistanceMultiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" Suffix="{DynamicResource SliderUnits_Multiplier}" ToolTip="{DynamicResource ServerSettings_ResistanceTooltip}"/>
@@ -2333,7 +2338,7 @@
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox x:Name="EnablePlayerBaseStatMultipliersCheckbox" Content="{DynamicResource ServerSettings_PlayerBaseStatMultipliersLabel}" IsChecked="{Binding PlayerBaseStatMultipliers.IsEnabled}" ToolTip="{DynamicResource ServerSettings_BaseStatMultipliersTooltip}" VerticalAlignment="Center"/>
+                                                <cctl:CheckBoxAndTextBlock x:Name="EnablePlayerBaseStatMultipliersCheckbox" Text="{DynamicResource ServerSettings_PlayerBaseStatMultipliersLabel}" IsChecked="{Binding PlayerBaseStatMultipliers.IsEnabled, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_BaseStatMultipliersTooltip}" VerticalAlignment="Center"/>
                                                 <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnablePlayerBaseStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.PlayerBaseStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetBaseStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -2368,7 +2373,7 @@
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox x:Name="EnablePlayerPerLevelStatMultipliersCheckbox" Content="{DynamicResource ServerSettings_PlayerPerLevelStatMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_Player.IsEnabled}" ToolTip="{DynamicResource ServerSettings_PerLevelStatMultipliersTooltip}" VerticalAlignment="Center"/>
+                                                <cctl:CheckBoxAndTextBlock x:Name="EnablePlayerPerLevelStatMultipliersCheckbox" Text="{DynamicResource ServerSettings_PlayerPerLevelStatMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_Player.IsEnabled, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_PerLevelStatMultipliersTooltip}" VerticalAlignment="Center"/>
                                                 <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnablePlayerPerLevelStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.PlayerPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -2446,7 +2451,7 @@
                                     <cctl:AnnotatedSlider Margin="1,1,22,1" Label="{DynamicResource ServerSettings_PassiveTameIntervalMultiplierLabel}" Value="{Binding PassiveTameIntervalMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_PassiveTameIntervalMultiplierTooltip}"/>
 
                                     <cctl:AnnotatedSlider Margin="1,1,22,1" Label="{DynamicResource ServerSettings_PersonalTamedDinosSaddleStructureCostLabel}" Value="{Binding PersonalTamedDinosSaddleStructureCost}" Minimum="1" Maximum="200" SmallChange="10" LargeChange="20" TickFrequency="50" ToolTip="{DynamicResource ServerSettings_PersonalTamedDinosSaddleStructureCostTooltip}"/>
-                                    <CheckBox Margin="5,1,22,1" IsChecked="{Binding UseTameLimitForStructuresOnly}" Content="{DynamicResource ServerSettings_UseTameLimitForStructuresOnlyLabel}" ToolTip="{DynamicResource ServerSettings_UseTameLimitForStructuresOnlyTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock Margin="5,1,22,1" IsChecked="{Binding UseTameLimitForStructuresOnly, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseTameLimitForStructuresOnlyLabel}" ToolTip="{DynamicResource ServerSettings_UseTameLimitForStructuresOnlyTooltip}" HorizontalAlignment="Left"/>
                                     <cctl:AnnotatedSlider Margin="1,1,22,1" Label="{DynamicResource ServerSettings_FoodDrainLabel}" Value="{Binding DinoCharacterFoodDrainMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_FoodDrainTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1,1,22,1" Label="{DynamicResource ServerSettings_StaminaDrainLabel}" Value="{Binding DinoCharacterStaminaDrainMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_StaminaDrainTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1,1,22,1" Label="{DynamicResource ServerSettings_HealthRecoveryLabel}" Value="{Binding DinoCharacterHealthRecoveryMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_HealthRecoveryTooltip}"/>
@@ -2455,7 +2460,7 @@
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox IsChecked="{Binding AllowRaidDinoFeeding}" Content="{DynamicResource ServerSettings_AllowRaidDinoFeedingLabel}" ToolTip="{DynamicResource ServerSettings_AllowRaidDinoFeedingTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock IsChecked="{Binding AllowRaidDinoFeeding, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowRaidDinoFeedingLabel}" ToolTip="{DynamicResource ServerSettings_AllowRaidDinoFeedingTooltip}"/>
                                         </GroupBox.Header>
 
                                         <StackPanel>
@@ -2476,17 +2481,17 @@
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
 
-                                        <CheckBox Grid.Row="0" Grid.Column="0" Margin="5" Content="{DynamicResource ServerSettings_EnableAllowCaveFlyersLabel}" IsChecked="{Binding EnableAllowCaveFlyers}" ToolTip="{DynamicResource ServerSettings_EnableAllowCaveFlyersTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="0" Grid.Column="1" Margin="5" Content="{DynamicResource ServerSettings_AllowFlyingStaminaRecoveryLabel}" IsChecked="{Binding AllowFlyingStaminaRecovery}" ToolTip="{DynamicResource ServerSettings_AllowFlyingStaminaRecoveryTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="0" Grid.Column="2" Margin="5" Content="{DynamicResource ServerSettings_AllowFlyerSpeedLevelingLabel}" IsChecked="{Binding AllowFlyerSpeedLeveling}" ToolTip="{DynamicResource ServerSettings_AllowFlyerSpeedLevelingTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5" Text="{DynamicResource ServerSettings_EnableAllowCaveFlyersLabel}" IsChecked="{Binding EnableAllowCaveFlyers, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_EnableAllowCaveFlyersTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5" Text="{DynamicResource ServerSettings_AllowFlyingStaminaRecoveryLabel}" IsChecked="{Binding AllowFlyingStaminaRecovery, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_AllowFlyingStaminaRecoveryTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="2" Margin="5" Text="{DynamicResource ServerSettings_AllowFlyerSpeedLevelingLabel}" IsChecked="{Binding AllowFlyerSpeedLeveling, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_AllowFlyerSpeedLevelingTooltip}" HorizontalAlignment="Left"/>
 
-                                        <CheckBox Grid.Row="1" Grid.Column="0" Margin="5" Content="{DynamicResource ServerSettings_PreventMateBoostLabel}" IsChecked="{Binding PreventMateBoost}" ToolTip="{DynamicResource ServerSettings_PreventMateBoostTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="1" Grid.Column="1" Margin="5" Content="{DynamicResource ServerSettings_ForceFlyerExplosivesLabel}" IsChecked="{Binding ForceFlyerExplosives}" ToolTip="{DynamicResource ServerSettings_ForceFlyerExplosivesTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="1" Grid.Column="2" Margin="5" Content="{DynamicResource ServerSettings_AllowMultipleAttachedC4Label}" IsChecked="{Binding AllowMultipleAttachedC4}" ToolTip="{DynamicResource ServerSettings_AllowMultipleAttachedC4Tooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5" Text="{DynamicResource ServerSettings_PreventMateBoostLabel}" IsChecked="{Binding PreventMateBoost, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_PreventMateBoostTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="1" Margin="5" Text="{DynamicResource ServerSettings_ForceFlyerExplosivesLabel}" IsChecked="{Binding ForceFlyerExplosives, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_ForceFlyerExplosivesTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="2" Margin="5" Text="{DynamicResource ServerSettings_AllowMultipleAttachedC4Label}" IsChecked="{Binding AllowMultipleAttachedC4, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_AllowMultipleAttachedC4Tooltip}" HorizontalAlignment="Left"/>
 
-                                        <CheckBox Grid.Row="2" Grid.Column="0" Margin="5" Content="{DynamicResource ServerSettings_DisableDinoDecayLabel}" IsChecked="{Binding DisableDinoDecayPvE}" ToolTip="{DynamicResource ServerSettings_DisableDinoDecayTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="2" Grid.Column="1" Margin="5" Content="{DynamicResource ServerSettings_DisableDinoDecayPvPLabel}" IsChecked="{Binding DisableDinoDecayPvP}" ToolTip="{DynamicResource ServerSettings_DisableDinoDecayPvPTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="2" Grid.Column="2" Margin="5" Content="{DynamicResource ServerSettings_AutoDestroyDecayedDinosLabel}" IsChecked="{Binding AutoDestroyDecayedDinos}" ToolTip="{DynamicResource ServerSettings_AutoDestroyDecayedDinosTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="0" Margin="5" Text="{DynamicResource ServerSettings_DisableDinoDecayLabel}" IsChecked="{Binding DisableDinoDecayPvE, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DisableDinoDecayTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="1" Margin="5" Text="{DynamicResource ServerSettings_DisableDinoDecayPvPLabel}" IsChecked="{Binding DisableDinoDecayPvP, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DisableDinoDecayPvPTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="2" Margin="5" Text="{DynamicResource ServerSettings_AutoDestroyDecayedDinosLabel}" IsChecked="{Binding AutoDestroyDecayedDinos, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_AutoDestroyDecayedDinosTooltip}" HorizontalAlignment="Left"/>
                                     </Grid>
 
                                     <cctl:AnnotatedSlider Margin="0,1,22,1" Label="{DynamicResource ServerSettings_DinoDecayPeriodLabel}" Value="{Binding PvEDinoDecayPeriodMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_DinoDecayPeriodTooltip}"/>
@@ -2502,17 +2507,17 @@
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
 
-                                        <CheckBox Grid.Row="0" Grid.Column="0" Margin="5" Content="{DynamicResource ServerSettings_DisableDinoRidingLabel}" IsChecked="{Binding DisableDinoRiding}" ToolTip="{DynamicResource ServerSettings_DisableDinoRidingTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="0" Grid.Column="1" Margin="5" Content="{DynamicResource ServerSettings_DisableDinoTamingLabel}" IsChecked="{Binding DisableDinoTaming}" ToolTip="{DynamicResource ServerSettings_DisableDinoTamingTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5" Text="{DynamicResource ServerSettings_DisableDinoRidingLabel}" IsChecked="{Binding DisableDinoRiding, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DisableDinoRidingTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5" Text="{DynamicResource ServerSettings_DisableDinoTamingLabel}" IsChecked="{Binding DisableDinoTaming, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DisableDinoTamingTooltip}" HorizontalAlignment="Left"/>
                                     </Grid>
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox x:Name="EnableForceCanRideFliersCheckBox" IsChecked="{Binding EnableForceCanRideFliers}" Content="{DynamicResource ServerSettings_EnableForceCanRideFliersLabel}" ToolTip="{DynamicResource ServerSettings_EnableForceCanRideFliersTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock x:Name="EnableForceCanRideFliersCheckBox" IsChecked="{Binding EnableForceCanRideFliers, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableForceCanRideFliersLabel}" ToolTip="{DynamicResource ServerSettings_EnableForceCanRideFliersTooltip}"/>
                                         </GroupBox.Header>
 
                                         <StackPanel>
-                                            <CheckBox Margin="5" IsChecked="{Binding ForceCanRideFliers}" Content="{DynamicResource ServerSettings_ForceCanRideFliersLabel}" IsEnabled="{Binding ElementName=EnableForceCanRideFliersCheckBox, Path=IsChecked}" ToolTip="{DynamicResource ServerSettings_ForceCanRideFliersTooltip}" HorizontalAlignment="Left"/>
+                                            <cctl:CheckBoxAndTextBlock Margin="5" IsChecked="{Binding ForceCanRideFliers, Mode=TwoWay}" Text="{DynamicResource ServerSettings_ForceCanRideFliersLabel}" IsEnabled="{Binding ElementName=EnableForceCanRideFliersCheckBox, Path=IsChecked}" ToolTip="{DynamicResource ServerSettings_ForceCanRideFliersTooltip}" HorizontalAlignment="Left"/>
                                         </StackPanel>
                                     </GroupBox>
 
@@ -2520,11 +2525,11 @@
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
                                                 <Label Content="{DynamicResource ServerSettings_DinoCustomizationLabel}"/>
-                                                <CheckBox Name="EditSpawnsCheckbox"          Margin="5,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.DinoSpawnWeightMultipliers.IsEnabled, Mode=TwoWay}"          ToolTip="{DynamicResource ServerSettings_SpawnMultipliersOptionTooltip}" Content="{DynamicResource ServerSettings_SpawnMultipliersOptionLabel}"/>
-                                                <CheckBox Name="EditTamedDamageCheckbox"     Margin="0,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.TamedDinoClassDamageMultipliers.IsEnabled, Mode=TwoWay}"     ToolTip="{DynamicResource ServerSettings_TamedDamageOptionTooltip}"      Content="{DynamicResource ServerSettings_TamedDamageOptionLabel}"/>
-                                                <CheckBox Name="EditTamedResistanceCheckbox" Margin="0,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.TamedDinoClassResistanceMultipliers.IsEnabled, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_TamedResistanceOptionTooltip}"  Content="{DynamicResource ServerSettings_TamedResistanceOptionLabel}"/>
-                                                <CheckBox Name="EditWildDamageCheckbox"      Margin="0,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.DinoClassDamageMultipliers.IsEnabled, Mode=TwoWay}"          ToolTip="{DynamicResource ServerSettings_WildDamageOptionTooltip}"       Content="{DynamicResource ServerSettings_WildDamageOptionLabel}"/>
-                                                <CheckBox Name="EditWildResistanceCheckbox"  Margin="0,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.DinoClassResistanceMultipliers.IsEnabled, Mode=TwoWay}"      ToolTip="{DynamicResource ServerSettings_WildResistanceOptionTooltip}"   Content="{DynamicResource ServerSettings_WildResistanceOptionLabel}"/>
+                                                <cctl:CheckBoxAndTextBlock Name="EditSpawnsCheckbox"          Margin="5,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.DinoSpawnWeightMultipliers.IsEnabled, Mode=TwoWay}"          ToolTip="{DynamicResource ServerSettings_SpawnMultipliersOptionTooltip}" Text="{DynamicResource ServerSettings_SpawnMultipliersOptionLabel}"/>
+                                                <cctl:CheckBoxAndTextBlock Name="EditTamedDamageCheckbox"     Margin="0,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.TamedDinoClassDamageMultipliers.IsEnabled, Mode=TwoWay}"     ToolTip="{DynamicResource ServerSettings_TamedDamageOptionTooltip}"      Text="{DynamicResource ServerSettings_TamedDamageOptionLabel}"/>
+                                                <cctl:CheckBoxAndTextBlock Name="EditTamedResistanceCheckbox" Margin="0,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.TamedDinoClassResistanceMultipliers.IsEnabled, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_TamedResistanceOptionTooltip}"  Text="{DynamicResource ServerSettings_TamedResistanceOptionLabel}"/>
+                                                <cctl:CheckBoxAndTextBlock Name="EditWildDamageCheckbox"      Margin="0,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.DinoClassDamageMultipliers.IsEnabled, Mode=TwoWay}"          ToolTip="{DynamicResource ServerSettings_WildDamageOptionTooltip}"       Text="{DynamicResource ServerSettings_WildDamageOptionLabel}"/>
+                                                <cctl:CheckBoxAndTextBlock Name="EditWildResistanceCheckbox"  Margin="0,5,5,5" VerticalAlignment="Center" IsChecked="{Binding DinoSettings.DinoClassResistanceMultipliers.IsEnabled, Mode=TwoWay}"      ToolTip="{DynamicResource ServerSettings_WildResistanceOptionTooltip}"   Text="{DynamicResource ServerSettings_WildResistanceOptionLabel}"/>
                                                 <Button Width="22" Height="22" Margin="10,0,0,0" Click="DinoCustomization_Reset" ToolTip="{DynamicResource ServerSettings_ResetDinoCustomizationsTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -2867,7 +2872,7 @@
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox x:Name="EnableWildDinoPerLevelStatMultipliersCheckbox" Content="{DynamicResource ServerSettings_WildDinoPerLevelStatMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoWild.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatMultipliersTooltip}"/>
+                                                <cctl:CheckBoxAndTextBlock x:Name="EnableWildDinoPerLevelStatMultipliersCheckbox" Text="{DynamicResource ServerSettings_WildDinoPerLevelStatMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoWild.IsEnabled, Mode=TwoWay}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatMultipliersTooltip}"/>
                                                 <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableWildDinoPerLevelStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoWildPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -2901,7 +2906,7 @@
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox x:Name="EnableTamedDinoPerLevelStatMultipliersCheckbox" Content="{DynamicResource ServerSettings_TamedDinoPerLevelStatMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoTamed.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatTamedMultipliersTooltip}"/>
+                                                <cctl:CheckBoxAndTextBlock x:Name="EnableTamedDinoPerLevelStatMultipliersCheckbox" Text="{DynamicResource ServerSettings_TamedDinoPerLevelStatMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoTamed.IsEnabled, Mode=TwoWay}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatTamedMultipliersTooltip}"/>
                                                 <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableTamedDinoPerLevelStatMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoTamedPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -2935,7 +2940,7 @@
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox x:Name="EnableTamedDinoPerLevelStatAddMultipliersCheckbox" Content="{DynamicResource ServerSettings_TamedDinoPerLevelStatAddMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoTamed_Add.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatTamedAddMultipliersTooltip}"/>
+                                                <cctl:CheckBoxAndTextBlock x:Name="EnableTamedDinoPerLevelStatAddMultipliersCheckbox" Text="{DynamicResource ServerSettings_TamedDinoPerLevelStatAddMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoTamed_Add.IsEnabled, Mode=TwoWay}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatTamedAddMultipliersTooltip}"/>
                                                 <Button Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableTamedDinoPerLevelStatAddMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoTamedAddPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -2969,7 +2974,7 @@
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox x:Name="EnableTamedDinoPerLevelStatAffinityMultipliersCheckbox" Content="{DynamicResource ServerSettings_TamedDinoPerLevelStatAffinityMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoTamed_Affinity.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatTamedAffinityMultipliersTooltip}"/>
+                                                <cctl:CheckBoxAndTextBlock x:Name="EnableTamedDinoPerLevelStatAffinityMultipliersCheckbox" Text="{DynamicResource ServerSettings_TamedDinoPerLevelStatAffinityMultipliersLabel}" IsChecked="{Binding PerLevelStatsMultiplier_DinoTamed_Affinity.IsEnabled, Mode=TwoWay}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_PerLevelStatTamedAffinityMultipliersTooltip}"/>
                                                 <Button Width="22" Height="22" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableTamedDinoPerLevelStatAffinityMultipliersCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoTamedAffinityPerLevelStatMultipliers}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -3003,7 +3008,7 @@
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox x:Name="EnableWildDinoMutagenLevelBoostCheckbox" Content="{DynamicResource ServerSettings_DinoWildMutagenLevelBoostLabel}" IsChecked="{Binding MutagenLevelBoost.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_DinoWildMutagenLevelBoostTooltip}"/>
+                                                <cctl:CheckBoxAndTextBlock x:Name="EnableWildDinoMutagenLevelBoostCheckbox" Text="{DynamicResource ServerSettings_DinoWildMutagenLevelBoostLabel}" IsChecked="{Binding MutagenLevelBoost.IsEnabled, Mode=TwoWay}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_DinoWildMutagenLevelBoostTooltip}"/>
                                                 <Button Width="22" Height="22" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableWildDinoMutagenLevelBoostCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoWildMutagenLevelBoost}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -3037,7 +3042,7 @@
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox x:Name="EnableBredDinoMutagenLevelBoostCheckbox" Content="{DynamicResource ServerSettings_DinoBredMutagenLevelBoostLabel}" IsChecked="{Binding MutagenLevelBoostBred.IsEnabled}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_DinoBredMutagenLevelBoostTooltip}"/>
+                                                <cctl:CheckBoxAndTextBlock x:Name="EnableBredDinoMutagenLevelBoostCheckbox" Text="{DynamicResource ServerSettings_DinoBredMutagenLevelBoostLabel}" IsChecked="{Binding MutagenLevelBoostBred.IsEnabled, Mode=TwoWay}" Margin="0,5,5,5" ToolTip="{DynamicResource ServerSettings_DinoBredMutagenLevelBoostTooltip}"/>
                                                 <Button Width="22" Height="22" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableBredDinoMutagenLevelBoostCheckbox, Path=IsChecked}" Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static enum:ServerSettingsResetAction.DinoBredMutagenLevelBoost}" ToolTip="{DynamicResource ServerSettings_ResetPerLevelStatMultipliersTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -3089,8 +3094,8 @@
                                         </GroupBox.Header>
 
                                         <StackPanel>
-                                            <CheckBox Margin="5,0,5,5" Content="{DynamicResource ServerSettings_DisableImprintDinoBuffLabel}" IsChecked="{Binding DisableImprintDinoBuff}" ToolTip="{DynamicResource ServerSettings_DisableImprintDinoBuffTooltip}" HorizontalAlignment="Left"/>
-                                            <CheckBox Margin="5,0,5,5" Content="{DynamicResource ServerSettings_AllowAnyoneBabyImprintCuddleLabel}" IsChecked="{Binding AllowAnyoneBabyImprintCuddle}" ToolTip="{DynamicResource ServerSettings_AllowAnyoneBabyImprintCuddleTooltip}" HorizontalAlignment="Left"/>
+                                            <cctl:CheckBoxAndTextBlock Margin="5,0,5,5" Text="{DynamicResource ServerSettings_DisableImprintDinoBuffLabel}" IsChecked="{Binding DisableImprintDinoBuff, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DisableImprintDinoBuffTooltip}" HorizontalAlignment="Left"/>
+                                            <cctl:CheckBoxAndTextBlock Margin="5,0,5,5" Text="{DynamicResource ServerSettings_AllowAnyoneBabyImprintCuddleLabel}" IsChecked="{Binding AllowAnyoneBabyImprintCuddle, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_AllowAnyoneBabyImprintCuddleTooltip}" HorizontalAlignment="Left"/>
                                             <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_BabyImprintingStatScaleMultiplierLabel}" Value="{Binding BabyImprintingStatScaleMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_BabyImprintingStatScaleMultiplierTooltip}"/>
                                             <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_BabyImprintAmountMultiplierLabel}" Value="{Binding BabyImprintAmountMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_BabyImprintAmountMultiplierTooltip}"/>
                                             <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_BabyCuddleIntervalMultiplierLabel}" Value="{Binding BabyCuddleIntervalMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_BabyCuddleIntervalMultiplierTooltip}"/>
@@ -3137,15 +3142,15 @@
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_SuppressReplenishPlayerLabel}"    Value="{Binding ResourceNoReplenishRadiusPlayers}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_SuppressReplenishPlayerTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_SuppressReplenishStructureLabel}" Value="{Binding ResourceNoReplenishRadiusStructures}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_SuppressReplenishStructureTooltip}"/>
 
-                                    <CheckBox Margin="5" Content="{DynamicResource ServerSettings_ClampResourceHarvestDamageLabel}" IsChecked="{Binding ClampResourceHarvestDamage}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ClampResourceHarvestDamageTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Margin="5" Text="{DynamicResource ServerSettings_ClampResourceHarvestDamageLabel}" IsChecked="{Binding ClampResourceHarvestDamage, Mode=TwoWay}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ClampResourceHarvestDamageTooltip}"/>
 
-                                    <CheckBox Margin="5" Content="{DynamicResource ServerSettings_UseOptimizedHarvestingHealthLabel}" IsChecked="{Binding UseOptimizedHarvestingHealth}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseOptimizedHarvestingHealthTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Margin="5" Text="{DynamicResource ServerSettings_UseOptimizedHarvestingHealthLabel}" IsChecked="{Binding UseOptimizedHarvestingHealth, Mode=TwoWay}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseOptimizedHarvestingHealthTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_HarvestHealthLabel}" Value="{Binding HarvestHealthMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_HarvestHealthTooltip}"/>
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox Name="EnableHarvestResourceItemAmountClassMultipliersCheckbox" Content="{DynamicResource ServerSettings_CustomHarvestMultipliersLabel}" IsChecked="{Binding HarvestResourceItemAmountClassMultipliers.IsEnabled}" ToolTip="{DynamicResource ServerSettings_CustomHarvestMultipliersTooltip}" VerticalAlignment="Center"/>
+                                                <cctl:CheckBoxAndTextBlock Name="EnableHarvestResourceItemAmountClassMultipliersCheckbox" Text="{DynamicResource ServerSettings_CustomHarvestMultipliersLabel}" IsChecked="{Binding HarvestResourceItemAmountClassMultipliers.IsEnabled, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_CustomHarvestMultipliersTooltip}" VerticalAlignment="Center"/>
                                                 <Button   Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnableHarvestResourceItemAmountClassMultipliersCheckbox, Path=IsChecked}" Click="HarvestResourceItemAmountClassMultipliers_Reset" ToolTip="{DynamicResource ServerSettings_ResetCustomHarvestTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                                 </Button>
@@ -3266,9 +3271,9 @@
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_DayCycleSpeedLabel}" Value="{Binding DayCycleSpeedScale}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_DayCycleSpeedTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_DayTimeSpeedLabel}" Value="{Binding DayTimeSpeedScale}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_DayTimeSpeedTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_NightTimeSpeedLabel}" Value="{Binding NightTimeSpeedScale}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_NightTimeSpeedTooltip}"/>
-                                    <CheckBox Margin="5" Content="{DynamicResource ServerSettings_DisableWeatherFogLabel}" IsChecked="{Binding DisableWeatherFog}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableWeatherFogTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Margin="5" Text="{DynamicResource ServerSettings_DisableWeatherFogLabel}" IsChecked="{Binding DisableWeatherFog, Mode=TwoWay}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableWeatherFogTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_GlobalSpoilingTimeLabel}" Value="{Binding GlobalSpoilingTimeMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_GlobalSpoilingTimeTooltip}"/>
-                                    <CheckBox Margin="5" Content="{DynamicResource ServerSettings_ClampItemSpoilingTimesLabel}" IsChecked="{Binding ClampItemSpoilingTimes}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ClampItemSpoilingTimesTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Margin="5" Text="{DynamicResource ServerSettings_ClampItemSpoilingTimesLabel}" IsChecked="{Binding ClampItemSpoilingTimes, Mode=TwoWay}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_ClampItemSpoilingTimesTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_GlobalItemDecompTimeLabel}" Value="{Binding GlobalItemDecompositionTimeMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_GlobalItemDecompTimeTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_GlobalCorpseDecompTimeLabel}" Value="{Binding GlobalCorpseDecompositionTimeMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_GlobalCorpseDecompTimeTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_CropDecaySpeedLabel}" Value="{Binding CropDecaySpeedMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_CropDecaySpeedTooltip}"/>
@@ -3322,26 +3327,26 @@
 
                             <Grid Margin="-8,0,2,0">
                                 <StackPanel Grid.Column="0">
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_DisableStructurePlacementCollisionLabel}" IsChecked="{Binding DisableStructurePlacementCollision}" ToolTip="{DynamicResource ServerSettings_DisableStructurePlacementCollisionTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_DisableStructurePlacementCollisionLabel}" IsChecked="{Binding DisableStructurePlacementCollision, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DisableStructurePlacementCollisionTooltip}" HorizontalAlignment="Left"/>
 
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_StructureResistanceLabel}" Value="{Binding StructureResistanceMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_StructureResistanceTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_StructureDamageLabel}" Value="{Binding StructureDamageMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_StructureDamageTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_StructureDamageRepairCooldownLabel}" Value="{Binding StructureDamageRepairCooldown}" Suffix="{DynamicResource SliderUnits_Seconds}" Minimum="0" Maximum="1000" SmallChange="10" LargeChange="50" TickFrequency="10" ToolTip="{DynamicResource ServerSettings_StructureDamageRepairCooldownTooltip}" />
 
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_EnablePvPStructureDecayLabel}" IsChecked="{Binding PvPStructureDecay}" ToolTip="{DynamicResource ServerSettings_EnablePvPStructureDecayTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_EnablePvPStructureDecayLabel}" IsChecked="{Binding PvPStructureDecay, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_EnablePvPStructureDecayTooltip}" HorizontalAlignment="Left"/>
 
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_PvPZoneStructureDamageLabel}" Value="{Binding PvPZoneStructureDamageMultiplier}" Suffix="{DynamicResource SliderUnits_Multiplier}" Minimum="0" Maximum="10" SmallChange="0.1" LargeChange="1" TickFrequency="1" ToolTip="{DynamicResource ServerSettings_PvPZoneStructureDamageTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_MaxStructuresVisibleLabel}" Value="{Binding MaxStructuresInRange}" Minimum="50" Maximum="50000" LargeChange="50" SmallChange="10" TickFrequency="100" Suffix="{DynamicResource SliderUnits_Items}" ToolTip="{DynamicResource ServerSettings_MaxStructuresVisibleTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_PerPlatformStructuresMultiplierLabel}" Value="{Binding PerPlatformMaxStructuresMultiplier}" Minimum="0" Maximum="10" LargeChange="1" SmallChange="0.1" TickFrequency="1" Suffix="{DynamicResource SliderUnits_Multiplier}" ToolTip="{DynamicResource ServerSettings_PerPlatformStructuresMultiplierTooltip}"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_MaxPlatformSaddleStructuresLabel}" Value="{Binding MaxPlatformSaddleStructureLimit}" Minimum="0" Maximum="65535" LargeChange="50" SmallChange="10" TickFrequency="100" Suffix="{DynamicResource SliderUnits_Items}" ToolTip="{DynamicResource ServerSettings_MaxPlatformSaddleStructuresTooltip}"/>
 
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_OverrideStructurePlatformPreventionLabel}" IsChecked="{Binding OverrideStructurePlatformPrevention}" ToolTip="{DynamicResource ServerSettings_OverrideStructurePlatformPreventionTooltip}" HorizontalAlignment="Left"/>
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_AllowUnalignedDinosOnFlyerPlatformLabel}" IsChecked="{Binding FlyerPlatformAllowUnalignedDinoBasing}" ToolTip="{DynamicResource ServerSettings_AllowUnalignedDinosOnFlyerPlatformTooltip}" HorizontalAlignment="Left"/>
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_PvEAllowStructuresAtSupplyDropsLabel}" IsChecked="{Binding PvEAllowStructuresAtSupplyDrops}" ToolTip="{DynamicResource ServerSettings_PvEAllowStructuresAtSupplyDropsTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_OverrideStructurePlatformPreventionLabel}" IsChecked="{Binding OverrideStructurePlatformPrevention, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_OverrideStructurePlatformPreventionTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_AllowUnalignedDinosOnFlyerPlatformLabel}" IsChecked="{Binding FlyerPlatformAllowUnalignedDinoBasing, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_AllowUnalignedDinosOnFlyerPlatformTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_PvEAllowStructuresAtSupplyDropsLabel}" IsChecked="{Binding PvEAllowStructuresAtSupplyDrops, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_PvEAllowStructuresAtSupplyDropsTooltip}" HorizontalAlignment="Left"/>
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox x:Name="StructureDecayPvECheckbox" IsChecked="{Binding EnableStructureDecayPvE}" Content="{DynamicResource ServerSettings_EnableStructureDecayPvELabel}" ToolTip="{DynamicResource ServerSettings_EnableStructureDecayPvETooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock x:Name="StructureDecayPvECheckbox" IsChecked="{Binding EnableStructureDecayPvE, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableStructureDecayPvELabel}" ToolTip="{DynamicResource ServerSettings_EnableStructureDecayPvETooltip}"/>
                                         </GroupBox.Header>
 
                                         <StackPanel Orientation="Vertical">
@@ -3350,17 +3355,17 @@
                                         </StackPanel>
                                     </GroupBox>
 
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_EnableAutoDestroyStructuresLabel}" IsChecked="{Binding EnableAutoDestroyStructures}" ToolTip="{DynamicResource ServerSettings_EnableAutoDestroyStructuresTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_EnableAutoDestroyStructuresLabel}" IsChecked="{Binding EnableAutoDestroyStructures, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_EnableAutoDestroyStructuresTooltip}" HorizontalAlignment="Left"/>
                                     <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_AutoDestroyOldStructuresLabel}" Value="{Binding AutoDestroyOldStructuresMultiplier}" Minimum="0" Maximum="10" LargeChange="1" SmallChange="0.1" TickFrequency="1" Suffix="{DynamicResource SliderUnits_Multiplier}" ToolTip="{DynamicResource ServerSettings_AutoDestroyOldStructuresTooltip}"/>
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_OnlyAutoDestroyCoreStructuresLabel}" IsChecked="{Binding OnlyAutoDestroyCoreStructures}" ToolTip="{DynamicResource ServerSettings_OnlyAutoDestroyCoreStructuresTooltip}" HorizontalAlignment="Left"/>
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_OnlyDecayUnsnappedCoreStructuresLabel}" IsChecked="{Binding OnlyDecayUnsnappedCoreStructures}" ToolTip="{DynamicResource ServerSettings_OnlyDecayUnsnappedCoreStructuresTooltip}" HorizontalAlignment="Left"/>
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_FastDecayUnsnappedCoreStructuresLabel}" IsChecked="{Binding FastDecayUnsnappedCoreStructures}" ToolTip="{DynamicResource ServerSettings_FastDecayUnsnappedCoreStructuresTooltip}" HorizontalAlignment="Left"/>
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_DestroyUnconnectedWaterPipesLabel}" IsChecked="{Binding DestroyUnconnectedWaterPipes}" ToolTip="{DynamicResource ServerSettings_DestroyUnconnectedWaterPipesTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_OnlyAutoDestroyCoreStructuresLabel}" IsChecked="{Binding OnlyAutoDestroyCoreStructures, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_OnlyAutoDestroyCoreStructuresTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_OnlyDecayUnsnappedCoreStructuresLabel}" IsChecked="{Binding OnlyDecayUnsnappedCoreStructures, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_OnlyDecayUnsnappedCoreStructuresTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_FastDecayUnsnappedCoreStructuresLabel}" IsChecked="{Binding FastDecayUnsnappedCoreStructures, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_FastDecayUnsnappedCoreStructuresTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_DestroyUnconnectedWaterPipesLabel}" IsChecked="{Binding DestroyUnconnectedWaterPipes, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_DestroyUnconnectedWaterPipesTooltip}" HorizontalAlignment="Left"/>
 
 
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox x:Name="FastDecayIntervalCheckbox" IsChecked="{Binding EnableFastDecayInterval}" Content="{DynamicResource ServerSettings_EnableFastDecayIntervalLabel}" ToolTip="{DynamicResource ServerSettings_EnableFastDecayIntervalTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock x:Name="FastDecayIntervalCheckbox" IsChecked="{Binding EnableFastDecayInterval, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableFastDecayIntervalLabel}" ToolTip="{DynamicResource ServerSettings_EnableFastDecayIntervalTooltip}"/>
                                         </GroupBox.Header>
 
                                         <StackPanel Orientation="Vertical">
@@ -3368,13 +3373,13 @@
                                         </StackPanel>
                                     </GroupBox>
 
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_ForceAllStructureLockingLabel}" IsChecked="{Binding ForceAllStructureLocking}" ToolTip="{DynamicResource ServerSettings_ForceAllStructureLockingTooltip}" HorizontalAlignment="Left"/>
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_PassiveDefensesDamageDinosLabel}" IsChecked="{Binding PassiveDefensesDamageRiderlessDinos}" ToolTip="{DynamicResource ServerSettings_PassiveDefensesDamageDinosTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_ForceAllStructureLockingLabel}" IsChecked="{Binding ForceAllStructureLocking, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_ForceAllStructureLockingTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_PassiveDefensesDamageDinosLabel}" IsChecked="{Binding PassiveDefensesDamageRiderlessDinos, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_PassiveDefensesDamageDinosTooltip}" HorizontalAlignment="Left"/>
 
-                                    <CheckBox              Margin="5" Content="{DynamicResource ServerSettings_HardLimitTurretsInRangeLabel}" IsChecked="{Binding HardLimitTurretsInRange}" ToolTip="{DynamicResource ServerSettings_HardLimitTurretsInRangeTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock              Margin="5" Text="{DynamicResource ServerSettings_HardLimitTurretsInRangeLabel}" IsChecked="{Binding HardLimitTurretsInRange, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_HardLimitTurretsInRangeTooltip}" HorizontalAlignment="Left"/>
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
-                                            <CheckBox x:Name="LimitTurretsInRangeCheckbox" IsChecked="{Binding LimitTurretsInRange}" Content="{DynamicResource ServerSettings_LimitTurretsInRangeLabel}" ToolTip="{DynamicResource ServerSettings_LimitTurretsInRangeTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock x:Name="LimitTurretsInRangeCheckbox" IsChecked="{Binding LimitTurretsInRange, Mode=TwoWay}" Text="{DynamicResource ServerSettings_LimitTurretsInRangeLabel}" ToolTip="{DynamicResource ServerSettings_LimitTurretsInRangeTooltip}"/>
                                         </GroupBox.Header>
 
                                         <StackPanel Orientation="Vertical">
@@ -3389,13 +3394,13 @@
                                         </GroupBox.Header>
 
                                         <StackPanel>
-                                            <CheckBox             Margin="5" IsChecked="{Binding AlwaysAllowStructurePickup}" Content="{DynamicResource ServerSettings_AlwaysAllowStructurePickupLabel}" ToolTip="{DynamicResource ServerSettings_AlwaysAllowStructurePickupTooltip}" HorizontalAlignment="Left"/>
+                                            <cctl:CheckBoxAndTextBlock     Margin="5" IsChecked="{Binding AlwaysAllowStructurePickup, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AlwaysAllowStructurePickupLabel}" ToolTip="{DynamicResource ServerSettings_AlwaysAllowStructurePickupTooltip}" HorizontalAlignment="Left"/>
                                             <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_StructurePickupTimeAfterPlacementLabel}" Value="{Binding StructurePickupTimeAfterPlacement}" Minimum="1" Maximum="3600" LargeChange="30" SmallChange="5" TickFrequency="60" Suffix="{DynamicResource SliderUnits_Seconds}" ToolTip="{DynamicResource ServerSettings_StructurePickupTimeAfterPlacementTooltip}"/>
                                             <cctl:AnnotatedSlider Margin="1" Label="{DynamicResource ServerSettings_StructurePickupHoldDurationLabel}" Value="{Binding StructurePickupHoldDuration}" Minimum="0" Maximum="60" LargeChange="5" SmallChange="1" TickFrequency="5" Suffix="{DynamicResource SliderUnits_Seconds}" ToolTip="{DynamicResource ServerSettings_StructurePickupHoldDurationTooltip}"/>
                                         </StackPanel>
                                     </GroupBox>
 
-                                    <CheckBox Margin="5" IsChecked="{Binding AllowIntegratedSPlusStructures}" Content="{DynamicResource ServerSettings_AllowIntegratedSPlusStructuresLabel}" ToolTip="{DynamicResource ServerSettings_AllowIntegratedSPlusStructuresTooltip}" HorizontalAlignment="Left"/>
+                                    <cctl:CheckBoxAndTextBlock Margin="5" IsChecked="{Binding AllowIntegratedSPlusStructures, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowIntegratedSPlusStructuresLabel}" ToolTip="{DynamicResource ServerSettings_AllowIntegratedSPlusStructuresTooltip}" HorizontalAlignment="Left"/>
 
                                     <GroupBox Header="{DynamicResource Mod_Genesis}" Style="{StaticResource GroupBoxStyle}">
                                         <Grid>
@@ -3408,7 +3413,7 @@
                                                 <ColumnDefinition Width="*"/>
                                             </Grid.ColumnDefinitions>
 
-                                            <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding GenesisUseStructuresPreventionVolumes}" Content="{DynamicResource ServerSettings_GenesisUseStructuresPreventionVolumesLabel}" ToolTip="{DynamicResource ServerSettings_GenesisUseStructuresPreventionVolumesTooltip}" HorizontalAlignment="Left"/>
+                                            <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding GenesisUseStructuresPreventionVolumes, Mode=TwoWay}" Text="{DynamicResource ServerSettings_GenesisUseStructuresPreventionVolumesLabel}" ToolTip="{DynamicResource ServerSettings_GenesisUseStructuresPreventionVolumesTooltip}" HorizontalAlignment="Left"/>
                                         </Grid>
                                     </GroupBox>
                                 </StackPanel>
@@ -3449,12 +3454,12 @@
                                     <RowDefinition Height="1" MinHeight="1"/> <!--Empty Row for Last Splitter-->
                                 </Grid.RowDefinitions>
 
-                                <CheckBox Grid.Row="0" Margin="5" Content="{DynamicResource ServerSettings_AutoUnlockAllEngramsLabel}" IsChecked="{Binding AutoUnlockAllEngrams}" ToolTip="{DynamicResource ServerSettings_AutoUnlockAllEngramsTooltip}" HorizontalAlignment="Left"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="0" Margin="5" Text="{DynamicResource ServerSettings_AutoUnlockAllEngramsLabel}" IsChecked="{Binding AutoUnlockAllEngrams, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_AutoUnlockAllEngramsTooltip}" HorizontalAlignment="Left"/>
 
                                 <GroupBox Grid.Row="1" Style="{StaticResource GroupBoxStyle}">
                                     <GroupBox.Header>
                                         <StackPanel Orientation="Horizontal">
-                                            <CheckBox IsChecked="{Binding EngramSettings.IsEnabled}" Content="{DynamicResource ServerSettings_EnableEngramsOverrideLabel}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_EnableEngramsOverrideTooltip}"/>
+                                            <cctl:CheckBoxAndTextBlock IsChecked="{Binding EngramSettings.IsEnabled, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableEngramsOverrideLabel}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_EnableEngramsOverrideTooltip}"/>
                                             <Button Margin="20,0,0,0" Click="Engrams_Reset" IsEnabled="{Binding EngramSettings.IsEnabled}" ToolTip="{DynamicResource ServerSettings_ResetEngramsLabel}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
                                             </Button>
@@ -3482,7 +3487,7 @@
                                         </Grid.RowDefinitions>
 
                                         <StackPanel Grid.Row="0" Orientation="Horizontal"  Margin="0,2,0,0">
-                                            <CheckBox x:Name="OnlyAllowSpecifiedEngramsCheckBox"  Margin="5" Content="{DynamicResource ServerSettings_OnlyAllowSpecifiedEngramsLabel}" IsChecked="{Binding OnlyAllowSpecifiedEngrams, Mode=TwoWay}" IsEnabled="{Binding EngramSettings.IsEnabled}" ToolTip="{DynamicResource ServerSettings_OnlyAllowSpecifiedEngramsTooltip}" HorizontalAlignment="Left"/>
+                                            <cctl:CheckBoxAndTextBlock x:Name="OnlyAllowSpecifiedEngramsCheckBox"  Margin="5" Text="{DynamicResource ServerSettings_OnlyAllowSpecifiedEngramsLabel}" IsChecked="{Binding OnlyAllowSpecifiedEngrams, Mode=TwoWay}" IsEnabled="{Binding EngramSettings.IsEnabled}" ToolTip="{DynamicResource ServerSettings_OnlyAllowSpecifiedEngramsTooltip}" HorizontalAlignment="Left"/>
                                             <Button Width="22" Height="22" Margin="20,0,0,0" Click="Engrams_SelectAll" ToolTip="{DynamicResource ServerSettings_EngramsSelectAllTooltip}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Checked.ico,Size=32}"/>
                                                 <Button.Style>
@@ -3522,9 +3527,9 @@
                                             <Button Margin="5,0,2,0" Width="22" Height="22" HorizontalAlignment="Left" VerticalAlignment="Center" Click="FilterEngram_Click" IsEnabled="{Binding EngramSettings.IsEnabled}" ToolTip="{DynamicResource General_FilterButtonTooltip}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Filter.ico,Size=32}"/>
                                             </Button>
-                                            <CheckBox Name="FilterOnlySelectedEngramsCheckBox" Margin="5,0,0,0" Content="{DynamicResource ServerSettings_FilterOnlySelectedEngramsLabel}" IsChecked="{Binding FilterOnlySelectedEngrams, ElementName=SettingsControl, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_FilterOnlySelectedEngramsTooltip}" HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center">
-                                                <CheckBox.Style>
-                                                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
+                                            <cctl:CheckBoxAndTextBlock Name="FilterOnlySelectedEngramsCheckBox" Margin="5,0,0,0" Text="{DynamicResource ServerSettings_FilterOnlySelectedEngramsLabel}" IsChecked="{Binding FilterOnlySelectedEngrams, ElementName=SettingsControl, Mode=TwoWay}" ToolTip="{DynamicResource ServerSettings_FilterOnlySelectedEngramsTooltip}" HorizontalAlignment="Left" VerticalAlignment="Center" VerticalContentAlignment="Center">
+                                                <cctl:CheckBoxAndTextBlock.Style>
+                                                    <Style TargetType="{x:Type cctl:CheckBoxAndTextBlock}">
                                                         <Style.Triggers>
                                                             <DataTrigger Binding="{Binding Settings.EngramSettings.IsEnabled, ElementName=SettingsControl}" Value="false">
                                                                 <Setter Property="IsEnabled" Value="False"/>
@@ -3534,8 +3539,8 @@
                                                             </DataTrigger>
                                                         </Style.Triggers>
                                                     </Style>
-                                                </CheckBox.Style>
-                                            </CheckBox>
+                                                </cctl:CheckBoxAndTextBlock.Style>
+                                            </cctl:CheckBoxAndTextBlock>
                                         </StackPanel>
 
                                         <DataGrid Grid.Row="2" Margin="0,5,0,0" Name="EngramsOverrideGrid" ItemsSource="{Binding Source={StaticResource EngramsViewSource}}" IsEnabled="{Binding EngramSettings.IsEnabled}" FrozenColumnCount="1" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserSortColumns="true" SelectionMode="Single" CanUserResizeRows="False" RowHeaderWidth="0" GridLinesVisibility="Horizontal">
@@ -4004,7 +4009,7 @@
                                 <GroupBox Grid.Row="1" Grid.Column="2" HorizontalAlignment="Stretch">
                                     <GroupBox.Header>
                                         <StackPanel Orientation="Horizontal">
-                                            <CheckBox Margin="0,6,0,5" IsChecked="{Binding EnableExclusiveJoin}" Content="{DynamicResource ServerSettings_EnableExclusiveJoinLabel}" ToolTip="{DynamicResource ServerSettings_EnableExclusiveJoinTooltip}" VerticalAlignment="Center"/>
+                                            <cctl:CheckBoxAndTextBlock Margin="0,6,0,5" IsChecked="{Binding EnableExclusiveJoin, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableExclusiveJoinLabel}" ToolTip="{DynamicResource ServerSettings_EnableExclusiveJoinTooltip}" VerticalAlignment="Center"/>
                                             <Button Width="22" Height="22" Click="AddExclusivePlayer_Click" Margin="20,0,0,0" ToolTip="{DynamicResource ServerSettings_AddExclusivePlayerTooltip}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Add.ico,Size=32}"/>
                                             </Button>
@@ -4628,8 +4633,8 @@
 
                                 <TextBlock Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Margin="5" Text="{Binding CustomLevelProgressionsInformation, ElementName=SettingsControl, FallbackValue=NOTE: Custom Player and Dino levels..}" TextWrapping="Wrap" VerticalAlignment="Center" FontWeight="Bold"/>
 
-                                <CheckBox Grid.Row="3" Grid.Column="0" Margin="5" Name="EnableLevelsCheckbox" Content="{DynamicResource ServerSettings_EnableCustomLevelProgressionsLabel}" IsChecked="{Binding EnableLevelProgressions, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True}" SourceUpdated="EnableLevelProgressions_SourceUpdated" ToolTip="{DynamicResource ServerSettings_EnableCustomLevelProgressionsTooltip}" HorizontalAlignment="Left"/>
-                                <CheckBox Grid.Row="3" Grid.Column="2" Margin="5" Name="EnableDinoLevelsCheckbox" Content="{DynamicResource ServerSettings_EnableDinoLevelProgressionsLabel}" IsChecked="{Binding EnableDinoLevelProgressions, Mode=TwoWay}" IsEnabled="{Binding EnableLevelProgressions}" ToolTip="{DynamicResource ServerSettings_EnableDinoLevelProgressionsTooltip}" HorizontalAlignment="Left"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="3" Grid.Column="0" Margin="5" Name="EnableLevelsCheckbox" Text="{DynamicResource ServerSettings_EnableCustomLevelProgressionsLabel}" IsChecked="{Binding EnableLevelProgressions, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True}" SourceUpdated="EnableLevelProgressions_SourceUpdated" ToolTip="{DynamicResource ServerSettings_EnableCustomLevelProgressionsTooltip}" HorizontalAlignment="Left"/>
+                                <cctl:CheckBoxAndTextBlock Grid.Row="3" Grid.Column="2" Margin="5" Name="EnableDinoLevelsCheckbox" Text="{DynamicResource ServerSettings_EnableDinoLevelProgressionsLabel}" IsChecked="{Binding EnableDinoLevelProgressions, Mode=TwoWay}" IsEnabled="{Binding EnableLevelProgressions}" ToolTip="{DynamicResource ServerSettings_EnableDinoLevelProgressionsTooltip}" HorizontalAlignment="Left"/>
 
                                 <GroupBox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Stretch" Style="{StaticResource GroupBoxStyle}">
                                     <GroupBox.Header>
@@ -6139,7 +6144,7 @@
                                     <GroupBox Style="{StaticResource GroupBoxStyle}">
                                         <GroupBox.Header>
                                             <StackPanel Orientation="Horizontal">
-                                                <CheckBox Name="EnablePGMCheckbox" IsChecked="{Binding PGM_Enabled}" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_PGM_EnableLabel}" ToolTip="{DynamicResource ServerSettings_PGM_EnableTooltip}" VerticalContentAlignment="Center" FontWeight="Bold"/>
+                                                <cctl:CheckBoxAndTextBlock Name="EnablePGMCheckbox" IsChecked="{Binding PGM_Enabled, Mode=TwoWay}" IsEnabled="{Binding ElementName=EnableSOTFCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}}" VerticalAlignment="Center" Text="{DynamicResource ServerSettings_PGM_EnableLabel}" ToolTip="{DynamicResource ServerSettings_PGM_EnableTooltip}" VerticalContentAlignment="Center" FontWeight="Bold"/>
                                                 <Button Click="PastePGMSettings_Click" Margin="20,0,0,0" IsEnabled="{Binding ElementName=EnablePGMCheckbox, Path=IsChecked}" ToolTip="{DynamicResource ServerSettings_PGM_PasteSettingsTooltip}" Style="{StaticResource ButtonStyle1}">
                                                     <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Paste.ico,Size=32}"/>
                                                 </Button>
@@ -6428,7 +6433,7 @@
                                 <GroupBox Style="{StaticResource GroupBoxStyle}">
                                     <GroupBox.Header>
                                         <StackPanel Orientation="Horizontal">
-                                            <CheckBox Name="EnableSOTFCheckbox" IsChecked="{Binding SOTF_Enabled, NotifyOnSourceUpdated=True}" IsEnabled="{Binding ElementName=EnablePGMCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" Content="{DynamicResource ServerSettings_EnableSOTFLabel}" ToolTip="{DynamicResource ServerSettings_EnableSOTFTooltip}" VerticalContentAlignment="Center" FontWeight="Bold" SourceUpdated="EnableSOTFCheckbox_SourceUpdated" />
+                                            <cctl:CheckBoxAndTextBlock Name="EnableSOTFCheckbox" IsChecked="{Binding SOTF_Enabled, Mode=TwoWay, NotifyOnSourceUpdated=True}" IsEnabled="{Binding ElementName=EnablePGMCheckbox, Path=IsChecked, Converter={StaticResource InvertBooleanConverter}, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" Text="{DynamicResource ServerSettings_EnableSOTFLabel}" ToolTip="{DynamicResource ServerSettings_EnableSOTFTooltip}" VerticalContentAlignment="Center" FontWeight="Bold" SourceUpdated="EnableSOTFCheckbox_SourceUpdated" />
                                             <Button Margin="20,5,5,5" Click="HelpSOTF_Click" BorderThickness="0" Background="{StaticResource BeigeGradient}"  ToolTip="{DynamicResource ServerSettings_SOTF_HelpTooltip}" Style="{StaticResource ButtonStyle1}">
                                                 <Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Help.ico,Size=32}"/>
                                             </Button>
@@ -6457,15 +6462,15 @@
                                             <ColumnDefinition/>
                                         </Grid.ColumnDefinitions>
 
-                                        <CheckBox Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding SOTF_OutputGameReport}" Content="{DynamicResource ServerSettings_EnableOutputGameReportLabel}" ToolTip="{DynamicResource ServerSettings_EnableOutputGameReportTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding SOTF_GamePlayLogging}" Content="{DynamicResource ServerSettings_EnableGamePlayLoggingLabel}" ToolTip="{DynamicResource ServerSettings_EnableGamePlayLoggingTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding SOTF_OutputGameReport, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableOutputGameReportLabel}" ToolTip="{DynamicResource ServerSettings_EnableOutputGameReportTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding SOTF_GamePlayLogging, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableGamePlayLoggingLabel}" ToolTip="{DynamicResource ServerSettings_EnableGamePlayLoggingTooltip}" HorizontalAlignment="Left"/>
 
-                                        <CheckBox Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding SOTF_DisableDeathSPectator}" Content="{DynamicResource ServerSettings_DisableDeathSpectatorLabel}" ToolTip="{DynamicResource ServerSettings_DisableDeathSpectatorTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="1" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding SOTF_OnlyAdminRejoinAsSpectator}" Content="{DynamicResource ServerSettings_OnlyAdminRejoinSpectatorLabel}"  ToolTip="{DynamicResource ServerSettings_OnlyAdminRejoinSpectatorTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding SOTF_DisableDeathSPectator, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableDeathSpectatorLabel}" ToolTip="{DynamicResource ServerSettings_DisableDeathSpectatorTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding SOTF_OnlyAdminRejoinAsSpectator, Mode=TwoWay}" Text="{DynamicResource ServerSettings_OnlyAdminRejoinSpectatorLabel}"  ToolTip="{DynamicResource ServerSettings_OnlyAdminRejoinSpectatorTooltip}" HorizontalAlignment="Left"/>
 
-                                        <CheckBox Grid.Row="0" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding SOTF_NoEvents}" Content="{DynamicResource ServerSettings_SOTFNoEventsLabel}" ToolTip="{DynamicResource ServerSettings_SOTFNoEventsTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="1" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding SOTF_NoBosses}" Content="{DynamicResource ServerSettings_SOTFNoBossesLabel}" ToolTip="{DynamicResource ServerSettings_SOTFNoBossesTooltip}" HorizontalAlignment="Left"/>
-                                        <CheckBox Grid.Row="2" Grid.Column="2" Margin="5" IsChecked="{Binding SOTF_BothBosses}" Content="{DynamicResource ServerSettings_SOTFBothBossesLabel}" ToolTip="{DynamicResource ServerSettings_SOTFBothBossesTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding SOTF_NoEvents, Mode=TwoWay}" Text="{DynamicResource ServerSettings_SOTFNoEventsLabel}" ToolTip="{DynamicResource ServerSettings_SOTFNoEventsTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding SOTF_NoBosses, Mode=TwoWay}" Text="{DynamicResource ServerSettings_SOTFNoBossesLabel}" ToolTip="{DynamicResource ServerSettings_SOTFNoBossesTooltip}" HorizontalAlignment="Left"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="2" Margin="5" IsChecked="{Binding SOTF_BothBosses, Mode=TwoWay}" Text="{DynamicResource ServerSettings_SOTFBothBossesLabel}" ToolTip="{DynamicResource ServerSettings_SOTFBothBossesTooltip}" HorizontalAlignment="Left"/>
 
                                         <cctl:AnnotatedSlider Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="3" Margin="1" Label="{DynamicResource ServerSettings_MaxPlayersInTribeLabel}" Value="{Binding SOTF_MaxNumberOfPlayersInTribe}" Suffix="{DynamicResource SliderUnits_Players}" Minimum="1" Maximum="127" SmallChange="5" LargeChange="20" TickFrequency="10" ToolTip="{DynamicResource ServerSettings_MaxPlayersInTribeTooltip}"/>
                                         <cctl:AnnotatedSlider Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3" Margin="1" Label="{DynamicResource ServerSettings_TribesRequiredForGameLabel}" Value="{Binding SOTF_BattleNumOfTribesToStartGame}" Suffix="{DynamicResource SliderUnits_Tribes}" Minimum="1" Maximum="127" SmallChange="5" LargeChange="20" TickFrequency="10" ToolTip="{DynamicResource ServerSettings_TribesRequiredForGameTooltip}"/>
diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
index 8127bbcc..848d0ade 100644
--- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
+++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
@@ -1,4 +1,16 @@
-using System;
+using Microsoft.WindowsAPICodePack.Dialogs;
+using ServerManagerTool.Common;
+using ServerManagerTool.Common.Controls;
+using ServerManagerTool.Common.Lib;
+using ServerManagerTool.Common.Model;
+using ServerManagerTool.Common.Serialization;
+using ServerManagerTool.Common.Utils;
+using ServerManagerTool.Enums;
+using ServerManagerTool.Lib;
+using ServerManagerTool.Lib.ViewModel;
+using ServerManagerTool.Plugin.Common;
+using ServerManagerTool.Utils;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -13,17 +25,7 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
-using Microsoft.WindowsAPICodePack.Dialogs;
-using ServerManagerTool.Common;
-using ServerManagerTool.Common.Lib;
-using ServerManagerTool.Common.Model;
-using ServerManagerTool.Common.Serialization;
-using ServerManagerTool.Common.Utils;
-using ServerManagerTool.Enums;
-using ServerManagerTool.Lib;
-using ServerManagerTool.Lib.ViewModel;
-using ServerManagerTool.Plugin.Common;
-using ServerManagerTool.Utils;
+using System.Windows.Media;
 using WPFSharp.Globalizer;
 
 namespace ServerManagerTool
@@ -32,6 +34,8 @@ namespace ServerManagerTool
     {
         private readonly GlobalizedApplication _globalizer = GlobalizedApplication.Instance;
         private CancellationTokenSource _upgradeCancellationSource = null;
+        private FindSettingWindow _findSettingWindow = null;
+        private Control _lastFoundControl = null;
 
         // Using a DependencyProperty as the backing store for ServerManager.  This enables animation, styling, binding, etc...
         public static readonly DependencyProperty BaseDinoModListProperty = DependencyProperty.Register(nameof(BaseDinoModList), typeof(ComboBoxItemList), typeof(ServerSettingsControl), new PropertyMetadata(null));
@@ -427,6 +431,12 @@ namespace ServerManagerTool
                 RefreshBaseGameMapsList();
                 RefreshBaseTotalConversionsList();
             }
+
+            if (sender is FindSettingWindow)
+            {
+                _findSettingWindow = null;
+                UnselectControl();
+            }
         }
 
         private void ModDetailsWindow_SavePerformed(object sender, ProfileEventArgs e)
@@ -1149,6 +1159,18 @@ namespace ServerManagerTool
             window.ShowDialog();
         }
 
+        private void SettingFind_Click(object sender, RoutedEventArgs e)
+        {
+            if (_findSettingWindow is null)
+            {
+                _findSettingWindow = new FindSettingWindow(this);
+                _findSettingWindow.Owner = Window.GetWindow(this);
+                _findSettingWindow.Closed += Window_Closed;
+            }
+            _findSettingWindow.Show();
+            _findSettingWindow.Focus();
+        }
+
         private void HiddenField_GotFocus(object sender, RoutedEventArgs e)
         {
             var hideTextBox = sender as TextBox;
@@ -1282,7 +1304,7 @@ namespace ServerManagerTool
 
         private void EnableSOTFCheckbox_SourceUpdated(object sender, DataTransferEventArgs e)
         {
-            var checkBox = sender as CheckBox;
+            var checkBox = sender as CheckBoxAndTextBlock;
             if (checkBox == null || checkBox != EnableSOTFCheckbox)
                 return;
 
@@ -4333,6 +4355,65 @@ namespace ServerManagerTool
             }
         }
 
+        public void SelectControl(Control control)
+        {
+            if (control is null)
+                return;
+
+            bool focused = false;
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                Window.GetWindow(this)?.Activate();
+
+                UnselectControl();
+
+                var parent = WindowUtils.TryFindParent<Expander>(control);
+                if (parent != null)
+                {
+                    parent.IsExpanded = true;
+                }
+
+                control.Background = Brushes.AliceBlue;
+                control.BringIntoView();
+
+                if (control is AnnotatedSlider)
+                {
+                    focused = ((AnnotatedSlider)control).Focus();
+                }
+                else if (control is AnnotatedCheckBoxAndFloatSlider)
+                {
+                    focused = ((AnnotatedCheckBoxAndFloatSlider)control).Focus();
+                }
+                else if (control is AnnotatedCheckBoxAndIntegerSlider)
+                {
+                    focused = ((AnnotatedCheckBoxAndIntegerSlider)control).Focus();
+                }
+                else if (control is AnnotatedCheckBoxAndLongSlider)
+                {
+                    focused = ((AnnotatedCheckBoxAndLongSlider)control).Focus();
+                }
+                else if (control is CheckBoxAndTextBlock)
+                {
+                    focused = ((CheckBoxAndTextBlock)control).Focus();
+                }
+                else
+                {
+                    focused = control.Focus();
+                }
+
+                _lastFoundControl = control;
+            });
+        }
+
+        public void UnselectControl()
+        {
+            if (_lastFoundControl is null)
+                return;
+
+            _lastFoundControl.Background = null;
+            _lastFoundControl = null;
+        }
+
         private async Task<bool> UpdateServer(bool establishLock, bool updateServer, bool updateMods, bool closeProgressWindow)
         {
             if (_upgradeCancellationSource != null)
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index 0bec593b..67e92efc 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -5,17 +5,22 @@
   <title>Ark Server Manager Version Feed</title>
   <subtitle>This is the Ark Server Manager release version feed.</subtitle>
   <link href="http://arkservermanager.freeforums.net/" />
-  <updated>2022-06-17T00:00:00Z</updated>
+  <updated>2022-06-18T00:00:00Z</updated>
 
   <entry>
     <id>urn:uuid:1AE0925B-64EB-4177-B834-7A75FA46E807</id>
-    <title>1.1.433 (1.1.433.2)</title>
-    <summary>1.1.433.2</summary>
+    <title>1.1.433 (1.1.433.3)</title>
+    <summary>1.1.433.3</summary>
     <link href="" />
-    <updated>2022-06-17T00:00:00Z</updated>
+    <updated>2022-06-18T00:00:00Z</updated>
     <content type="xhtml">
       <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
         <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Server Settings - added new find button to find settings by name.</li>
+          </ul>
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
           <ul>
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index 038af8e9..18c22ab4 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -5,7 +5,30 @@
   <title>Ark Server Manager Version Feed</title>
   <subtitle>This is the Ark Server Manager beta version feed.</subtitle>
   <link href="http://arkservermanager.freeforums.net/" />
-  <updated>2022-06-17T00:00:00Z</updated>
+  <updated>2022-06-18T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:1AE0925B-64EB-4177-B834-7A75FA46E807</id>
+    <title>1.1.433 (1.1.433.3)</title>
+    <summary>1.1.433.3</summary>
+    <link href="" />
+    <updated>2022-06-18T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Server Settings - added new find button to find settings by name.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:1AE0925B-64EB-4177-B834-7A75FA46E807</id>
diff --git a/src/ARKServerManager/Windows/FindSettingWindow.xaml b/src/ARKServerManager/Windows/FindSettingWindow.xaml
new file mode 100644
index 00000000..a98a9c09
--- /dev/null
+++ b/src/ARKServerManager/Windows/FindSettingWindow.xaml
@@ -0,0 +1,36 @@
+<Window x:Class="ServerManagerTool.FindSettingWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Width="300" Height="80" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False" ResizeMode="NoResize" SizeToContent="Height"
+        Icon="../Art/favicon.ico" Title="{DynamicResource FindSettingWindow_Title}"
+        x:Name="FindSetting">
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
+                <ResourceDictionary Source="..\Styles\Default.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+
+    <Grid Background="{StaticResource GradientBackground}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="5"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="5,3,5,3" Text="{Binding FindSettingString, ElementName=FindSetting, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, NotifyOnSourceUpdated=True}" SourceUpdated="FindSettingString_SourceUpdated" VerticalContentAlignment="Center" MaxLength="50" />
+
+        <Button Grid.Row="3" Grid.Column="2" Content="{DynamicResource FindSettingWindow_FindButtonLabel}" Margin="5" MinWidth="75" HorizontalAlignment="Right" Click="Find_Click"/>
+    </Grid>
+</Window>
diff --git a/src/ARKServerManager/Windows/FindSettingWindow.xaml.cs b/src/ARKServerManager/Windows/FindSettingWindow.xaml.cs
new file mode 100644
index 00000000..3c15f1e1
--- /dev/null
+++ b/src/ARKServerManager/Windows/FindSettingWindow.xaml.cs
@@ -0,0 +1,164 @@
+using ServerManagerTool.Common.Attibutes;
+using ServerManagerTool.Common.Extensions;
+using ServerManagerTool.Common.Utils;
+using ServerManagerTool.Lib;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using WPFSharp.Globalizer;
+
+namespace ServerManagerTool
+{
+    /// <summary>
+    /// Interaction logic for FindSettingWindow.xaml
+    /// </summary>
+    public partial class FindSettingWindow : Window
+    {
+        private static List<(string setting, string profileProperty)> _profileSettings = null;
+        private static List<(string setting, Control control)> _settingControls = null;
+
+        private readonly GlobalizedApplication _globalizer = GlobalizedApplication.Instance;
+        private int _controlIndex = -1;
+        private ServerSettingsControl _serverSettingsControl;
+
+        public static readonly DependencyProperty FindSettingStringProperty = DependencyProperty.Register(nameof(FindSettingString), typeof(string), typeof(FindSettingWindow), new PropertyMetadata(""));
+
+        public FindSettingWindow(ServerSettingsControl control)
+        {
+            InitializeComponent();
+            WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile);
+
+            _serverSettingsControl = control;
+
+            LoadSettings(control.Settings);
+            LoadControls(control);
+
+            this.DataContext = this;
+        }
+
+        public string FindSettingString
+        {
+            get { return (string)GetValue(FindSettingStringProperty); }
+            set { SetValue(FindSettingStringProperty, value); }
+        }
+
+        private async void Find_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(FindSettingString))
+                return;
+
+            var cursor = this.Cursor;
+
+            try
+            {
+                Application.Current.Dispatcher.Invoke(() => this.Cursor = Cursors.Wait);
+                await Task.Delay(100);
+
+                _serverSettingsControl.UnselectControl();
+
+                var foundControls = _settingControls
+                    .Where(s => s.setting.Contains(FindSettingString, StringComparison.OrdinalIgnoreCase))
+                    .Select(s => s.control)
+                    .ToArray();
+                if (foundControls.Length == 0)
+                {
+                    MessageBox.Show(string.Format(_globalizer.GetResourceString("FindSettingWindow_NotFoundErrorLabel"), FindSettingString), _globalizer.GetResourceString("FindSettingWindow_Title"), MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                }
+
+                var oldIndex = _controlIndex;
+                var newIndex = oldIndex + 1;
+                if (newIndex >= foundControls.Length)
+                {
+                    _controlIndex = -1;
+                    MessageBox.Show(string.Format(_globalizer.GetResourceString("FindSettingWindow_NotFoundErrorLabel"), FindSettingString), _globalizer.GetResourceString("FindSettingWindow_Title"), MessageBoxButton.OK, MessageBoxImage.Information);
+                    return;
+                }
+
+                _serverSettingsControl.SelectControl(foundControls[newIndex]);
+                _controlIndex = newIndex;
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, _globalizer.GetResourceString("FindSettingWindow_Title"), MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            finally
+            {
+                Application.Current.Dispatcher.Invoke(() => this.Cursor = cursor);
+            }
+        }
+
+        private void LoadControls(DependencyObject parent)
+        {
+            if (_settingControls != null)
+                return;
+
+            try
+            {
+                _settingControls = WindowUtils.GetLogicalTreeControls(parent);
+                for (int i = 0; i < _settingControls.Count; i++)
+                {
+                    var item = _settingControls[i];
+                    var setting = _profileSettings
+                        .FirstOrDefault(x => x.profileProperty.Equals(item.setting, StringComparison.OrdinalIgnoreCase))
+                        .setting;
+
+                    if (setting != null && !setting.Equals(item.setting, StringComparison.OrdinalIgnoreCase))
+                    {
+                        _settingControls[i] = (setting, item.control);
+                    }
+
+#if DEBUG
+                    Debug.WriteLine($"{_settingControls[i].setting}; {_settingControls[i].control.GetType().FullName}");
+#endif
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, _globalizer.GetResourceString("FindSettingWindow_Title"), MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void LoadSettings(ServerProfile profile)
+        {
+            if (_profileSettings != null)
+                return;
+
+            try
+            {
+                _profileSettings = new List<(string setting, string profileProperty)>();
+
+                var fields = profile?.GetType()
+                    .GetProperties()
+                    .Where(f => f.IsDefined(typeof(BaseIniFileEntryAttribute), false));
+
+                foreach (var field in fields)
+                {
+                    var attributes = field
+                        .GetCustomAttributes(typeof(BaseIniFileEntryAttribute), false)
+                        .OfType<BaseIniFileEntryAttribute>();
+
+                    foreach (var attr in attributes)
+                    {
+                        _profileSettings.Add((string.IsNullOrWhiteSpace(attr.Key) ? field.Name : attr.Key, field.Name));
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, _globalizer.GetResourceString("FindSettingWindow_Title"), MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void FindSettingString_SourceUpdated(object sender, System.Windows.Data.DataTransferEventArgs e)
+        {
+            _serverSettingsControl.UnselectControl();
+            _controlIndex = -1;
+        }
+    }
+}
diff --git a/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndFloatSlider.xaml.cs b/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndFloatSlider.xaml.cs
index 74b31baf..74bf6092 100644
--- a/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndFloatSlider.xaml.cs
+++ b/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndFloatSlider.xaml.cs
@@ -31,6 +31,7 @@ namespace ServerManagerTool.Common.Controls
         {
             InitializeComponent();
 
+            this.Focusable = true;
             Value = new NullableValue<float>();
 
             (this.Content as FrameworkElement).DataContext = this;
@@ -148,5 +149,13 @@ namespace ServerManagerTool.Common.Controls
                 }
             }
         }
+
+        public new bool Focus()
+        {
+            if (this.CheckBox.IsChecked ?? false == true)
+                return Slider.Focus();
+            else
+                return this.CheckBox.Focus();
+        }
     }
 }
diff --git a/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndIntegerSlider.xaml.cs b/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndIntegerSlider.xaml.cs
index 65e63a83..bf6a1767 100644
--- a/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndIntegerSlider.xaml.cs
+++ b/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndIntegerSlider.xaml.cs
@@ -31,6 +31,7 @@ namespace ServerManagerTool.Common.Controls
         {
             InitializeComponent();
 
+            this.Focusable = true;
             Value = new NullableValue<int>();
 
             (this.Content as FrameworkElement).DataContext = this;
@@ -148,5 +149,13 @@ namespace ServerManagerTool.Common.Controls
                 }
             }
         }
+
+        public new bool Focus()
+        {
+            if (this.CheckBox.IsChecked ?? false == true)
+                return Slider.Focus();
+            else
+                return this.CheckBox.Focus();
+        }
     }
 }
diff --git a/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndLongSlider.xaml.cs b/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndLongSlider.xaml.cs
index 3f03e3a9..3027f642 100644
--- a/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndLongSlider.xaml.cs
+++ b/src/ServerManager.Common/Controls/AnnotatedCheckBoxAndLongSlider.xaml.cs
@@ -31,6 +31,7 @@ namespace ServerManagerTool.Common.Controls
         {
             InitializeComponent();
 
+            this.Focusable = true;
             Value = new NullableValue<long>();
 
             (this.Content as FrameworkElement).DataContext = this;
@@ -148,5 +149,13 @@ namespace ServerManagerTool.Common.Controls
                 }
             }
         }
+
+        public new bool Focus()
+        {
+            if (this.CheckBox.IsChecked ?? false == true)
+                return Slider.Focus();
+            else
+                return this.CheckBox.Focus();
+        }
     }
 }
diff --git a/src/ServerManager.Common/Controls/AnnotatedSlider.xaml.cs b/src/ServerManager.Common/Controls/AnnotatedSlider.xaml.cs
index c72426c6..dcb4cb31 100644
--- a/src/ServerManager.Common/Controls/AnnotatedSlider.xaml.cs
+++ b/src/ServerManager.Common/Controls/AnnotatedSlider.xaml.cs
@@ -26,6 +26,15 @@ namespace ServerManagerTool.Common.Controls
         public static readonly DependencyProperty SuffixRelativeWidthProperty = DependencyProperty.Register(nameof(SuffixRelativeWidth), typeof(string), typeof(AnnotatedSlider), new PropertyMetadata("1*"));
         public static readonly DependencyProperty SuffixRelativeMinWidthProperty = DependencyProperty.Register(nameof(SuffixRelativeMinWidth), typeof(string), typeof(AnnotatedSlider), new PropertyMetadata("0"));
 
+        public AnnotatedSlider()
+        {
+            InitializeComponent();
+
+            this.Focusable = true;
+
+            (this.Content as FrameworkElement).DataContext = this;
+        }
+
         public string Label
         {
             get { return (string)GetValue(LabelProperty); }
@@ -128,12 +137,6 @@ namespace ServerManagerTool.Common.Controls
             set { SetValue(SuffixRelativeMinWidthProperty, value); }
         }
 
-        public AnnotatedSlider()
-        {
-            InitializeComponent();
-            (this.Content as FrameworkElement).DataContext = this;
-        }
-
         private void Slider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
             if(Slider.IsFocused)
@@ -144,5 +147,10 @@ namespace ServerManagerTool.Common.Controls
                 }
             }
         }
+
+        public new bool Focus()
+        {
+            return Slider.Focus();
+        }
     }
 }
diff --git a/src/ServerManager.Common/Controls/CheckBoxAndTextBlock.xaml b/src/ServerManager.Common/Controls/CheckBoxAndTextBlock.xaml
new file mode 100644
index 00000000..c38ef416
--- /dev/null
+++ b/src/ServerManager.Common/Controls/CheckBoxAndTextBlock.xaml
@@ -0,0 +1,19 @@
+<UserControl x:Class="ServerManagerTool.Common.Controls.CheckBoxAndTextBlock"
+             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" 
+             mc:Ignorable="d" 
+             d:DesignWidth="300"
+             d:DesignHeight="15"
+             x:Name="Control">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <CheckBox x:Name="CheckBox" Grid.Column="0" Margin="0,0,0,0" IsChecked="{Binding IsChecked, ElementName=Control, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center"/>
+        <TextBlock x:Name="Label" Grid.Column="1" Margin="5,0,0,0" Text="{Binding Text, ElementName=Control, Mode=TwoWay}" VerticalAlignment="Center" MouseLeftButtonDown="Label_MouseLeftButtonDown"/>
+    </Grid>
+</UserControl>
diff --git a/src/ServerManager.Common/Controls/CheckBoxAndTextBlock.xaml.cs b/src/ServerManager.Common/Controls/CheckBoxAndTextBlock.xaml.cs
new file mode 100644
index 00000000..4d9322f2
--- /dev/null
+++ b/src/ServerManager.Common/Controls/CheckBoxAndTextBlock.xaml.cs
@@ -0,0 +1,48 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace ServerManagerTool.Common.Controls
+{
+    /// <summary>
+    /// Interaction logic for CheckBoxAndTextBlock.xaml
+    /// </summary>
+    public partial class CheckBoxAndTextBlock : UserControl
+    {
+        public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(nameof(IsChecked), typeof(bool), typeof(CheckBoxAndTextBlock));
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(nameof(Text), typeof(string), typeof(CheckBoxAndTextBlock));
+
+        public CheckBoxAndTextBlock()
+        {
+            InitializeComponent();
+
+            this.Focusable = true;
+
+            (this.Content as FrameworkElement).DataContext = this;
+        }
+
+        public bool IsChecked
+        {
+            get { return (bool)GetValue(IsCheckedProperty); }
+            set { SetValue(IsCheckedProperty, value); }
+        }
+
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        public new bool Focus()
+        {
+            return CheckBox.Focus();
+        }
+
+        private void Label_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (this.IsEnabled && this.CheckBox.IsEnabled)
+            {
+                this.IsChecked = !this.IsChecked;
+            }
+        }
+    }
+}
diff --git a/src/ServerManager.Common/Extensions/StringExtensions.cs b/src/ServerManager.Common/Extensions/StringExtensions.cs
new file mode 100644
index 00000000..d136b455
--- /dev/null
+++ b/src/ServerManager.Common/Extensions/StringExtensions.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace ServerManagerTool.Common.Extensions
+{
+    public static class StringExtensions
+    {
+        public static bool Contains(this string value, string substring, StringComparison comparisonType)
+        {
+            if (substring == null)
+                throw new ArgumentNullException(nameof(substring), $"{nameof(substring)} cannot be null.");
+            if (!Enum.IsDefined(typeof(StringComparison), comparisonType))
+                throw new ArgumentException($"{nameof(comparisonType)} is not a member of StringComparison", nameof(comparisonType));
+
+            return value.IndexOf(substring, comparisonType) >= 0;
+        }
+    }
+}
diff --git a/src/ServerManager.Common/ServerManager.Common.csproj b/src/ServerManager.Common/ServerManager.Common.csproj
index 673640ab..8718d55b 100644
--- a/src/ServerManager.Common/ServerManager.Common.csproj
+++ b/src/ServerManager.Common/ServerManager.Common.csproj
@@ -13,6 +13,7 @@
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Controls\AnnotatedCheckBoxAndLongSlider.xaml" />
+    <None Remove="Controls\CheckBoxAndTextBlock.xaml" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DotNetZip" Version="1.13.8" />
@@ -30,6 +31,10 @@
     </Page>
     <Page Include="Controls\AnnotatedCheckBoxAndIntegerSlider.xaml" />
     <Page Include="Controls\AnnotatedSlider.xaml" />
+    <Page Include="Controls\CheckBoxAndTextBlock.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NeXtVdf\NeXt.Vdf.csproj" />
diff --git a/src/ServerManager.Common/Utils/WindowUtils.cs b/src/ServerManager.Common/Utils/WindowUtils.cs
index 480435cc..89fc1541 100644
--- a/src/ServerManager.Common/Utils/WindowUtils.cs
+++ b/src/ServerManager.Common/Utils/WindowUtils.cs
@@ -1,4 +1,7 @@
-using System.Linq;
+using ServerManagerTool.Common.Controls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -66,10 +69,11 @@ namespace ServerManagerTool.Common.Utils
         {
             if (child == null) return null;
             var contentElement = child as ContentElement;
+            DependencyObject parent = null;
 
             if (contentElement != null)
             {
-                var parent = ContentOperations.GetParent(contentElement);
+                parent = ContentOperations.GetParent(contentElement);
                 if (parent != null) return parent;
 
                 var fce = contentElement as FrameworkContentElement;
@@ -77,7 +81,10 @@ namespace ServerManagerTool.Common.Utils
             }
 
             //if it's not a ContentElement, rely on VisualTreeHelper
-            return VisualTreeHelper.GetParent(child);
+            parent = VisualTreeHelper.GetParent(child);
+            if (parent is null)
+                parent = LogicalTreeHelper.GetParent(child);
+            return parent;
         }
 
         /// <summary>
@@ -118,5 +125,48 @@ namespace ServerManagerTool.Common.Utils
             if (element is T) return (T)element;
             return TryFindParent<T>(element);
         }
+
+        private static Dictionary<string, DependencyProperty> BindingProperties = new Dictionary<string, DependencyProperty>
+        {
+            { "System.Windows.Controls.CheckBox", CheckBox.IsCheckedProperty },
+            { "System.Windows.Controls.ComboBox", ComboBox.ItemsSourceProperty },
+            { "System.Windows.Controls.TextBox", TextBox.TextProperty },
+            { "System.Windows.Controls.Slider", Slider.ValueProperty },
+            { "System.Windows.Controls.DataGrid", DataGrid.ItemsSourceProperty },
+            { "ServerManagerTool.Common.Controls.AnnotatedSlider", AnnotatedSlider.ValueProperty },
+            { "ServerManagerTool.Common.Controls.AnnotatedCheckBoxAndFloatSlider", AnnotatedCheckBoxAndFloatSlider.ValueProperty },
+            { "ServerManagerTool.Common.Controls.AnnotatedCheckBoxAndIntegerSlider", AnnotatedCheckBoxAndIntegerSlider.ValueProperty },
+            { "ServerManagerTool.Common.Controls.AnnotatedCheckBoxAndLongSlider", AnnotatedCheckBoxAndLongSlider.ValueProperty },
+            { "ServerManagerTool.Common.Controls.CheckBoxAndTextBlock", CheckBoxAndTextBlock.IsCheckedProperty },
+        };
+
+        public static List<(string setting, Control control)> GetLogicalTreeControls(DependencyObject parent)
+        {
+            var results = new List<(string setting, Control control)>();
+
+            var children = LogicalTreeHelper.GetChildren(parent).OfType<DependencyObject>();
+            foreach (var child in children)
+            {
+                var recurse = true;
+                if (child is Visual childControl)
+                {
+                    var bindingProperty = BindingProperties.FirstOrDefault(b => b.Key.Equals(childControl.GetType().FullName)).Value;
+                    if (bindingProperty != null)
+                    {
+                        var binding = BindingOperations.GetBinding(childControl, bindingProperty);
+                        if (binding != null)
+                        {
+                            results.Add((binding.Path.Path, child as Control));
+                            recurse = false;
+                        }
+                    }
+                }
+
+                if (recurse)
+                    results.AddRange(GetLogicalTreeControls(child));
+            }
+
+            return results;
+        }
     }
 }