Revert "Refactor preferChocolatey system to handle other package managers eas…"

This reverts commit 89919494e5.

config/applications.json

@@ -527,14 +527,6 @@
         "link": "https://espanso.org/",
         "winget": "Espanso.Espanso"
     },
-    "etcher": {
-        "category": "Utilities",
-        "choco": "etcher",
-        "content": "Etcher USB Creator",
-        "description": "Etcher is a powerful tool for creating bootable USB drives with ease.",
-        "link": "https://www.balena.io/etcher/",
-        "winget": "Balena.Etcher"
-    },
     "falkon": {
         "category": "Browsers",
         "choco": "falkon",

config/preset.json

@@ -2,6 +2,7 @@
   "Standard": [
     "WPFTweaksAH",
     "WPFTweaksConsumerFeatures",
+    "WPFTweaksDisableExplorerAutoDiscovery",
     "WPFTweaksDVR",
     "WPFTweaksHiber",
     "WPFTweaksHome",
@@ -18,6 +19,7 @@
   ],
   "Minimal": [
     "WPFTweaksConsumerFeatures",
+    "WPFTweaksDisableExplorerAutoDiscovery",
     "WPFTweaksHome",
     "WPFTweaksServices",
     "WPFTweaksTele"

config/themes.json

@@ -35,7 +35,8 @@
         "CheckboxMouseOverColor": "#999999",
         "ButtonBorderThickness":  "1",
         "ButtonMargin":  "1",
-        "ButtonCornerRadius": "2"
+        "ButtonCornerRadius": "2",
+        "AppTileImageSize": "40"
     },
     "Light": {
         "AppInstallUnselectedColor": "#F0F0F0",

config/tweaks.json

@@ -3758,5 +3758,60 @@
     "Type": "Button",
     "ButtonWidth": "300",
     "link": "https://christitustech.github.io/winutil/dev/tweaks/Performance-Plans/RemoveUltPerf"
-  }
+  },
+  "WPFTweaksDisableExplorerAutoDiscovery": {
+    "Content": "Disable Explorer Automatic Folder Discovery",
+    "Description": "Windows Explorer automatically tries to guess the type of the folder based on its contents, slowing down the browsing experience.",
+    "category": "Essential Tweaks",
+    "panel": "1",
+    "Order": "a005_",
+    "InvokeScript": [
+      "
+      # Previously detected folders
+      $bags = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\Bags\"
+
+      # Folder types lookup table
+      $bagMRU = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\BagMRU\"
+
+      # Flush explorer view database
+      Remove-Item -Path $bags -Recurse -Force
+      Write-Host \"Removed $bags\"
+
+      Remove-Item -Path $bagMRU -Recurse -Force
+      Write-Host \"Removed $bagMRU\"
+
+      # Every folder
+      $allFolders = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\Bags\\AllFolders\\Shell\"
+
+      if (!(Test-Path $allFolders)) {
+        New-Item -Path $allFolders -Force
+        Write-Host \"Created $allFolders\"
+      }
+
+      # Generic view
+      New-ItemProperty -Path $allFolders -Name \"FolderType\" -Value \"NotSpecified\" -PropertyType String -Force
+      Write-Host \"Set FolderType to NotSpecified\"
+
+      Write-Host Please sign out and back in, or restart your computer to apply the changes!
+      "
+    ],
+    "UndoScript": [
+      "
+      # Previously detected folders
+      $bags = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\Bags\"
+
+      # Folder types lookup table
+      $bagMRU = \"HKCU:\\Software\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\BagMRU\"
+
+      # Flush explorer view database
+      Remove-Item -Path $bags -Recurse -Force
+      Write-Host \"Removed $bags\"
+
+      Remove-Item -Path $bagMRU -Recurse -Force
+      Write-Host \"Removed $bagMRU\"
+
+      Write-Host Please sign out and back in, or restart your computer to apply the changes!
+      "
+    ],
+  },
 }

functions/private/Initalize-InstallAppEntry.ps1

