diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d231f8a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "FloatingStatusWindowLibrary/Common.Wpf"]
+	path = FloatingStatusWindowLibrary/Common.Wpf
+	url = https://github.com/ckaczor/Common.Wpf.git
diff --git a/FloatingStatusWindowLibrary.sln b/FloatingStatusWindowLibrary.sln
index 1b87abc..cf3e3c9 100644
--- a/FloatingStatusWindowLibrary.sln
+++ b/FloatingStatusWindowLibrary.sln
@@ -7,15 +7,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FloatingStatusWindowLibrary
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWindow", "TestWindow\TestWindow.csproj", "{0C541788-8FFD-47B6-8E6B-653A884CFA55}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Wpf", "..\Common.Wpf\Common.Wpf.csproj", "{0074C983-550E-4094-9E8C-F566FB669297}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Native", "..\Common.Native\Common.Native.csproj", "{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{C4E7C6BF-86B2-433B-B842-31B82811FAC9}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Wpf", "FloatingStatusWindowLibrary\Common.Wpf\Common.Wpf.csproj", "{0074C983-550E-4094-9E8C-F566FB669297}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Native", "FloatingStatusWindowLibrary\Common.Wpf\Common.Native\Common.Native.csproj", "{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/FloatingStatusWindowLibrary/AppearanceWindow.xaml b/FloatingStatusWindowLibrary/AppearanceWindow.xaml
index bbaca6f..c5fb9fb 100644
--- a/FloatingStatusWindowLibrary/AppearanceWindow.xaml
+++ b/FloatingStatusWindowLibrary/AppearanceWindow.xaml
@@ -87,7 +87,7 @@
                 Name="ForegroundColorPicker"
                 DisplayColorAndName="True"
                 SelectedColor="{Binding Path=FontColor,UpdateSourceTrigger=PropertyChanged,NotifyOnSourceUpdated=True}"
-                ShowAdvancedButton="False" Margin="6" />
+                Margin="6" />
         <Label
                 Content="{x:Static properties:Resources.Padding}"
                 Grid.Row="3" Grid.Column="0" Name="PaddingLabel" Target="{Binding ElementName=PaddingUpDown}" Margin="6" />
diff --git a/FloatingStatusWindowLibrary/Common.Wpf b/FloatingStatusWindowLibrary/Common.Wpf
new file mode 160000
index 0000000..aeefc5f
--- /dev/null
+++ b/FloatingStatusWindowLibrary/Common.Wpf
@@ -0,0 +1 @@
+Subproject commit aeefc5f1cfe1716d90818a83b7440e9092248388
diff --git a/FloatingStatusWindowLibrary/FloatingStatusWindowLibrary.csproj b/FloatingStatusWindowLibrary/FloatingStatusWindowLibrary.csproj
index 993d7f8..c8b7538 100644
--- a/FloatingStatusWindowLibrary/FloatingStatusWindowLibrary.csproj
+++ b/FloatingStatusWindowLibrary/FloatingStatusWindowLibrary.csproj
@@ -38,8 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.5\lib\net45\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\packages\Hardcodet.NotifyIcon.Wpf.1.0.8\lib\net45\Hardcodet.Wpf.TaskbarNotification.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -51,9 +50,23 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.Toolkit, Version=2.4.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.2.4\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.DataGrid, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.2.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -80,22 +93,11 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="packages.config" />
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Common.Native\Common.Native.csproj">
-      <Project>{ed1c07a1-54f5-4796-8b06-2a0bb1960d84}</Project>
-      <Name>Common.Native</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Common.Wpf\Common.Wpf.csproj">
-      <Project>{0074c983-550e-4094-9e8c-f566fb669297}</Project>
-      <Name>Common.Wpf</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Page Include="AppearanceWindow.xaml">
       <SubType>Designer</SubType>
@@ -107,10 +109,21 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\gear.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="Common.Wpf\Common.Native\Common.Native.csproj">
+      <Project>{ed1c07a1-54f5-4796-8b06-2a0bb1960d84}</Project>
+      <Name>Common.Native</Name>
+    </ProjectReference>
+    <ProjectReference Include="Common.Wpf\Common.Wpf.csproj">
+      <Project>{0074c983-550e-4094-9e8c-f566fb669297}</Project>
+      <Name>Common.Wpf</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/FloatingStatusWindowLibrary/packages.config b/FloatingStatusWindowLibrary/packages.config
index 3c83b3c..d6456b3 100644
--- a/FloatingStatusWindowLibrary/packages.config
+++ b/FloatingStatusWindowLibrary/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Extended.Wpf.Toolkit" version="2.4.0" targetFramework="net45" userInstalled="true" />
-  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net45" userInstalled="true" />
+  <package id="Extended.Wpf.Toolkit" version="3.2.0" targetFramework="net45" userInstalled="true" />
+  <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net45" userInstalled="true" />
 </packages>
\ No newline at end of file
diff --git a/FloatingStatusWindows.sln b/FloatingStatusWindows.sln
deleted file mode 100644
index d97afda..0000000
--- a/FloatingStatusWindows.sln
+++ /dev/null
@@ -1,187 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonitStatusWindow", "..\MonitStatusWindow\MonitStatusWindow.csproj", "{3DAB06DD-C4E9-4AC6-88CF-E4923DE357AD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4} = {F023A16C-2F13-4A87-A8B7-22C43C4A58A4}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessCpuUsageStatusWindow", "..\ProcessCpuUsageStatusWindow\ProcessCpuUsageStatusWindow.csproj", "{C3C29363-2E3C-4478-B2A6-125DEA683E0D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4} = {F023A16C-2F13-4A87-A8B7-22C43C4A58A4}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaveUpgradeMonitorStatusWindow", "..\WaveUpgradeMonitorStatusWindow\WaveUpgradeMonitorStatusWindow.csproj", "{659DB919-854A-43BD-AE59-CF36E9CB610E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4} = {F023A16C-2F13-4A87-A8B7-22C43C4A58A4}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeatherStatusWindow", "..\WeatherStatusWindow\WeatherStatusWindow.csproj", "{70E51708-6B2A-44F8-9362-772B375B8921}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4} = {F023A16C-2F13-4A87-A8B7-22C43C4A58A4}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WoWRealmStatusWindow", "..\WoWRealmStatusWindow\WoWRealmStatusWindow.csproj", "{D7AADCD4-369A-4713-A710-CC484CE7D04F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4} = {F023A16C-2F13-4A87-A8B7-22C43C4A58A4}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FloatingStatusWindowLibrary", "FloatingStatusWindowLibrary\FloatingStatusWindowLibrary.csproj", "{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Wpf", "..\Common.Wpf\Common.Wpf.csproj", "{0074C983-550E-4094-9E8C-F566FB669297}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Native", "..\Common.Native\Common.Native.csproj", "{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHardwareMonitorLib", "..\..\Public\OpenHardwareMonitor\OpenHardwareMonitorLib.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinecraftStatusWindow", "..\MinecraftStatusWindow\MinecraftStatusWindow\MinecraftStatusWindow.csproj", "{D3ADE27E-4645-4C31-B4B2-8A64EF6984B0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4} = {F023A16C-2F13-4A87-A8B7-22C43C4A58A4}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThermostatStatusWindow", "..\ThermostatStatusWindow\ThermostatStatusWindow.csproj", "{ACC84060-A64C-4951-8F35-A4E455559026}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4} = {F023A16C-2F13-4A87-A8B7-22C43C4A58A4}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "..\Common\Common.csproj", "{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SystemTemperatureStatusWindow", "..\SystemTemperatureStatusWindow\Window\SystemTemperatureStatusWindow.csproj", "{E45425FD-4302-4555-8F24-18F2373DE1CE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4} = {F023A16C-2F13-4A87-A8B7-22C43C4A58A4}
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6} = {17864D82-457D-4A0A-BC10-1D07F2B3A5D6}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3DAB06DD-C4E9-4AC6-88CF-E4923DE357AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DAB06DD-C4E9-4AC6-88CF-E4923DE357AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DAB06DD-C4E9-4AC6-88CF-E4923DE357AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3DAB06DD-C4E9-4AC6-88CF-E4923DE357AD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3DAB06DD-C4E9-4AC6-88CF-E4923DE357AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DAB06DD-C4E9-4AC6-88CF-E4923DE357AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DAB06DD-C4E9-4AC6-88CF-E4923DE357AD}.Release|x64.ActiveCfg = Release|Any CPU
-		{3DAB06DD-C4E9-4AC6-88CF-E4923DE357AD}.Release|x86.ActiveCfg = Release|Any CPU
-		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Release|x64.ActiveCfg = Release|Any CPU
-		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Release|x86.ActiveCfg = Release|Any CPU
-		{659DB919-854A-43BD-AE59-CF36E9CB610E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{659DB919-854A-43BD-AE59-CF36E9CB610E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{659DB919-854A-43BD-AE59-CF36E9CB610E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{659DB919-854A-43BD-AE59-CF36E9CB610E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{659DB919-854A-43BD-AE59-CF36E9CB610E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{659DB919-854A-43BD-AE59-CF36E9CB610E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{659DB919-854A-43BD-AE59-CF36E9CB610E}.Release|x64.ActiveCfg = Release|Any CPU
-		{659DB919-854A-43BD-AE59-CF36E9CB610E}.Release|x86.ActiveCfg = Release|Any CPU
-		{70E51708-6B2A-44F8-9362-772B375B8921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70E51708-6B2A-44F8-9362-772B375B8921}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70E51708-6B2A-44F8-9362-772B375B8921}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{70E51708-6B2A-44F8-9362-772B375B8921}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{70E51708-6B2A-44F8-9362-772B375B8921}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70E51708-6B2A-44F8-9362-772B375B8921}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70E51708-6B2A-44F8-9362-772B375B8921}.Release|x64.ActiveCfg = Release|Any CPU
-		{70E51708-6B2A-44F8-9362-772B375B8921}.Release|x86.ActiveCfg = Release|Any CPU
-		{D7AADCD4-369A-4713-A710-CC484CE7D04F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7AADCD4-369A-4713-A710-CC484CE7D04F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7AADCD4-369A-4713-A710-CC484CE7D04F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D7AADCD4-369A-4713-A710-CC484CE7D04F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D7AADCD4-369A-4713-A710-CC484CE7D04F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7AADCD4-369A-4713-A710-CC484CE7D04F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7AADCD4-369A-4713-A710-CC484CE7D04F}.Release|x64.ActiveCfg = Release|Any CPU
-		{D7AADCD4-369A-4713-A710-CC484CE7D04F}.Release|x86.ActiveCfg = Release|Any CPU
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}.Release|x64.ActiveCfg = Release|Any CPU
-		{F023A16C-2F13-4A87-A8B7-22C43C4A58A4}.Release|x86.ActiveCfg = Release|Any CPU
-		{0074C983-550E-4094-9E8C-F566FB669297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0074C983-550E-4094-9E8C-F566FB669297}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x64.ActiveCfg = Debug|x64
-		{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x64.Build.0 = Debug|x64
-		{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x86.ActiveCfg = Debug|x86
-		{0074C983-550E-4094-9E8C-F566FB669297}.Debug|x86.Build.0 = Debug|x86
-		{0074C983-550E-4094-9E8C-F566FB669297}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0074C983-550E-4094-9E8C-F566FB669297}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0074C983-550E-4094-9E8C-F566FB669297}.Release|x64.ActiveCfg = Release|x64
-		{0074C983-550E-4094-9E8C-F566FB669297}.Release|x64.Build.0 = Release|x64
-		{0074C983-550E-4094-9E8C-F566FB669297}.Release|x86.ActiveCfg = Release|x86
-		{0074C983-550E-4094-9E8C-F566FB669297}.Release|x86.Build.0 = Release|x86
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x64.ActiveCfg = Debug|x64
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x64.Build.0 = Debug|x64
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x86.ActiveCfg = Debug|x86
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Debug|x86.Build.0 = Debug|x86
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x64.ActiveCfg = Release|x64
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x64.Build.0 = Release|x64
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x86.ActiveCfg = Release|x86
-		{ED1C07A1-54F5-4796-8B06-2A0BB1960D84}.Release|x86.Build.0 = Release|x86
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Release|x64.ActiveCfg = Release|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Release|x86.ActiveCfg = Release|Any CPU
-		{D3ADE27E-4645-4C31-B4B2-8A64EF6984B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3ADE27E-4645-4C31-B4B2-8A64EF6984B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3ADE27E-4645-4C31-B4B2-8A64EF6984B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D3ADE27E-4645-4C31-B4B2-8A64EF6984B0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D3ADE27E-4645-4C31-B4B2-8A64EF6984B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3ADE27E-4645-4C31-B4B2-8A64EF6984B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3ADE27E-4645-4C31-B4B2-8A64EF6984B0}.Release|x64.ActiveCfg = Release|Any CPU
-		{D3ADE27E-4645-4C31-B4B2-8A64EF6984B0}.Release|x86.ActiveCfg = Release|Any CPU
-		{ACC84060-A64C-4951-8F35-A4E455559026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACC84060-A64C-4951-8F35-A4E455559026}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACC84060-A64C-4951-8F35-A4E455559026}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ACC84060-A64C-4951-8F35-A4E455559026}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ACC84060-A64C-4951-8F35-A4E455559026}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACC84060-A64C-4951-8F35-A4E455559026}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACC84060-A64C-4951-8F35-A4E455559026}.Release|x64.ActiveCfg = Release|Any CPU
-		{ACC84060-A64C-4951-8F35-A4E455559026}.Release|x86.ActiveCfg = Release|Any CPU
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x64.ActiveCfg = Debug|x64
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x64.Build.0 = Debug|x64
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x86.ActiveCfg = Debug|x86
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x86.Build.0 = Debug|x86
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x64.ActiveCfg = Release|x64
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x64.Build.0 = Release|x64
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x86.ActiveCfg = Release|x86
-		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x86.Build.0 = Release|x86
-		{E45425FD-4302-4555-8F24-18F2373DE1CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E45425FD-4302-4555-8F24-18F2373DE1CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E45425FD-4302-4555-8F24-18F2373DE1CE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E45425FD-4302-4555-8F24-18F2373DE1CE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E45425FD-4302-4555-8F24-18F2373DE1CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E45425FD-4302-4555-8F24-18F2373DE1CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E45425FD-4302-4555-8F24-18F2373DE1CE}.Release|x64.ActiveCfg = Release|Any CPU
-		{E45425FD-4302-4555-8F24-18F2373DE1CE}.Release|x86.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/StartAll.bat b/StartAll.bat
deleted file mode 100644
index 1e1d7e9..0000000
--- a/StartAll.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-start D:\Code\Personal\WeatherStatusWindow\bin\Debug\WeatherStatusWindow.exe
-start D:\Code\Personal\WoWRealmStatusWindow\bin\Debug\WoWRealmStatusWindow.exe
-start D:\Code\Personal\WaveUpgradeMonitorStatusWindow\bin\Debug\WaveUpgradeMonitorStatusWindow.exe
-start D:\Code\Personal\SystemTemperatureStatusWindow\Window\bin\Debug\SystemTemperatureStatusWindow.exe
-start D:\Code\Personal\ProcessCpuUsageStatusWindow\bin\Debug\ProcessCpuUsageStatusWindow.exe
-start D:\Code\Personal\MonitStatusWindow\bin\Debug\MonitStatusWindow.exe
-start D:\Code\Personal\ThermostatStatusWindow\bin\Debug\ThermostatStatusWindow.exe
diff --git a/TestWindow/App.xaml.cs b/TestWindow/App.xaml.cs
index 69509d6..eee8df3 100644
--- a/TestWindow/App.xaml.cs
+++ b/TestWindow/App.xaml.cs
@@ -1,6 +1,7 @@
-using System;
-using FloatingStatusWindowLibrary;
+using FloatingStatusWindowLibrary;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Windows;
 using Settings = TestWindow.Properties.Settings;
 
@@ -15,7 +16,7 @@ namespace TestWindow
             base.OnStartup(e);
 
             StartManager.ManageAutoStart = true;
-            StartManager.AutoStartEnabled = Settings.Default.AutoStart;
+            StartManager.AutoStartEnabled = !Debugger.IsAttached && Settings.Default.AutoStart;
             StartManager.AutoStartChanged += (value =>
             {
                 Settings.Default.AutoStart = value;