diff --git a/.gitignore b/.gitignore
index fb3ad6a..38a64cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -342,3 +342,4 @@ tmp/
 deploy/
 build_scripts/version.txt
 build_scripts/changelog.md
+
diff --git a/Source/DynamicBatteryStorage/DynamicBatteryStorage.csproj b/Source/DynamicBatteryStorage/DynamicBatteryStorage.csproj
index 07fdc1c..ecca48f 100644
--- a/Source/DynamicBatteryStorage/DynamicBatteryStorage.csproj
+++ b/Source/DynamicBatteryStorage/DynamicBatteryStorage.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\GameData\DynamicBatteryStorage\Plugins\</OutputPath>
+    <OutputPath>$(KSP_ROOT)\GameData\DynamicBatteryStorage\Plugins\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -35,7 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -44,34 +44,34 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.AnimationModule">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.AssetBundleModule">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.IMGUIModule">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.InputLegacyModule">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.InputModule">
-      <HintPath>..\..\..\..\..\..\..\Games\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.InputModule.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.InputModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.TextRenderingModule">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI">
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.UI.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.UI.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UIModule">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.UIModule.dll</HintPath>
+      <HintPath>$(KSP_ROOT)\KSP_x64_Data\Managed\UnityEngine.UIModule.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/DynamicBatteryStorage/UI/SystemsMonitorUI.cs b/Source/DynamicBatteryStorage/UI/SystemsMonitorUI.cs
index bac94f3..35cfbf8 100644
--- a/Source/DynamicBatteryStorage/UI/SystemsMonitorUI.cs
+++ b/Source/DynamicBatteryStorage/UI/SystemsMonitorUI.cs
@@ -241,12 +241,11 @@ protected void OnToolbarButtonToggle()
     protected void OnGUIAppLauncherReady()
     {
       showWindow = false;
-
       Utils.Log("[SystemsMonitorUI]: App Launcher Ready", Utils.LogType.UI);
-      if (ApplicationLauncher.Ready && stockToolbarButton == null && Settings.Enabled)
+      if (ApplicationLauncher.Ready && Settings.Enabled)
       {
-        if (HighLogic.LoadedSceneIsFlight || HighLogic.LoadedSceneIsEditor)
-          stockToolbarButton = ApplicationLauncher.Instance.AddModApplication(
+        if (stockToolbarButton == null)
+		  stockToolbarButton = ApplicationLauncher.Instance.AddModApplication(
               OnToolbarButtonOn,
               OnToolbarButtonOff,
               OnToolbarButtonHover,
@@ -254,9 +253,10 @@ protected void OnGUIAppLauncherReady()
               DummyVoid,
               DummyVoid,
               ApplicationLauncher.AppScenes.VAB | ApplicationLauncher.AppScenes.SPH | ApplicationLauncher.AppScenes.FLIGHT,
-              (Texture)GameDatabase.Instance.GetTexture(toolbarUIIconURLOff, false));
+              (Texture)GameDatabase.Instance.GetTexture(toolbarUIIconURLOff, false));
+		if (toolbarPanel == null)
+			CreateToolbarPanel();
       }
-      CreateToolbarPanel();
     }
 
     protected void OnGUIAppLauncherDestroyed()
diff --git a/Source/DynamicBatteryStorage/Utils.cs b/Source/DynamicBatteryStorage/Utils.cs
index 4db6b94..5ba528b 100644
--- a/Source/DynamicBatteryStorage/Utils.cs
+++ b/Source/DynamicBatteryStorage/Utils.cs
@@ -120,7 +120,7 @@ public static T FindChildOfType<T>(string name, Transform parent)
       {
         result = parent.FindDeepChild(name).GetComponent<T>();
       }
-      catch (NullReferenceException e)
+      catch (NullReferenceException)
       {
         Debug.LogError($"Couldn't find {name} in children of {parent.name}");
       }