@@ -5,28 +5,23 @@ function Initialize-InstallAppEntry {
             Used to as part of the Install Tab UI generation
         .PARAMETER TargetElement
             The Element into which the Apps should be placed
-        .PARAMETER AppKey
+        .PARAMETER appKey
             The Key of the app inside the $sync.configs.applicationsHashtable
     #>
         param(
             [Windows.Controls.WrapPanel]$TargetElement,
-            $AppKey
+            $appKey
         )
-        $App = $sync.configs.applicationsHashtable.$AppKey
+
         # Create the outer Border for the application type
         $border = New-Object Windows.Controls.Border
-        $border.BorderBrush = [Windows.Media.Brushes]::Gray
-        $border.SetResourceReference([Windows.Controls.Control]::BorderThicknessProperty, "AppTileBorderThickness")
-        $border.CornerRadius = 5
-        $border.SetResourceReference([Windows.Controls.Control]::PaddingProperty, "AppTileMargins")
-        $border.SetResourceReference([Windows.Controls.Control]::WidthProperty, "AppTileWidth")
-        $border.VerticalAlignment = "Top"
-        $border.SetResourceReference([Windows.Controls.Control]::MarginProperty, "AppTileMargins")
-        $border.Cursor = [System.Windows.Input.Cursors]::Hand
-        $border.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallUnselectedColor")
-        $border.Tag = $Appkey
-        $border.ToolTip = $App.description
+        $border.Style = $sync.Form.Resources.AppTileBorderStyle
+        $border.Tag = $appKey
+        $border.ToolTip = $Apps.$appKey.description
         $border.Add_MouseUp({
+            if ($_.ChangedButton -eq [System.Windows.Input.MouseButton]::Right) {
+                Invoke-WPFPresets -imported $true -checkboxfilterpattern "WPFInstall*";
+            }
             $childCheckbox = ($this.Child.Children | Where-Object {$_.Template.TargetType -eq [System.Windows.Controls.Checkbox]})[0]
             $childCheckBox.isChecked = -not $childCheckbox.IsChecked
         })
@@ -47,12 +42,8 @@ function Initialize-InstallAppEntry {
 
         # Create the CheckBox, vertically centered
         $checkBox = New-Object Windows.Controls.CheckBox
-        $checkBox.Name = $AppKey
-        $checkBox.Background = "Transparent"
-        $checkBox.HorizontalAlignment = "Left"
-        $checkBox.VerticalAlignment = "Center"
-        $checkBox.SetResourceReference([Windows.Controls.Control]::MarginProperty, "AppTileMargins")
-        $checkBox.SetResourceReference([Windows.Controls.Control]::StyleProperty, "CollapsedCheckBoxStyle")
+        $checkBox.Name = $appKey
+        $checkbox.Style = $sync.Form.Resources.AppTileCheckboxStyle
         $checkbox.Add_Checked({
             Invoke-WPFSelectedAppsUpdate -type "Add" -checkbox $this
             $borderElement = $this.Parent.Parent
@@ -64,7 +55,7 @@ function Initialize-InstallAppEntry {
             $borderElement = $this.Parent.Parent
             $borderElement.SetResourceReference([Windows.Controls.Control]::BackgroundProperty, "AppInstallUnselectedColor")
         })
-        $sync.$($checkBox.Name) = $checkBox
+
         # Create a StackPanel for the image and name
         $imageAndNamePanel = New-Object Windows.Controls.StackPanel
         $imageAndNamePanel.Orientation = "Horizontal"
@@ -73,29 +64,15 @@ function Initialize-InstallAppEntry {
         # Create the Image and set a placeholder
         $image = New-Object Windows.Controls.Image
         # $image.Name = "wpfapplogo" + $App.Name
-        $image.Width = 40
-        $image.Height = 40
-        $image.Margin = New-Object Windows.Thickness(0, 0, 10, 0)
+        $image.Style = $sync.Form.Resources.AppTileImageStyle
         $image.Source = $noimage  # Ensure $noimage is defined in your script
 
-        # Clip the image corners
-        $image.Clip = New-Object Windows.Media.RectangleGeometry
-        $image.Clip.Rect = New-Object Windows.Rect(0, 0, $image.Width, $image.Height)
-        $image.Clip.RadiusX = 5
-        $image.Clip.RadiusY = 5
-        $image.SetResourceReference([Windows.Controls.Control]::VisibilityProperty, "AppTileCompactVisibility")
-
         $imageAndNamePanel.Children.Add($image) | Out-Null
 
         # Create the TextBlock for the application name
         $appName = New-Object Windows.Controls.TextBlock
-        $appName.Text = $App.Content
-        $appName.SetResourceReference([Windows.Controls.Control]::FontSizeProperty, "AppTileFontSize")
-        $appName.FontWeight = [Windows.FontWeights]::Bold
-        $appName.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
-        $appName.VerticalAlignment = "Center"
-        $appName.SetResourceReference([Windows.Controls.Control]::MarginProperty, "AppTileMargins")
-        $appName.Background = "Transparent"
+        $appName.Style = $sync.Form.Resources.AppTileNameStyle
+        $appName.Text = $Apps.$appKey.content
         $imageAndNamePanel.Children.Add($appName) | Out-Null
 
         # Add the image and name panel to the Checkbox
@@ -107,91 +84,53 @@ function Initialize-InstallAppEntry {
 
         # Create the StackPanel for the buttons and dock it to the right
         $buttonPanel = New-Object Windows.Controls.StackPanel
-        $buttonPanel.Orientation = "Horizontal"
-        $buttonPanel.HorizontalAlignment = "Right"
-        $buttonPanel.VerticalAlignment = "Center"
-        $buttonPanel.SetResourceReference([Windows.Controls.Control]::MarginProperty, "AppTileMargins")
-        $buttonPanel.SetResourceReference([Windows.Controls.Control]::VisibilityProperty, "AppTileCompactVisibility")
+        $buttonPanel.Style = $sync.Form.Resources.AppTileButtonPanelStyle
         [Windows.Controls.DockPanel]::SetDock($buttonPanel, [Windows.Controls.Dock]::Right)
 
-        # Create the "Install" button
-        $installButton = New-Object Windows.Controls.Button
-        $installButton.Width = 45
-        $installButton.Height = 35
-        $installButton.Margin = New-Object Windows.Thickness(0, 0, 10, 0)
+        # Define the button properties
+        $buttons = @(
+            [PSCustomObject]@{ Name = "Install"; Description = "Install or Upgrade the application"; Tooltip = "Install or Upgrade the application"; Icon = [char]0xE118 },
+            [PSCustomObject]@{ Name = "Uninstall"; Description = "Uninstall the application"; Tooltip = "Uninstall the application"; Icon = [char]0xE74D },
+            [PSCustomObject]@{ Name = "Info"; Description = "Open the application's website in your default browser"; Tooltip = "Open the application's website in your default browser"; Icon = [char]0xE946 }
+        )
 
-        $installIcon = New-Object Windows.Controls.TextBlock
-        $installIcon.Text = [char]0xE118  # Install Icon
-        $installIcon.FontFamily = "Segoe MDL2 Assets"
-        $installIcon.FontSize = 20
-        $installIcon.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
-        $installIcon.Background = "Transparent"
-        $installIcon.HorizontalAlignment = "Center"
-        $installIcon.VerticalAlignment = "Center"
+        # Iterate over each button and create it
+        foreach ($button in $buttons) {
+            $newButton = New-Object Windows.Controls.Button
+            $newButton.Style = $sync.Form.Resources.AppTileButtonStyle
+            $newButton.Content = $button.Icon
+            $newButton.ToolTip = $button.Tooltip
+            $buttonPanel.Children.Add($newButton) | Out-Null
 
-        $installButton.Content = $installIcon
-        $installButton.ToolTip = "Install or Upgrade the application"
-        $buttonPanel.Children.Add($installButton) | Out-Null
-
-        # Add Click event for the "Install" button
-        $installButton.Add_Click({
-            $appKey = $this.Parent.Parent.Parent.Tag
-            $appObject = $sync.configs.applicationsHashtable.$appKey
-            Invoke-WPFInstall -PackagesToInstall $appObject
-        })
-
-        # Create the "Uninstall" button
-        $uninstallButton = New-Object Windows.Controls.Button
-        $uninstallButton.Width = 45
-        $uninstallButton.Height = 35
-
-        $uninstallIcon = New-Object Windows.Controls.TextBlock
-        $uninstallIcon.Text = [char]0xE74D  # Uninstall Icon
-        $uninstallIcon.FontFamily = "Segoe MDL2 Assets"
-        $uninstallIcon.FontSize = 20
-        $uninstallIcon.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
-        $uninstallIcon.Background = "Transparent"
-        $uninstallIcon.HorizontalAlignment = "Center"
-        $uninstallIcon.VerticalAlignment = "Center"
-
-        $uninstallButton.Content = $uninstallIcon
-        $buttonPanel.Children.Add($uninstallButton) | Out-Null
-
-        $uninstallButton.ToolTip = "Uninstall the application"
-        $uninstallButton.Add_Click({
-            $appKey = $this.Parent.Parent.Parent.Tag
-            $appObject = $sync.configs.applicationsHashtable.$appKey
-            Invoke-WPFUnInstall -PackagesToUninstall $appObject
-        })
-
-        # Create the "Info" button
-        $infoButton = New-Object Windows.Controls.Button
-        $infoButton.Width = 45
-        $infoButton.Height = 35
-        $infoButton.Margin = New-Object Windows.Thickness(10, 0, 0, 0)
-
-        $infoIcon = New-Object Windows.Controls.TextBlock
-        $infoIcon.Text = [char]0xE946  # Info Icon
-        $infoIcon.FontFamily = "Segoe MDL2 Assets"
-        $infoIcon.FontSize = 20
-        $infoIcon.SetResourceReference([Windows.Controls.Control]::ForegroundProperty, "MainForegroundColor")
-        $infoIcon.Background = "Transparent"
-        $infoIcon.HorizontalAlignment = "Center"
-        $infoIcon.VerticalAlignment = "Center"
-
-        $infoButton.Content = $infoIcon
-        $infoButton.ToolTip = "Open the application's website in your default browser"
-        $buttonPanel.Children.Add($infoButton) | Out-Null
-
-        $infoButton.Add_Click({
-            $appKey = $this.Parent.Parent.Parent.Tag
-            $appObject = $sync.configs.applicationsHashtable.$appKey
-            Start-Process $appObject.link
-        })
+            switch ($button.Name) {
+                "Install" {
+                    $newButton.Add_Click({
+                        $appKey = $this.Parent.Parent.Parent.Tag
+                        $appObject = $sync.configs.applicationsHashtable.$appKey
+                        Invoke-WPFInstall -PackagesToInstall $appObject
+                    })
+                }
+                "Uninstall" {
+                    $newButton.Add_Click({
+                        $appKey = $this.Parent.Parent.Parent.Tag
+                        $appObject = $sync.configs.applicationsHashtable.$appKey
+                        Invoke-WPFUnInstall -PackagesToUninstall $appObject
+                    })
+                }
+                "Info" {
+                    $newButton.Add_Click({
+                        $appKey = $this.Parent.Parent.Parent.Tag
+                        $appObject = $sync.configs.applicationsHashtable.$appKey
+                        Start-Process $appObject.link
+                    })
+                }
+            }
+        }
 
         # Add the button panel to the DockPanel
         $dockPanel.Children.Add($buttonPanel) | Out-Null
 
         # Add the border to the corresponding Category
         $TargetElement.Children.Add($border) | Out-Null
+        return $checkbox
     }

functions/private/Initialize-InstallCategoryAppList.ps1

@@ -53,8 +53,17 @@ function Initialize-InstallCategoryAppList {
         $TargetElement.Dispatcher.Invoke([System.Windows.Threading.DispatcherPriority]::Background, [action]{
 
             $TargetElement.Items.Clear() # Remove the loading message
-            $categories = $Apps.Values | Select-Object -ExpandProperty category -Unique | Sort-Object
-            foreach ($category in $categories) {
+
+            # Pre-group apps by category
+            $appsByCategory = @{}
+            foreach ($appKey in $Apps.Keys) {
+                $category = $Apps.$appKey.Category
+                if (-not $appsByCategory.ContainsKey($category)) {
+                    $appsByCategory[$category] = @()
+                }
+                $appsByCategory[$category] += $appKey
+            }
+            foreach ($category in $($appsByCategory.Keys | Sort-Object)) {
                 Add-Category -Category $category -TargetElement $TargetElement
                 $wrapPanel = New-Object Windows.Controls.WrapPanel
                 $wrapPanel.Orientation = "Horizontal"
@@ -64,9 +73,9 @@ function Initialize-InstallCategoryAppList {
                 $wrapPanel.Visibility = [Windows.Visibility]::Collapsed
                 $wrapPanel.Tag = "CategoryWrapPanel_$category"
                 $null = $TargetElement.Items.Add($wrapPanel)
-                $Apps.Keys | Where-Object { $Apps.$_.Category -eq $category } | Sort-Object | ForEach-Object {
-                    Initialize-InstallAppEntry -TargetElement $wrapPanel -AppKey $_
-                }
+                $appsByCategory[$category] | ForEach-Object {
+                    $sync.$_ =  $(Initialize-InstallAppEntry -TargetElement $wrapPanel -AppKey $_)
             }
-        })
+        }
+    })
     }

scripts/main.ps1

@@ -46,7 +46,6 @@ class GenericException : Exception {
     GenericException($Message) : base($Message) {}
 }
 
-
 $inputXML = $inputXML -replace 'mc:Ignorable="d"', '' -replace "x:N", 'N' -replace '^<Win.*', '<Window'
 
 [void][System.Reflection.Assembly]::LoadWithPartialName('presentationframework')
@@ -119,6 +118,7 @@ $sync.configs.applications.PSObject.Properties | ForEach-Object {
 
 # Now call the function with the final merged config
 Invoke-WPFUIElements -configVariable $sync.configs.appnavigation -targetGridName "appscategory" -columncount 1
+
 # Add logic to handle click to the ToggleView Button on the Install Tab
 $sync.WPFToggleView.Add_Click({
     $sync.CompactView = -not $sync.CompactView
@@ -130,7 +130,9 @@ $sync.WPFToggleView.Add_Click({
 Invoke-WPFUIApps -Apps $sync.configs.applicationsHashtable -targetGridName "appspanel"
 
 Invoke-WPFUIElements -configVariable $sync.configs.tweaks -targetGridName "tweakspanel" -columncount 2
+
 Invoke-WPFUIElements -configVariable $sync.configs.feature -targetGridName "featurespanel" -columncount 2
+
 # Future implementation: Add Windows Version to updates panel
 #Invoke-WPFUIElements -configVariable $sync.configs.updates -targetGridName "updatespanel" -columncount 1
 
@@ -303,8 +305,8 @@ $sync["Form"].Add_MouseLeftButtonDown({
 })
 
 $sync["Form"].Add_MouseDoubleClick({
-    if ($_.OriginalSource -is [System.Windows.Controls.Grid] -or
-        $_.OriginalSource -is [System.Windows.Controls.StackPanel]) {
+    if ($_.OriginalSource.Name -eq "NavDockPanel" -or
+        $_.OriginalSource.Name -eq "GridBesideNavDockPanel") {
             if ($sync["Form"].WindowState -eq [Windows.WindowState]::Normal) {
                 $sync["Form"].WindowState = [Windows.WindowState]::Maximized
             }
@@ -579,7 +581,5 @@ $sync["SponsorMenuItem"].Add_Click({
     Show-CustomDialog -Title "Sponsors" -Message $authorInfo -EnableScroll $true
 })
 
-
-
 $sync["Form"].ShowDialog() | out-null
 Stop-Transcript

xaml/inputXML.xaml

@@ -67,6 +67,82 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+    <Style x:Key="AppTileBorderStyle" TargetType="Border">
+        <Setter Property="BorderBrush" Value="Gray"/>
+        <Setter Property="BorderThickness" Value="{DynamicResource AppTileBorderThickness}"/>
+        <Setter Property="CornerRadius" Value="5"/>
+        <Setter Property="Padding" Value="{DynamicResource AppTileMargins}"/>
+        <Setter Property="Width" Value="{DynamicResource AppTileWidth}"/>
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="Margin" Value="{DynamicResource AppTileMargins}"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Background" Value="{DynamicResource AppInstallUnselectedColor}"/>
+    </Style>
+    <Style x:Key="AppTileCheckboxStyle" TargetType="CheckBox">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="{DynamicResource AppTileMargins}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CheckBox">
+                    <ContentPresenter Content="{TemplateBinding Content}"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Left"
+                                    Margin="{TemplateBinding Padding}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="AppTileImageStyle" TargetType="Image">
+        <Setter Property="Width" Value="{DynamicResource AppTileImageSize}"/>
+        <Setter Property="Height" Value="{DynamicResource AppTileImageSize}"/>
+        <Setter Property="Margin">
+            <Setter.Value>
+                <Thickness Left="0" Top="0" Right="10" Bottom="0"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Clip">
+            <Setter.Value>
+                <RectangleGeometry Rect="0,0,40,40" RadiusX="5" RadiusY="5"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Visibility" Value="{DynamicResource AppTileCompactVisibility}"/>
+    </Style>
+    <Style x:Key="AppTileNameStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="{DynamicResource AppTileFontSize}"/>
+        <Setter Property="FontWeight" Value="Bold"/>
+        <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="{DynamicResource AppTileMargins}"/>
+        <Setter Property="Background" Value="Transparent"/>
+    </Style>
+    <Style x:Key="AppTileButtonPanelStyle" TargetType="StackPanel">
+        <Setter Property="Orientation" Value="Horizontal"/>
+        <Setter Property="HorizontalAlignment" Value="Right"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="Margin" Value="{DynamicResource AppTileMargins}"/>
+        <Setter Property="Visibility" Value="{DynamicResource AppTileCompactVisibility}"/>
+    </Style>
+    <Style x:Key="AppTileButtonStyle" TargetType="Button">
+        <Setter Property="Width" Value="45"/>
+        <Setter Property="Height" Value="35"/>
+        <Setter Property="Margin" Value="0,0,10,0"/>
+        <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundColor}"/>
+        <Setter Property="Background" Value="{DynamicResource ButtonBackgroundColor}"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding}" FontFamily="Segoe MDL2 Assets" FontSize="20"
+                               Foreground="{DynamicResource MainForegroundColor}"
+                               Background="Transparent" HorizontalAlignment="Center"
+                               VerticalAlignment="Center"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 
     <Style TargetType="Button" x:Key="HoverButtonStyle">
         <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}" />
@@ -502,19 +578,6 @@
                  </Setter.Value>
             </Setter>
         </Style>
-    <!-- Collapsed Checkbox Style -->
-    <Style x:Key="CollapsedCheckBoxStyle" TargetType="CheckBox">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="CheckBox">
-                    <ContentPresenter Content="{TemplateBinding Content}"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Left"
-                                    Margin="{TemplateBinding Padding}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
         <Style TargetType="RadioButton">
             <Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
             <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
@@ -851,7 +914,7 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        <DockPanel HorizontalAlignment="Stretch" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="0" Width="Auto">
+        <DockPanel Name="NavDockPanel" HorizontalAlignment="Stretch" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Grid.Row="0" Width="Auto">
             <StackPanel Name="NavLogoPanel" Orientation="Horizontal" HorizontalAlignment="Left" Background="{DynamicResource MainBackgroundColor}" SnapsToDevicePixels="True" Margin="10,0,20,0">
             </StackPanel>
             <ToggleButton Margin="0,0,5,0" HorizontalAlignment="Left" Height="{DynamicResource TabButtonHeight}" Width="{DynamicResource TabButtonWidth}"
@@ -894,7 +957,7 @@
                     </TextBlock>
                 </ToggleButton.Content>
             </ToggleButton>
-            <Grid Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
+            <Grid Name="GridBesideNavDockPanel" Background="{DynamicResource MainBackgroundColor}" ShowGridLines="False" Width="Auto" Height="Auto" HorizontalAlignment="Stretch">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/> <!-- Main content area -->
                     <ColumnDefinition Width="Auto"/><!-- Space for options button -->