diff --git a/Source/DynamicBatteryStorage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Source/DynamicBatteryStorage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index c821433..0000000
Binary files a/Source/DynamicBatteryStorage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ
diff --git a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csproj.FileListAbsolute.txt b/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csproj.FileListAbsolute.txt
deleted file mode 100644
index 33b271b..0000000
--- a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-G:/KSP Modding/repositories/DynamicBatteryStorage/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csprojResolveAssemblyReference.cache
-G:/KSP Modding/repositories/DynamicBatteryStorage/GameData/DynamicBatteryStorage/Plugins/DynamicBatteryStorage.dll
-G:/KSP Modding/repositories/DynamicBatteryStorage/GameData/DynamicBatteryStorage/Plugins/DynamicBatteryStorage.pdb
-G:/KSP Modding/repositories/DynamicBatteryStorage/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.dll
-G:/KSP Modding/repositories/DynamicBatteryStorage/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.pdb
-/github/DynamicBatteryStorage/GameData/DynamicBatteryStorage/Plugins/DynamicBatteryStorage.dll
-/github/DynamicBatteryStorage/GameData/DynamicBatteryStorage/Plugins/DynamicBatteryStorage.pdb
-/github/DynamicBatteryStorage/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csprojResolveAssemblyReference.cache
-/github/DynamicBatteryStorage/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csproj.CoreCompileInputs.cache
-/github/DynamicBatteryStorage/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.dll
-/github/DynamicBatteryStorage/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.pdb
-C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\GameData\DynamicBatteryStorage\Plugins\DynamicBatteryStorage.dll
-C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\GameData\DynamicBatteryStorage\Plugins\DynamicBatteryStorage.pdb
-C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csproj.CoreCompileInputs.cache
-C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csproj.CopyComplete
-C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.dll
-C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.pdb
-C:\Users\Chris\KSP\Repos\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csprojAssemblyReference.cache
-C:\Users\Chris\KSP\Repositories\DynamicBatteryStorage\GameData\DynamicBatteryStorage\Plugins\DynamicBatteryStorage.dll
-C:\Users\Chris\KSP\Repositories\DynamicBatteryStorage\GameData\DynamicBatteryStorage\Plugins\DynamicBatteryStorage.pdb
-C:\Users\Chris\KSP\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csprojAssemblyReference.cache
-C:\Users\Chris\KSP\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csproj.CoreCompileInputs.cache
-C:\Users\Chris\KSP\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csproj.CopyComplete
-C:\Users\Chris\KSP\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.dll
-C:\Users\Chris\KSP\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.pdb
-C:\Users\Chris\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csproj.AssemblyReference.cache
-C:\Users\Chris\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csproj.CoreCompileInputs.cache
-C:\Users\Chris\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.dll
-C:\Users\Chris\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.pdb
-C:\Users\Chris\Repositories\DynamicBatteryStorage\GameData\DynamicBatteryStorage\Plugins\DynamicBatteryStorage.dll
-C:\Users\Chris\Repositories\DynamicBatteryStorage\GameData\DynamicBatteryStorage\Plugins\DynamicBatteryStorage.pdb
-C:\Users\Chris\Repositories\DynamicBatteryStorage\Source\DynamicBatteryStorage\obj\Debug\DynamicBatteryStorage.csproj.CopyComplete
diff --git a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csprojResolveAssemblyReference.cache b/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csprojResolveAssemblyReference.cache
deleted file mode 100644
index 4d4b431..0000000
Binary files a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.csprojResolveAssemblyReference.cache and /dev/null differ
diff --git a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.dll b/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.dll
deleted file mode 100644
index 6d598dd..0000000
Binary files a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.dll and /dev/null differ
diff --git a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.pdb b/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.pdb
deleted file mode 100644
index 6d75b40..0000000
Binary files a/Source/DynamicBatteryStorage/obj/Debug/DynamicBatteryStorage.pdb and /dev/null differ
diff --git a/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.csproj.FileListAbsolute.txt b/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5d8cd65..0000000
--- a/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-G:\KSP Modding\repositories\FarFutureTechnologies\Source\PowerMonitor\PowerMonitor\obj\Debug\PowerMonitor.csprojResolveAssemblyReference.cache
-G:\KSP Modding\repositories\FarFutureTechnologies\GameData\FarFutureTechnologies\Plugins\PowerMonitor.dll
-G:\KSP Modding\repositories\FarFutureTechnologies\GameData\FarFutureTechnologies\Plugins\PowerMonitor.pdb
-G:\KSP Modding\repositories\FarFutureTechnologies\Source\PowerMonitor\PowerMonitor\obj\Debug\PowerMonitor.dll
-G:\KSP Modding\repositories\FarFutureTechnologies\Source\PowerMonitor\PowerMonitor\obj\Debug\PowerMonitor.pdb
diff --git a/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.csprojResolveAssemblyReference.cache b/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.csprojResolveAssemblyReference.cache
deleted file mode 100644
index d2a561e..0000000
Binary files a/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.csprojResolveAssemblyReference.cache and /dev/null differ
diff --git a/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.dll b/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.dll
deleted file mode 100644
index ed19040..0000000
Binary files a/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.dll and /dev/null differ
diff --git a/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.pdb b/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.pdb
deleted file mode 100644
index c5da6da..0000000
Binary files a/Source/DynamicBatteryStorage/obj/Debug/PowerMonitor.pdb and /dev/null differ
diff --git a/Source/PowerMonitor.suo b/Source/PowerMonitor.suo
deleted file mode 100644
index f83cd03..0000000
Binary files a/Source/PowerMonitor.suo and /dev/null differ