diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..fd95a82e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,2 @@
+[*.cs]
+dotnet_diagnostic.CS8618.severity = none
\ No newline at end of file
diff --git a/.run/Build & Start SaveGame.run.xml b/.run/Build & Start SaveGame.run.xml
index 7130fe3b..79389074 100644
--- a/.run/Build & Start SaveGame.run.xml	
+++ b/.run/Build & Start SaveGame.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build &amp; Start SaveGame" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="start &quot;G:\Games\GOG\Timberborn\Timberborn.exe&quot; &quot;-saveName FirstLoad -settlementName BluePrintTester&quot;" />
+    <option name="SCRIPT_TEXT" value="start &quot;G:\Games\GOG\Timberborn\Timberborn.exe&quot; &quot;-skipModManager -saveName TestingSaveGame -settlementName TestingWorld&quot;" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/.run/Build & Start.run.xml b/.run/Build & Start.run.xml
index 1aeb9841..da7a1e4a 100644
--- a/.run/Build & Start.run.xml	
+++ b/.run/Build & Start.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Build &amp; Start" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="start &quot;G:\Games\GOG\Timberborn\Timberborn.exe&quot;" />
+    <option name="SCRIPT_TEXT" value="start &quot;G:\Games\GOG\Timberborn\Timberborn.exe&quot; &quot;-skipModmanager&quot;" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />
diff --git a/Changelog.md b/Changelog.md
index 1aa338e4..09784ae6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,11 @@
+## 0.7.12.0
+- Updated for update 7.2
+- Fixed bottombar wonder icon
+
+## 0.7.9.0
+- Disabled `BottomBarSystem`, `Tools` & `BuildingSpecificationSsystem` for update 7.
+- Updated `TimberApi`, `EntityLinkerSystem`, `SpecificationSystem`, `UIBuilderSystem`, `UIPresets` for update 7.
+
 ## 0.7.8.0
 - Added `Scenes` to `ToolSpecification` to specify in which scene the tool should be loaded `Game` is default.
 - Added `GenericTool` tool factory type to make compatibility without hard dependency possible for custom mod tools. 
@@ -68,7 +76,7 @@
 - Added BottomBarRework.
 - Added ToolSpecifications.
 - Enhanced ToolGroupSpecifications.
-- Added Code SpecificationGeneration `ISpecificationGenerator`.
+- Added Code SpecificationGeneration `ISpecGenerator`.
 - Added `SceneManager`.
 - Enhanced SingletonSystem (`IEarlyLoadableSingleton`, `ILateLoadableSingleton`).
 - Extended `IObjectLoader` with more default fallbacks.
diff --git a/Debug/AutoModStarter/AutoStarterPlugin.cs b/Debug/AutoModStarter/AutoStarterPlugin.cs
deleted file mode 100644
index 6260d285..00000000
--- a/Debug/AutoModStarter/AutoStarterPlugin.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// using BepInEx;
-// using HarmonyLib;
-// using Timberborn.ModManagerSceneUI;
-//
-// namespace AutoModStarter;
-//
-// [BepInPlugin(PluginInfo.PLUGIN_GUID, PluginInfo.PLUGIN_NAME, PluginInfo.PLUGIN_VERSION)]
-// public class AutoStarterPlugin : BaseUnityPlugin
-// {
-//     private void Awake()
-//     {
-//         Harmony.CreateAndPatchAll(typeof(ModManagerScenePanelPatch));
-//     }
-// }
-//
-// internal class ModManagerScenePanelPatch
-// {
-//     [HarmonyPatch(typeof(ModManagerScenePanel), "Awake")]
-//     [HarmonyPrefix]
-//     private static bool Prefix(ModManagerScenePanel __instance)
-//     {
-//         __instance.LoadModsAndStartGame();
-//         return false;
-//     }
-// }
\ No newline at end of file
diff --git a/Debug/TimberApi.DebugTool/SpecificationServiceLogger.cs b/Debug/TimberApi.DebugTool/SpecificationServiceLogger.cs
index dd731612..621e3889 100644
--- a/Debug/TimberApi.DebugTool/SpecificationServiceLogger.cs
+++ b/Debug/TimberApi.DebugTool/SpecificationServiceLogger.cs
@@ -14,7 +14,6 @@ public class SpecificationServiceLogger(ObjectSaveReaderWriter objectSaveReaderW
 {
     public new IEnumerable<T> GetSpecifications<T>(IObjectSerializer<T> serializer)
     {
-
             var type = typeof (T).Name;
 
             var specifications = new List<T>();
diff --git a/Debug/TimberApi.DebugTool/TimberApi.DebugTool.csproj b/Debug/TimberApi.DebugTool/TimberApi.DebugTool.csproj
index a24901f5..049968d6 100644
--- a/Debug/TimberApi.DebugTool/TimberApi.DebugTool.csproj
+++ b/Debug/TimberApi.DebugTool/TimberApi.DebugTool.csproj
@@ -20,14 +20,12 @@
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
         <PackageReference Include="System.Collections.Immutable" Version="8.0.0"/>
-        <PackageReference Include="UnityEngine.Modules" Version="6000.0.4" IncludeAssets="compile"/>
         <PackageReference Include="Castle.Core" Version="5.1.1"/>
         <!--        Needs to be updated-->
-        <PackageReference Include="Timberborn.GameLibs" Version="0.3.4.3-r.0" ExcludeAssets="All" Condition="$(UseLocalTimberbornSource)"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+    <ItemGroup >
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -35,6 +33,8 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
     </ItemGroup>
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
diff --git a/Debug/TimberApi.TesterMod/Configurators.cs b/Debug/TimberApi.TesterMod/Configurators.cs
index 22edaf99..7337c2d9 100644
--- a/Debug/TimberApi.TesterMod/Configurators.cs
+++ b/Debug/TimberApi.TesterMod/Configurators.cs
@@ -5,37 +5,42 @@ namespace TimberApi.TesterMod;
 [Context("Game")]
 [Context("MainMenu")]
 [Context("MapEditor")]
-public class AllConfigurator : IConfigurator
+public class AllConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        
+        Bind<TestClass>().AsSingleton();
     }
 }
 
 [Context("Game")]
-public class GameConfigurator : IConfigurator
+public class GameConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
         
     }
 }
 
 [Context("MainMenu")]
-public class MainMenuConfigurator : IConfigurator
+public class MainMenuConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    // protected override void Configure()
+    // {
+    //     // Bind<Tester>().AsSingleton();
+    //     // Bind<TestSpecificationDeserializer>().AsSingleton();
+    //     // MultiBind<ISpecGenerator>().To<TestSpecificationGenerator>().AsSingleton();
+    // }
+
+    protected override void Configure()
     {
-        
     }
 }
 
 [Context("MapEditor")]
-public class MapEditorConfigurator : IConfigurator
+public class MapEditorConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        
     }
 }
\ No newline at end of file
diff --git a/Debug/TimberApi.TesterMod/ModStarter.cs b/Debug/TimberApi.TesterMod/ModStarter.cs
index b625f9bf..21f413ae 100644
--- a/Debug/TimberApi.TesterMod/ModStarter.cs
+++ b/Debug/TimberApi.TesterMod/ModStarter.cs
@@ -1,5 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using HarmonyLib;
+using Timberborn.BlueprintSystem;
 using Timberborn.ModManagerScene;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace TimberApi.TesterMod;
 
@@ -9,4 +19,10 @@ public void StartMod(IModEnvironment modEnvironment)
     {
         Debug.Log("Test");
     }
+}
+
+[HarmonyPatch(typeof(SpecService))]
+public static class TestPatch
+{
+    
 }
\ No newline at end of file
diff --git a/Debug/TimberApi.TesterMod/TimberApi.TesterMod.csproj b/Debug/TimberApi.TesterMod/TimberApi.TesterMod.csproj
index a24901f5..1561298c 100644
--- a/Debug/TimberApi.TesterMod/TimberApi.TesterMod.csproj
+++ b/Debug/TimberApi.TesterMod/TimberApi.TesterMod.csproj
@@ -19,15 +19,9 @@
         <PackageReference Include="Lib.Harmony" Version="2.3.3"/>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-        <PackageReference Include="System.Collections.Immutable" Version="8.0.0"/>
-        <PackageReference Include="UnityEngine.Modules" Version="6000.0.4" IncludeAssets="compile"/>
-        <PackageReference Include="Castle.Core" Version="5.1.1"/>
-        <!--        Needs to be updated-->
-        <PackageReference Include="Timberborn.GameLibs" Version="0.3.4.3-r.0" ExcludeAssets="All" Condition="$(UseLocalTimberbornSource)"/>
-    </ItemGroup>
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.0"/>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -35,6 +29,13 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\Src\TimberApi.SpecificationSystem\TimberApi.SpecificationSystem.csproj" />
+      <ProjectReference Include="..\..\Src\TimberApi.UIBuilderSystem\TimberApi.UIBuilderSystem.csproj" />
     </ItemGroup>
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
diff --git a/Libs/README.md b/Libs/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/NuGet.Config b/NuGet.Config
deleted file mode 100644
index 25029378..00000000
--- a/NuGet.Config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <packageSources>
-        <add key="BepInEx" value="https://nuget.bepinex.dev/v3/index.json" />
-    </packageSources>
-</configuration>
\ No newline at end of file
diff --git a/Src/TimberApi.BottomBarSystem/BottomBarButton.cs b/Src/TimberApi.BottomBarSystem/BottomBarButton.cs
index b0c0eb58..5c3d0610 100644
--- a/Src/TimberApi.BottomBarSystem/BottomBarButton.cs
+++ b/Src/TimberApi.BottomBarSystem/BottomBarButton.cs
@@ -1,17 +1,18 @@
 using System;
-using Timberborn.SerializationSystem;
 
 namespace TimberApi.BottomBarSystem;
 
 public class BottomBarButton(
+    BottomBarSpec bottomBarSpec,
     string id,
     bool isGroup,
     string? groupId,
     bool hidden,
-    int order,
-    ObjectSave? buttonInformation)
+    int order)
     : IComparable<BottomBarButton>
 {
+    public BottomBarSpec? BottomBarSpec { get; } = bottomBarSpec;
+    
     public string Id { get; } = id;
 
     public bool IsGroup { get; } = isGroup;
@@ -21,9 +22,6 @@ public class BottomBarButton(
     public bool Hidden { get; } = hidden;
 
     public int Order { get; } = order;
-
-    public ObjectSave? ButtonInformation { get; } = buttonInformation;
-
     public int CompareTo(BottomBarButton other)
     {
         return Order.CompareTo(other.Order);
diff --git a/Src/TimberApi.BottomBarSystem/BottomBarPanel.cs b/Src/TimberApi.BottomBarSystem/BottomBarPanel.cs
index d8a1851f..cab1069b 100644
--- a/Src/TimberApi.BottomBarSystem/BottomBarPanel.cs
+++ b/Src/TimberApi.BottomBarSystem/BottomBarPanel.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using TimberApi.Extensions;
 using TimberApi.Tools.ToolGroupSystem;
 using TimberApi.Tools.ToolSystem;
+using TimberApi.Tools.ToolUI;
 using Timberborn.BottomBarSystem;
-using Timberborn.Persistence;
 using Timberborn.SingletonSystem;
 using Timberborn.ToolSystem;
 using Timberborn.UILayoutSystem;
@@ -22,9 +21,9 @@ public class BottomBarPanel : ILoadableSingleton
 
     private readonly SortedDictionary<int, VisualElement> _mainWrapperSections = new();
 
-    private readonly ToolGroupService _toolGroupService;
+    private readonly TimberApi.Tools.ToolGroupSystem.ToolGroupService _toolGroupService;
 
-    private readonly ToolService _toolService;
+    private readonly TimberApi.Tools.ToolSystem.ToolService _toolService;
 
     private readonly UILayout _uiLayout;
 
@@ -34,7 +33,7 @@ public BottomBarPanel(IEnumerable<BottomBarModule> bottomBarModules,
         BottomBarService bottomBarService,
         BottomBarUiService bottomBarUiService,
         UILayout uiLayout,
-        ToolButtonFactory toolButtonFactory, ToolService toolService, ToolGroupService toolGroupService)
+        ToolButtonFactory toolButtonFactory, TimberApi.Tools.ToolSystem.ToolService toolService, TimberApi.Tools.ToolGroupSystem.ToolGroupService toolGroupService)
     {
         _bottomBarUiService = bottomBarUiService;
         _uiLayout = uiLayout;
@@ -60,12 +59,18 @@ private void SetupBottomBar()
 
     private void InitializeButtons()
     {
-        foreach (var bottomBarButton in _bottomBarService.ToolItemButtons.Where(button => !button.Hidden)
-                     .OrderBy(button => button.Order))
+        foreach (var bottomBarButton in _bottomBarService.ToolItemButtons.Where(button => !button.Hidden).OrderBy(button => button.Order))
+        {
             if (bottomBarButton.IsGroup)
+            {
                 HandleGroupButton(bottomBarButton);
+            }
             else
+            {
                 HandleToolButton(bottomBarButton);
+            }
+                
+        }
     }
 
     private void HandleGroupButton(BottomBarButton bottomBarButton)
@@ -75,8 +80,7 @@ private void HandleGroupButton(BottomBarButton bottomBarButton)
         var section = GetBottomBarSection(bottomBarButton);
 
         AddElementToBottomBar(toolGroupButton.Root, _bottomBarService.GetGroupRow(bottomBarButton.Id), section);
-        AddElementToBottomBar(toolGroupButton.ToolButtonsElement, _bottomBarService.GetGroupRow(bottomBarButton.Id) + 1,
-            section);
+        AddElementToBottomBar(toolGroupButton.ToolButtonsElement, _bottomBarService.GetGroupRow(bottomBarButton.Id) + 1, section);
 
         if (bottomBarButton.GroupId != null)
             _toolGroupService.GetToolGroupButton(bottomBarButton.GroupId).AddToolGroupButton(toolGroupButton);
@@ -85,7 +89,7 @@ private void HandleGroupButton(BottomBarButton bottomBarButton)
     private void HandleToolButton(BottomBarButton bottomBarButton)
     {
         var toolButton = _toolService.GetToolButton(bottomBarButton.Id);
-
+        
         if (bottomBarButton.GroupId is null)
         {
             AddElementToBottomBar(toolButton.Root, 0, GetBottomBarSection(bottomBarButton));
@@ -100,11 +104,7 @@ private void HandleToolButton(BottomBarButton bottomBarButton)
 
     private int GetBottomBarSection(BottomBarButton bottomBarButton)
     {
-        if (bottomBarButton.ButtonInformation == null) return 1;
-
-        var objectLoader = ObjectLoader.CreateBasicLoader(bottomBarButton.ButtonInformation);
-
-        return objectLoader.GetValueOrDefault(new PropertyKey<int>("BottomBarSection"), 1);
+        return bottomBarButton.BottomBarSpec?.Section ?? 1;
     }
 
     private void InitializeSections()
@@ -142,6 +142,9 @@ private VisualElement GetOrInsertSection(int section)
 
     private void AddPanelsToWrapper()
     {
-        foreach (var bottomBarPanelPair in _bottomBarPanels.Reverse()) _bottomBarWrapper.Add(bottomBarPanelPair.Value);
+        foreach (var bottomBarPanelPair in _bottomBarPanels.Reverse())
+        {
+            _bottomBarWrapper.Add(bottomBarPanelPair.Value);
+        }
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.BottomBarSystem/BottomBarService.cs b/Src/TimberApi.BottomBarSystem/BottomBarService.cs
index a51a2316..3f797a9b 100644
--- a/Src/TimberApi.BottomBarSystem/BottomBarService.cs
+++ b/Src/TimberApi.BottomBarSystem/BottomBarService.cs
@@ -1,23 +1,25 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using TimberApi.SpecificationSystem;
+using TimberApi.Tools.ToolGroupSystem;
 using TimberApi.Tools.ToolSystem;
 using Timberborn.SingletonSystem;
-using ToolGroupSpecification = TimberApi.Tools.ToolGroupSystem.ToolGroupSpecification;
-using ToolGroupSpecificationService = TimberApi.Tools.ToolGroupSystem.ToolGroupSpecificationService;
+using UnityEngine;
+using ToolGroupSpecService = TimberApi.Tools.ToolGroupSystem.ToolGroupSpecService;
 
 namespace TimberApi.BottomBarSystem;
 
 public class BottomBarService(
-    ToolGroupSpecificationService toolGroupSpecificationService,
-    ToolSpecificationService toolSpecificationService)
+    ToolGroupSpecService toolGroupSpecService,
+    ToolSpecService toolSpecService)
     : ILoadableSingleton
 {
     private static readonly string BottomBarSection = "BottomBar";
 
     private readonly Dictionary<string, int> _toolGroupRows = new();
 
-    private ImmutableDictionary<string, ToolGroupSpecification> _toolGroupSpecifications = null!;
+    private ImmutableDictionary<string, TimberApiToolGroupSpec> _toolGroupSpecs = null!;
 
     private ImmutableArray<BottomBarButton> _toolItemButtons;
 
@@ -25,39 +27,38 @@ public class BottomBarService(
 
     public void Load()
     {
-        _toolGroupSpecifications = toolGroupSpecificationService
+        _toolGroupSpecs = toolGroupSpecService
             .GetBySection(BottomBarSection)
-            .ToImmutableDictionary(specification => specification.Id);
+            .ToImmutableDictionary(spec => spec.Id);
 
         _toolItemButtons = CreateItemButtons().ToImmutableArray().Sort();
     }
 
-
     private IEnumerable<BottomBarButton> CreateItemButtons()
     {
-        foreach (var specification in _toolGroupSpecifications.Select(pair => pair.Value))
+        foreach (var toolGroupSpec in _toolGroupSpecs.Select(pair => pair.Value))
         {
-            _toolGroupRows.Add(specification.Id.ToLower(), CalculateGroupRow(specification));
-
+            _toolGroupRows.Add(toolGroupSpec.Id.ToLower(), CalculateGroupRow(toolGroupSpec));
+            
             yield return new BottomBarButton(
-                specification.Id,
+                toolGroupSpec.GetSpecOrDefault<BottomBarSpec>(),
+                toolGroupSpec.Id,
                 true,
-                specification.GroupId,
-                specification.Hidden,
-                specification.Order,
-                specification.GroupInformation
+                toolGroupSpec.GroupId,
+                toolGroupSpec.Hidden,
+                toolGroupSpec.Order
             );
         }
+        
 
-        foreach (var specification in toolSpecificationService.GetBySection("BottomBar"))
+        foreach (var toolSpec in toolSpecService.GetBySection("BottomBar"))
             yield return new BottomBarButton(
-                specification.Id,
+                toolSpec.GetSpec<BottomBarSpec>(),
+                toolSpec.Id,
                 false,
-                specification.GroupId,
-                specification.Hidden,
-                specification.Order,
-                specification.ToolInformation
-            );
+                toolSpec.GroupId,
+                toolSpec.Hidden,
+                toolSpec.Order);
     }
 
     public int GetGroupRow(string groupId)
@@ -68,13 +69,13 @@ public int GetGroupRow(string groupId)
         return row;
     }
 
-    private int CalculateGroupRow(ToolGroupSpecification toolGroupSpecification)
+    private int CalculateGroupRow(TimberApiToolGroupSpec toolGroupSpec)
     {
         var row = 0;
 
-        while (toolGroupSpecification.GroupId != null)
+        while (toolGroupSpec.GroupId != null)
         {
-            toolGroupSpecification = _toolGroupSpecifications[toolGroupSpecification.GroupId];
+            toolGroupSpec = _toolGroupSpecs[toolGroupSpec.GroupId];
             row += 1;
         }
 
diff --git a/Src/TimberApi.BottomBarSystem/BottomBarSpec.cs b/Src/TimberApi.BottomBarSystem/BottomBarSpec.cs
new file mode 100644
index 00000000..93ef4f1b
--- /dev/null
+++ b/Src/TimberApi.BottomBarSystem/BottomBarSpec.cs
@@ -0,0 +1,9 @@
+using Timberborn.BlueprintSystem;
+
+namespace TimberApi.BottomBarSystem;
+
+public record BottomBarSpec : ComponentSpec
+{
+    [Serialize]
+    public int Section { get; init; } = 1;
+}
\ No newline at end of file
diff --git a/Src/TimberApi.BottomBarSystem/BottomBarSystemConfigurator.cs b/Src/TimberApi.BottomBarSystem/BottomBarSystemConfigurator.cs
deleted file mode 100644
index 07190dbe..00000000
--- a/Src/TimberApi.BottomBarSystem/BottomBarSystemConfigurator.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Bindito.Core;
-
-namespace TimberApi.BottomBarSystem;
-
-[Context("Game")]
-public class BottomBarSystemConfigurator : IConfigurator
-{
-    public void Configure(IContainerDefinition containerDefinition)
-    {
-        containerDefinition.Bind<BottomBarPanel>().AsSingleton();
-        containerDefinition.Bind<BottomBarUiService>().AsSingleton();
-        containerDefinition.Bind<BottomBarService>().AsSingleton();
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.BottomBarSystem/BottomBarSystemConfiguratorTimberApi.cs b/Src/TimberApi.BottomBarSystem/BottomBarSystemConfiguratorTimberApi.cs
new file mode 100644
index 00000000..7b3d0773
--- /dev/null
+++ b/Src/TimberApi.BottomBarSystem/BottomBarSystemConfiguratorTimberApi.cs
@@ -0,0 +1,14 @@
+using Bindito.Core;
+
+namespace TimberApi.BottomBarSystem;
+
+[Context("Game")]
+public class BottomBarSystemConfiguratorTimberApi : Configurator
+{
+    protected override void Configure()
+    {
+        Bind<BottomBarPanel>().AsSingleton();
+        Bind<BottomBarUiService>().AsSingleton();
+        Bind<BottomBarService>().AsSingleton();
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.BottomBarSystem/ModStarter.cs b/Src/TimberApi.BottomBarSystem/ModStarter.cs
index ef852a7d..b442cf54 100644
--- a/Src/TimberApi.BottomBarSystem/ModStarter.cs
+++ b/Src/TimberApi.BottomBarSystem/ModStarter.cs
@@ -11,22 +11,24 @@ public class ModStarter : IModStarter
 {
     private static Harmony _harmony = null!;
 
-    public void StartMod()
+    public void StartMod(IModEnvironment modEnvironment)
     {
         _harmony = new Harmony("TimberApi.BottomBar");
-        SceneManager.SceneChanged += SceneManagerOnSceneChanged;
+        ContextManager.ContextChanged += SceneManagerOnContextChanged;
     }
 
-    private void SceneManagerOnSceneChanged(Scene previousscene, Scene currentscene,
-        IContainerDefinition currentcontainerdefinition)
+    private void SceneManagerOnContextChanged(string previousscene, string currentscene)
     {
-        if (currentscene != Scene.Game)
+        if (currentscene != "Game")
         {
             _harmony.UnpatchAll("TimberApi.BottomBar");
             return;
         }
 
-        if (previousscene == Scene.Game) return;
+        if (previousscene == "Game")
+        {
+            return;
+        }
 
         try
         {
diff --git a/Src/TimberApi.BottomBarSystem/Patches/BottomBarConfiguratorPatcher.cs b/Src/TimberApi.BottomBarSystem/Patches/BottomBarConfiguratorPatcher.cs
index 09ccd608..21a22448 100644
--- a/Src/TimberApi.BottomBarSystem/Patches/BottomBarConfiguratorPatcher.cs
+++ b/Src/TimberApi.BottomBarSystem/Patches/BottomBarConfiguratorPatcher.cs
@@ -1,9 +1,8 @@
-using System;
 using HarmonyLib;
 using TimberApi.HarmonySystem;
+using Timberborn.BottomBarSystem;
 using Timberborn.TutorialSystem;
 using Timberborn.TutorialSystemInitialization;
-using UnityEngine;
 
 namespace TimberApi.BottomBarSystem.Patches;
 
@@ -11,25 +10,20 @@ public class BottomBarConfiguratorPatcher
 {
     public static void Patch(Harmony harmony)
     {
-        try
-        {
-            harmony.Patch(
-                harmony.GetMethodInfo<Timberborn.BottomBarSystem.BottomBarSystemConfigurator>(
-                    nameof(Timberborn.BottomBarSystem.BottomBarSystemConfigurator.Configure)),
-                harmony.GetHarmonyMethod<BottomBarConfiguratorPatcher>(nameof(DisableBottomBarSystemConfigurator))
-            );
-
-            harmony.Patch(
-                harmony.GetMethodInfo<TutorialConfigurationProvider>(nameof(TutorialConfigurationProvider
-                    .CreateFolktailsConfiguration)),
-                harmony.GetHarmonyMethod<BottomBarConfiguratorPatcher>(nameof(CreateFolktailsConfigurationPatch))
-            );
-        }
-        catch (Exception e)
-        {
-            Debug.LogError("TimberApi.BottomBar failed to apply patches");
-            Debug.LogError($"TimberApi.BottomBar {e}");
-        }
+        harmony.Patch(
+            harmony.GetMethodInfo<BottomBarSystemConfigurator>(nameof(BottomBarSystemConfigurator.Configure)),
+            harmony.GetHarmonyMethod<BottomBarConfiguratorPatcher>(nameof(DisableBottomBarSystemConfigurator))
+        );
+        
+        harmony.Patch(
+            harmony.GetMethodInfo<TutorialConfigurationProvider>(nameof(TutorialConfigurationProvider.CreateStartingFactionConfiguration)),
+            harmony.GetHarmonyMethod<BottomBarConfiguratorPatcher>(nameof(CreateFolktailsConfigurationPatch))
+        );
+        
+        harmony.Patch(
+            harmony.GetMethodInfo<TutorialConfigurationProvider>(nameof(TutorialConfigurationProvider.CreateStartingFactionConfiguration)),
+            harmony.GetHarmonyMethod<BottomBarConfiguratorPatcher>(nameof(CreateFolktailsConfigurationPatch))
+        );
     }
 
     public static bool DisableBottomBarSystemConfigurator()
diff --git a/Src/TimberApi.BottomBarSystem/Patches/PatchConfigurator.cs b/Src/TimberApi.BottomBarSystem/Patches/PatchConfigurator.cs
index fb8a1546..0e54a875 100644
--- a/Src/TimberApi.BottomBarSystem/Patches/PatchConfigurator.cs
+++ b/Src/TimberApi.BottomBarSystem/Patches/PatchConfigurator.cs
@@ -3,10 +3,10 @@
 namespace TimberApi.BottomBarSystem.Patches;
 
 [Context("Game")]
-public class PatchConfigurator : IConfigurator
+public class PatchConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<ToolGroupButtonPatcher>().AsSingleton();
+        Bind<ToolGroupButtonPatcher>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.BottomBarSystem/Patches/ToolGroupButtonPatcher.cs b/Src/TimberApi.BottomBarSystem/Patches/ToolGroupButtonPatcher.cs
index 0444e234..b582c8e2 100644
--- a/Src/TimberApi.BottomBarSystem/Patches/ToolGroupButtonPatcher.cs
+++ b/Src/TimberApi.BottomBarSystem/Patches/ToolGroupButtonPatcher.cs
@@ -6,6 +6,7 @@
 using Timberborn.CoreUI;
 using Timberborn.CursorToolSystem;
 using Timberborn.ToolSystem;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace TimberApi.BottomBarSystem.Patches;
diff --git a/Src/TimberApi.BottomBarSystem/Patches/ToolGroupManagerPatcher.cs b/Src/TimberApi.BottomBarSystem/Patches/ToolGroupManagerPatcher.cs
index 55b5d74f..0acd655a 100644
--- a/Src/TimberApi.BottomBarSystem/Patches/ToolGroupManagerPatcher.cs
+++ b/Src/TimberApi.BottomBarSystem/Patches/ToolGroupManagerPatcher.cs
@@ -2,6 +2,7 @@
 using HarmonyLib;
 using TimberApi.HarmonySystem;
 using TimberApi.Tools.ToolGroupSystem;
+using Timberborn.InputSystem;
 using Timberborn.SingletonSystem;
 using Timberborn.ToolSystem;
 
diff --git a/Src/TimberApi.BottomBarSystem/TimberApi.BottomBarSystem.csproj b/Src/TimberApi.BottomBarSystem/TimberApi.BottomBarSystem.csproj
index 9387b646..551bac92 100644
--- a/Src/TimberApi.BottomBarSystem/TimberApi.BottomBarSystem.csproj
+++ b/Src/TimberApi.BottomBarSystem/TimberApi.BottomBarSystem.csproj
@@ -9,11 +9,12 @@
 
     <ItemGroup>
         <ProjectReference Include="..\TimberApi.Tools\TimberApi.Tools.csproj"/>
+        <ProjectReference Include="..\TimberApi.UIBuilderSystem\TimberApi.UIBuilderSystem.csproj" />
         <ProjectReference Include="..\TimberApi\TimberApi.csproj"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+    <ItemGroup >
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -21,6 +22,8 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -30,6 +33,6 @@
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
         <Message Text="### Copying files to plugins ###" Importance="high"/>
-        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\core"/>
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\version-0.7\core"/>
     </Target>
 </Project>
diff --git a/Src/TimberApi.BottomBarSystem/ToolGroupButtonExtensions.cs b/Src/TimberApi.BottomBarSystem/ToolGroupButtonExtensions.cs
index 20c92f4f..9547677b 100644
--- a/Src/TimberApi.BottomBarSystem/ToolGroupButtonExtensions.cs
+++ b/Src/TimberApi.BottomBarSystem/ToolGroupButtonExtensions.cs
@@ -1,3 +1,4 @@
+using Timberborn.ToolButtonSystem;
 using Timberborn.ToolSystem;
 
 namespace TimberApi.BottomBarSystem;
diff --git a/Src/TimberApi.BuildingSpecificationSystem/BuildingChangeApplier.cs b/Src/TimberApi.BuildingSpecificationSystem/BuildingChangeApplier.cs
index be92ae3e..871d51b8 100644
--- a/Src/TimberApi.BuildingSpecificationSystem/BuildingChangeApplier.cs
+++ b/Src/TimberApi.BuildingSpecificationSystem/BuildingChangeApplier.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using TimberApi.SingletonSystem;
-using Timberborn.Buildings;
 using Timberborn.Goods;
 using Timberborn.MechanicalSystem;
 using Timberborn.PrefabSystem;
@@ -16,7 +15,7 @@ internal class BuildingChangeApplier(
 {
     public void EarlyLoad()
     {
-        foreach (var building in prefabService.GetAll<Building>())
+        foreach (var building in prefabService.GetAll<Timberborn.Buildings.BuildingSpec>())
         {
             var buildingSpecification = buildingSpecificationService.GetBuildingSpecificationByBuilding(building);
 
@@ -34,41 +33,45 @@ public void EarlyLoad()
                 ChangeManufactoryRecipes(manufactorySpec, buildingSpecification);
             }
 
-            if (building.TryGetComponentFast(out MechanicalNodeSpecification mechanicalNodeSpecification))
+            if (building.TryGetComponentFast(out MechanicalNodeSpec mechanicalNodeSpecification))
             {
                 ChangeMechanicalNodeSpecification(mechanicalNodeSpecification, buildingSpecification);
             }
         }
     }
 
-    private static void ChangeMechanicalNodeSpecification(MechanicalNodeSpecification mechanicalNodeSpecification, BuildingSpecification buildingSpecification)
+    private static void ChangeMechanicalNodeSpecification(MechanicalNodeSpec mechanicalNodeSpecification, BuildingSpec buildingSpec)
     {
-        if (buildingSpecification.PowerOutput != null)
+        if (buildingSpec.PowerOutput != null)
         {
-            mechanicalNodeSpecification._powerOutput = (int) buildingSpecification.PowerOutput;
+            mechanicalNodeSpecification._powerOutput = (int) buildingSpec.PowerOutput;
         }
 
-        if (buildingSpecification.PowerInput != null)
+        if (buildingSpec.PowerInput != null)
         {
-            mechanicalNodeSpecification._powerInput = (int) buildingSpecification.PowerInput;
+            mechanicalNodeSpecification._powerInput = (int) buildingSpec.PowerInput;
         }
     }
 
-    private static void ChangeManufactoryRecipes(ManufactorySpec manufactorySpec, BuildingSpecification buildingSpecification)
+    private static void ChangeManufactoryRecipes(ManufactorySpec manufactorySpec, BuildingSpec buildingSpec)
     {
-        manufactorySpec._productionRecipeIds = buildingSpecification.RecipeIds.Distinct().ToList();
+        manufactorySpec._productionRecipeIds = buildingSpec.RecipeIds.Distinct().ToList();
     }
 
-    private static void ChangeBuildingProperties(Building building, BuildingSpecification buildingSpecification)
+    private static void ChangeBuildingProperties(Timberborn.Buildings.BuildingSpec building, BuildingSpec buildingSpec)
     {
-        if (buildingSpecification.ScienceCost != null)
+        if (buildingSpec.ScienceCost != null)
         {
-            building._scienceCost = (int) buildingSpecification.ScienceCost;
+            building._scienceCost = (int) buildingSpec.ScienceCost;
         }
 
-        List<BuildingCost> reverseList = new(buildingSpecification.BuildingCosts);
+        List<BuildingCost> reverseList = new(buildingSpec.BuildingCosts);
         reverseList.Reverse();
 
-        building._buildingCost = reverseList.Select(x => new GoodAmountSpecification(x.GoodId, x.Amount)).Distinct(new GoodAmountSpecificationComparer()).ToArray();
+        building._buildingCost = reverseList.Select(x => new GoodAmountSpec
+        {
+            _goodId = x.GoodId,
+            _amount = x.Amount,
+        }).Distinct(new GoodAmountSpecComparer()).ToArray();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.BuildingSpecificationSystem/BuildingCostObjectDeserializer.cs b/Src/TimberApi.BuildingSpecificationSystem/BuildingCostObjectDeserializer.cs
deleted file mode 100644
index 0be02adc..00000000
--- a/Src/TimberApi.BuildingSpecificationSystem/BuildingCostObjectDeserializer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using Timberborn.Persistence;
-
-namespace TimberApi.BuildingSpecificationSystem;
-
-internal class BuildingCostObjectDeserializer : IObjectSerializer<BuildingCost>
-{
-    private readonly PropertyKey<int> _amountKey = new("Amount");
-    private readonly PropertyKey<string> _goodIdKey = new("GoodId");
-
-    /// <summary>
-    ///     This class only deserializes specification jsons, so this is not used
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="objectSaver"></param>
-    /// <exception cref="NotSupportedException"></exception>
-    public void Serialize(BuildingCost value, IObjectSaver objectSaver)
-    {
-        throw new NotSupportedException();
-    }
-
-    public Obsoletable<BuildingCost> Deserialize(IObjectLoader objectLoader)
-    {
-        return new BuildingCost(objectLoader.Get(_goodIdKey), objectLoader.Get(_amountKey));
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpec.cs b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpec.cs
new file mode 100644
index 00000000..ae43f973
--- /dev/null
+++ b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpec.cs
@@ -0,0 +1,29 @@
+using System.Collections.Immutable;
+using Timberborn.BlueprintSystem;
+
+namespace TimberApi.BuildingSpecificationSystem;
+
+/// <summary>
+///     Represents the various settings that can be changed
+///     on Buildings using TimberAPI
+/// </summary>
+internal record BuildingSpec() : ComponentSpec
+{
+    [Serialize]
+    public string BuildingId { get; init; }
+
+    [Serialize(true)]
+    public int? PowerInput { get; init; }
+
+    [Serialize(true)]
+    public int? PowerOutput { get; init; }
+
+    [Serialize(true)]
+    public ImmutableArray<string> RecipeIds { get; init; }
+
+    [Serialize(true)]
+    public int? ScienceCost { get; init; }
+
+    [Serialize(true)]
+    public ImmutableArray<BuildingCost> BuildingCosts { get; init; }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecification.cs b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecification.cs
deleted file mode 100644
index 88645206..00000000
--- a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecification.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.Immutable;
-
-namespace TimberApi.BuildingSpecificationSystem;
-
-/// <summary>
-///     Represents the various settings that can be changed
-///     on Buildings using TimberAPI
-/// </summary>
-internal class BuildingSpecification(
-    string buildingId,
-    int? scienceCost,
-    int? powerInput,
-    int? powerOutput,
-    IEnumerable<string> recipeIds,
-    IEnumerable<BuildingCost> buildingCosts)
-{
-    public string BuildingId = buildingId;
-
-    public int? PowerInput = powerInput;
-
-    public int? PowerOutput = powerOutput;
-
-    public ImmutableArray<string> RecipeIds = recipeIds.ToImmutableArray();
-
-    public int? ScienceCost { get; set; } = scienceCost;
-
-    public ImmutableArray<BuildingCost> BuildingCosts { get; set; } = buildingCosts.ToImmutableArray();
-}
\ No newline at end of file
diff --git a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationConfigurator.cs b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationConfigurator.cs
index b87057eb..e25c9cbb 100644
--- a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationConfigurator.cs
+++ b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationConfigurator.cs
@@ -5,14 +5,12 @@
 namespace TimberApi.BuildingSpecificationSystem;
 
 [Context("Game")]
-internal class BuildingSpecificationConfigurator : IConfigurator
+internal class BuildingSpecificationConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<BuildingSpecificationService>().AsSingleton();
-        containerDefinition.Bind<BuildingSpecificationObjectDeserializer>().AsSingleton();
-        containerDefinition.Bind<BuildingCostObjectDeserializer>().AsSingleton();
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<BuildingSpecificationGenerator>().AsSingleton();
-        containerDefinition.Bind<BuildingChangeApplier>().AsSingleton();
+        Bind<BuildingSpecificationService>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<BuildingSpecificationGenerator>().AsSingleton();
+        Bind<BuildingChangeApplier>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationGenerator.cs b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationGenerator.cs
index 1746c44f..55d7ae24 100644
--- a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationGenerator.cs
+++ b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationGenerator.cs
@@ -3,26 +3,31 @@
 using System.Linq;
 using Newtonsoft.Json;
 using TimberApi.SpecificationSystem;
+using Timberborn.BlueprintSystem;
 using Timberborn.Buildings;
+using Timberborn.CommandLine;
+using Timberborn.GameStartup;
+using Timberborn.MainMenuModdingUI;
 using Timberborn.MechanicalSystem;
 using Timberborn.PrefabSystem;
 using Timberborn.Workshops;
+using Timberborn.Modding;
 
 namespace TimberApi.BuildingSpecificationSystem;
 
 internal class BuildingSpecificationGenerator(
     PrefabService prefabService
-) : ISpecificationGenerator
+) : ISpecGenerator
 {
     private const string SpecificationName = "BuildingSpecification";
 
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
-        var buildings = prefabService.GetAll<Building>();
+        var buildings = prefabService.GetAll<Timberborn.Buildings.BuildingSpec>();
 
         foreach (var building in buildings)
         {
-            var buildingId = building.GetComponentFast<Prefab>().PrefabName;
+            var buildingId = building.GetComponentFast<PrefabSpec>().PrefabName;
 
             IEnumerable<string> recipeIds = Array.Empty<string>();
 
@@ -37,14 +42,13 @@ public IEnumerable<GeneratedSpecification> Generate()
                 recipeIds = manufactorySpec.ProductionRecipeIds;
             }
 
-            if (building.TryGetComponentFast(out MechanicalNodeSpecification mechanicalNodeSpecification))
+            if (building.TryGetComponentFast(out MechanicalNodeSpec mechanicalNodeSpecification))
             {
                 powerInput = mechanicalNodeSpecification.PowerInput;
                 powerOutput = mechanicalNodeSpecification.PowerOutput;
             }
 
-            var buildingSpec = new BuildingSpecification(buildingId, scienceCost, powerInput, powerOutput, recipeIds,
-                buildingCosts);
+            var buildingSpec = new BuildingSpec(buildingId, scienceCost, powerInput, powerOutput, recipeIds, buildingCosts);
 
 
             var jsonSerializerSettings = new JsonSerializerSettings
@@ -52,7 +56,7 @@ public IEnumerable<GeneratedSpecification> Generate()
             var buildingSpecificationJson =
                 JsonConvert.SerializeObject(buildingSpec, Formatting.Indented, jsonSerializerSettings);
             
-            yield return new GeneratedSpecification("Buildings", $"{SpecificationName}.{building.name}", buildingSpecificationJson);
+            yield return new GeneratedSpec("Buildings", $"{SpecificationName}.{building.name}", buildingSpecificationJson, true);
         }
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationObjectDeserializer.cs b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationObjectDeserializer.cs
deleted file mode 100644
index 2638f745..00000000
--- a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationObjectDeserializer.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using TimberApi.Extensions;
-using Timberborn.Persistence;
-
-namespace TimberApi.BuildingSpecificationSystem;
-
-internal class BuildingSpecificationObjectDeserializer(BuildingCostObjectDeserializer buildingCostObjectDeserializer)
-    : IObjectSerializer<BuildingSpecification>
-{
-    private readonly ListKey<BuildingCost> _buildingCosts = new("BuildingCosts");
-    private readonly PropertyKey<string> _buildingIdKey = new("BuildingId");
-
-    private readonly PropertyKey<int> _powerInputKey = new("PowerInput");
-
-    private readonly PropertyKey<int> _powerOutputKey = new("PowerOutput");
-
-    private readonly ListKey<string> _recipeIdsKey = new("RecipeIds");
-
-    private readonly PropertyKey<int> _scienceCostKey = new("ScienceCost");
-
-    /// <summary>
-    ///     This class only deserializes specification jsons, so this is not used
-    /// </summary>
-    /// <param name="value"></param>
-    /// <param name="objectSaver"></param>
-    public void Serialize(BuildingSpecification value, IObjectSaver objectSaver)
-    {
-        throw new NotSupportedException();
-    }
-
-    public Obsoletable<BuildingSpecification> Deserialize(IObjectLoader objectLoader)
-    {
-        var buildingId = objectLoader.Get(_buildingIdKey);
-        var scienceCost = objectLoader.GetValueOrNullable(_scienceCostKey);
-        var powerInput = objectLoader.GetValueOrNullable(_powerInputKey);
-        var powerOutput = objectLoader.GetValueOrNullable(_powerOutputKey);
-        var recipeIds = objectLoader.GetValueOrEmpty(_recipeIdsKey);
-        var buildingCosts = objectLoader.GetValueOrEmpty(_buildingCosts, buildingCostObjectDeserializer);
-
-        return new BuildingSpecification(buildingId, scienceCost, powerInput, powerOutput, recipeIds, buildingCosts);
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationService.cs b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationService.cs
index 989444ef..55112116 100644
--- a/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationService.cs
+++ b/Src/TimberApi.BuildingSpecificationSystem/BuildingSpecificationService.cs
@@ -1,6 +1,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using TimberApi.SingletonSystem;
+using Timberborn.BlueprintSystem;
 using Timberborn.Buildings;
 using Timberborn.Persistence;
 using Timberborn.PrefabSystem;
@@ -11,23 +12,22 @@ namespace TimberApi.BuildingSpecificationSystem;
 ///     This service fetches BuildingSpecifications
 /// </summary>
 internal class BuildingSpecificationService(
-    ISpecificationService specificationService,
-    BuildingSpecificationObjectDeserializer buildingRecipeSpecificationObjectObjectDeserializer)
+    ISpecService specificationService)
     : IEarlyLoadableSingleton
 {
-    private ImmutableArray<BuildingSpecification> _buildingSpecifications;
+    private ImmutableArray<BuildingSpec> _buildingSpecifications;
 
     /// <summary>
     ///     Fetches all BuildingSpecifications on load and stores them
     /// </summary>
     public void EarlyLoad()
     {
-        _buildingSpecifications = specificationService.GetSpecifications(buildingRecipeSpecificationObjectObjectDeserializer).ToImmutableArray();
+        _buildingSpecifications = specificationService.GetSpecs<BuildingSpec>().ToImmutableArray();
     }
 
-    public BuildingSpecification? GetBuildingSpecificationByBuilding(Building building)
+    public BuildingSpec? GetBuildingSpecificationByBuilding(Timberborn.Buildings.BuildingSpec building)
     {
-        var prefab = building.GetComponentFast<Prefab>();
+        var prefab = building.GetComponentFast<PrefabSpec>();
         var prefabName = prefab.PrefabName.ToLower();
 
         return _buildingSpecifications.FirstOrDefault(x => x?.BuildingId.ToLower() == prefabName);
diff --git a/Src/TimberApi.BuildingSpecificationSystem/GoodAmountSpecificationComparer.cs b/Src/TimberApi.BuildingSpecificationSystem/GoodAmountSpecificationComparer.cs
index 660c8d76..6b53a8cc 100644
--- a/Src/TimberApi.BuildingSpecificationSystem/GoodAmountSpecificationComparer.cs
+++ b/Src/TimberApi.BuildingSpecificationSystem/GoodAmountSpecificationComparer.cs
@@ -3,16 +3,16 @@
 
 namespace TimberApi.BuildingSpecificationSystem;
 
-internal class GoodAmountSpecificationComparer : IEqualityComparer<GoodAmountSpecification>
+internal class GoodAmountSpecComparer : IEqualityComparer<GoodAmountSpec>
 {
-    public bool Equals(GoodAmountSpecification gas1, GoodAmountSpecification gas2)
+    public bool Equals(GoodAmountSpec gas1, GoodAmountSpec gas2)
     {
-        if (gas1.Equals(default(GoodAmountSpecification)) && gas2.Equals(default(GoodAmountSpecification)))
+        if (gas1.Equals(default(GoodAmountSpec)) && gas2.Equals(default(GoodAmountSpec)))
         {
             return true;
         }
 
-        if (gas1.Equals(default(GoodAmountSpecification)) || gas2.Equals(default(GoodAmountSpecification)))
+        if (gas1.Equals(default(GoodAmountSpec)) || gas2.Equals(default(GoodAmountSpec)))
         {
             return false;
         }
@@ -20,7 +20,7 @@ public bool Equals(GoodAmountSpecification gas1, GoodAmountSpecification gas2)
         return gas1.GoodId == gas2.GoodId;
     }
 
-    public int GetHashCode(GoodAmountSpecification gas)
+    public int GetHashCode(GoodAmountSpec gas)
     {
         return gas.GoodId.GetHashCode();
     }
diff --git a/Src/TimberApi.BuildingSpecificationSystem/TimberApi.BuildingSpecificationSystem.csproj b/Src/TimberApi.BuildingSpecificationSystem/TimberApi.BuildingSpecificationSystem.csproj
index 1813ae90..578644c1 100644
--- a/Src/TimberApi.BuildingSpecificationSystem/TimberApi.BuildingSpecificationSystem.csproj
+++ b/Src/TimberApi.BuildingSpecificationSystem/TimberApi.BuildingSpecificationSystem.csproj
@@ -12,8 +12,8 @@
         <ProjectReference Include="..\TimberApi\TimberApi.csproj"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+    <ItemGroup >
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -21,6 +21,8 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -30,6 +32,6 @@
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
         <Message Text="### Copying files to plugins ###" Importance="high"/>
-        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\core"/>
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\version-0.7\core"/>
     </Target>
 </Project>
diff --git a/Src/TimberApi.Console/ModStarter.cs b/Src/TimberApi.Console/ModStarter.cs
deleted file mode 100644
index e9829a44..00000000
--- a/Src/TimberApi.Console/ModStarter.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace TimberApi.Console;
-
-public class ModStarter
-{
-    
-}
\ No newline at end of file
diff --git a/Src/TimberApi.EntityLinkerSystem/EntityLinkObjectSerializer.cs b/Src/TimberApi.EntityLinkerSystem/EntityLinkObjectSerializer.cs
index 10c1973c..a8686f75 100644
--- a/Src/TimberApi.EntityLinkerSystem/EntityLinkObjectSerializer.cs
+++ b/Src/TimberApi.EntityLinkerSystem/EntityLinkObjectSerializer.cs
@@ -6,26 +6,15 @@ namespace TimberApi.EntityLinkerSystem;
 ///     Defines how and instance of EntityLink should be serialized.
 ///     Used when an EntityLinker which contains EntityLinks is saved/loaded
 /// </summary>
-public class EntityLinkObjectSerializer : IObjectSerializer<EntityLink>
+public class EntityLinkObjectSerializer : IValueSerializer<EntityLink>
 {
     protected static readonly PropertyKey<EntityLinker> LinkerKey = new("Linker");
     
     protected static readonly PropertyKey<EntityLinker> LinkeeKey = new("Linkee");
-
-    public virtual Obsoletable<EntityLink> Deserialize(IObjectLoader objectLoader)
-    {
-        EntityLinker? linker = objectLoader.Has(LinkerKey) && objectLoader.GetObsoletable(LinkerKey, out EntityLinker value)
-            ? objectLoader.Get(LinkerKey)
-            : new EntityLinker();
-        EntityLinker? linkee = objectLoader.Has(LinkeeKey) && objectLoader.GetObsoletable(LinkeeKey, out EntityLinker value2)
-            ? objectLoader.Get(LinkeeKey)
-            : new EntityLinker();
-        var link = new EntityLink(linker, linkee);
-        return link;
-    }
-
-    public virtual void Serialize(EntityLink value, IObjectSaver objectSaver)
+    public void Serialize(EntityLink value, IValueSaver valueSaver)
     {
+        IObjectSaver objectSaver = valueSaver.AsObject();
+        
         if (value?.Linker != null)
         {
             objectSaver.Set(LinkerKey, value.Linker);
@@ -35,4 +24,16 @@ public virtual void Serialize(EntityLink value, IObjectSaver objectSaver)
             objectSaver.Set(LinkeeKey, value.Linkee);
         }
     }
+
+    public Obsoletable<EntityLink> Deserialize(IValueLoader valueLoader)
+    {
+        EntityLinker? linker = valueLoader.Has(LinkerKey) && valueLoader.GetObsoletable(LinkerKey, out EntityLinker value)
+            ? valueLoader.Get(LinkerKey)
+            : new EntityLinker();
+        EntityLinker? linkee = valueLoader.Has(LinkeeKey) && valueLoader.GetObsoletable(LinkeeKey, out EntityLinker value2)
+            ? valueLoader.Get(LinkeeKey)
+            : new EntityLinker();
+        var link = new EntityLink(linker, linkee);
+        return link;
+    }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.EntityLinkerSystem/EntityLinkerSystemConfigurator.cs b/Src/TimberApi.EntityLinkerSystem/EntityLinkerSystemConfigurator.cs
index d31dbb8c..eefbb044 100644
--- a/Src/TimberApi.EntityLinkerSystem/EntityLinkerSystemConfigurator.cs
+++ b/Src/TimberApi.EntityLinkerSystem/EntityLinkerSystemConfigurator.cs
@@ -5,19 +5,19 @@
 namespace TimberApi.EntityLinkerSystem;
 
 [Context("Game")]
-public class EntityLinkerSystemConfigurator : IConfigurator
+public class EntityLinkerSystemConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<EntityLinkObjectSerializer>().AsSingleton();
-        containerDefinition.Bind<PickObjectTool>().AsSingleton();
-        containerDefinition.MultiBind<TemplateModule>().ToProvider(ProvideTemplateModule).AsSingleton();
+        Bind<EntityLinkObjectSerializer>().AsSingleton();
+        Bind<PickObjectTool>().AsSingleton();
+        MultiBind<TemplateModule>().ToProvider(ProvideTemplateModule).AsSingleton();
     }
 
     private static TemplateModule ProvideTemplateModule()
     {
         var builder = new TemplateModule.Builder();
-        builder.AddDecorator<Building, EntityLinker>();
+        builder.AddDecorator<BuildingSpec, EntityLinker>();
         return builder.Build();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.EntityLinkerSystem/PickObjectTool.cs b/Src/TimberApi.EntityLinkerSystem/PickObjectTool.cs
index adbc5256..10b45f87 100644
--- a/Src/TimberApi.EntityLinkerSystem/PickObjectTool.cs
+++ b/Src/TimberApi.EntityLinkerSystem/PickObjectTool.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Timberborn.BaseComponentSystem;
-using Timberborn.CoreUI;
 using Timberborn.EntitySystem;
 using Timberborn.InputSystem;
 using Timberborn.SelectionSystem;
@@ -22,8 +21,6 @@ public class PickObjectTool : Tool, IInputProcessor
         
     private readonly Highlighter _highlighter;
         
-    private readonly Colors _colors;
-        
     private readonly EntityComponentRegistry _entityComponentRegistry;
         
     //private readonly CursorService _cursorService;
@@ -40,12 +37,11 @@ public class PickObjectTool : Tool, IInputProcessor
         
     private Action<GameObject> _callback = null!;
 
-    public PickObjectTool(InputService inputService, ToolManager toolManager, Highlighter highlighter, Colors colors, EntityComponentRegistry entityComponentRegistry, CursorService cursorService, SelectableObjectRaycaster selectableObjectRaycaster)
+    public PickObjectTool(InputService inputService, ToolManager toolManager, Highlighter highlighter, EntityComponentRegistry entityComponentRegistry, CursorService cursorService, SelectableObjectRaycaster selectableObjectRaycaster)
     {
         _inputService = inputService;
         _toolManager = toolManager;
         _highlighter = highlighter;
-        _colors = colors;
         _entityComponentRegistry = entityComponentRegistry;
         //_cursorService = cursorService;
         _selectableObjectRaycaster = selectableObjectRaycaster;
@@ -93,7 +89,7 @@ public bool ProcessInput()
         HighlightCandidates();
         if (_selectableObjectRaycaster.TryHitSelectableObject(out var hitObject) && _allCandidates.ContainsKey(hitObject.GameObjectFast))
         {
-            _highlighter.HighlightSecondary(hitObject, _colors.EntitySelection);
+            _highlighter.HighlightSecondary(hitObject, Color.blue);
             _warning = _validateCandidate(hitObject.GameObjectFast);
             if (_inputService is { MainMouseButtonDown: true, MouseOverUI: false })
             {
@@ -111,7 +107,7 @@ private void HighlightCandidates()
         _highlighter.UnhighlightAllSecondary();
         foreach (var allCandidate in _allCandidates)
         {
-            var color = _validateCandidate(allCandidate.Key) == "" ? _colors.BuildablePreview : _colors.UnbuildablePreview; _highlighter.HighlightSecondary(allCandidate.Value, color);
+            var color = _validateCandidate(allCandidate.Key) == "" ? Color.green : Color.red; _highlighter.HighlightSecondary(allCandidate.Value, color);
         }
     }
 
diff --git a/Src/TimberApi.EntityLinkerSystem/TimberApi.EntityLinkerSystem.csproj b/Src/TimberApi.EntityLinkerSystem/TimberApi.EntityLinkerSystem.csproj
index 1656e57d..e651d563 100644
--- a/Src/TimberApi.EntityLinkerSystem/TimberApi.EntityLinkerSystem.csproj
+++ b/Src/TimberApi.EntityLinkerSystem/TimberApi.EntityLinkerSystem.csproj
@@ -11,8 +11,8 @@
         <ProjectReference Include="..\TimberApi\TimberApi.csproj"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+    <ItemGroup >
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -20,6 +20,8 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -29,6 +31,6 @@
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
         <Message Text="### Copying files to plugins ###" Importance="high"/>
-        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\core"/>
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\version-0.7\core"/>
     </Target>
 </Project>
diff --git a/Src/TimberApi.SpecificationPatcherSystem/ISpecificationModifierResolver.cs b/Src/TimberApi.SpecificationPatcherSystem/ISpecificationModifierResolver.cs
new file mode 100644
index 00000000..c6c685e6
--- /dev/null
+++ b/Src/TimberApi.SpecificationPatcherSystem/ISpecificationModifierResolver.cs
@@ -0,0 +1,8 @@
+namespace TimberApi.SpecificationPatcherSystem;
+
+public interface ISpecificationModifierResolver
+{
+    public string Modifier { get; }
+    
+    public bool Resolve(string argument);
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationPatcherSystem/ModStarter.cs b/Src/TimberApi.SpecificationPatcherSystem/ModStarter.cs
new file mode 100644
index 00000000..a79ec7cb
--- /dev/null
+++ b/Src/TimberApi.SpecificationPatcherSystem/ModStarter.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HarmonyLib;
+using Newtonsoft.Json.Linq;
+using TimberApi.HarmonySystem;
+using Timberborn.ModManagerScene;
+using Timberborn.SerializationSystem;
+using Timberborn.ToolSystem;
+using UnityEngine;
+
+namespace TimberApi.SpecificationPatcherSystem;
+
+public class ModStarter : IModStarter
+{
+    public void StartMod(IModEnvironment modEnvironment)
+    {
+        var harmony = new Harmony("TimberApi.SpecificationModifierSystem");
+        
+        harmony.Patch(
+            harmony.GetMethodInfo<JsonMerger>(nameof(JsonMerger.ProcessCustomTokens)),
+            harmony.GetHarmonyMethod<SpecificationModifierApplier>(nameof(SpecificationModifierApplier.ProcessCustomTokens))
+        );
+
+
+        // harmony.Patch(
+        //     harmony.GetMethodInfo<JsonMerger>(nameof(JsonMerger.ProcessCustomTokens)),
+        //     harmony.GetHarmonyMethod<ModStarter>(nameof(Test)),
+        // harmony.GetHarmonyMethod<ModStarter>(nameof(Test2))
+        // );
+    }
+    
+    public static readonly List<JsonMerger.ArrayModification> ArrayModifications = [];
+    
+    
+    public static void Test(JToken parentToken, string keyword, ICollection<JsonMerger.ArrayModification> arrayModifications)
+    {
+        foreach (var modifyingProperty in parentToken.Children<JProperty>().ToList())
+        {
+            if (modifyingProperty.Name.Contains("@"))
+            {
+                Debug.LogWarning("I HAVE A @");
+            }
+            
+            if (modifyingProperty.Name.Contains("@true"))
+            {
+                Debug.LogWarning(modifyingProperty.Name);
+                JsonMerger.CreateArrayModification(modifyingProperty, "@true", ArrayModifications);
+            }
+            
+            if (modifyingProperty.Name.Contains("@false"))
+            {
+                modifyingProperty.Remove();
+            }
+        }
+    
+        JObject tester = (JObject)parentToken;
+        
+        foreach (JsonMerger.ArrayModification arrayAppender in ArrayModifications)
+        {
+            JToken existingArray = tester.SelectToken(arrayAppender.Path);
+            if (existingArray != null)
+            {
+                Debug.LogWarning("HIER KOM IK NIET");
+                JsonMerger.AddToExistingArrayProperty(existingArray, arrayAppender.JProperty);
+            }
+            else
+                JsonMerger.AddNewArrayProperty(tester, arrayAppender);
+        }
+        
+        ArrayModifications.Clear();
+    }
+    
+    public static void Test2(JToken parentToken, string keyword,
+        ICollection<JsonMerger.ArrayModification> arrayModifications)
+    {
+        foreach (var modifyingProperty in parentToken.Children<JProperty>().ToList())
+        {
+            if (modifyingProperty.Name.Contains("@false"))
+            {
+                Debug.LogWarning("IK BEN NIET MEER IN DE ARRAY");
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationPatcherSystem/PropertyModifier.cs b/Src/TimberApi.SpecificationPatcherSystem/PropertyModifier.cs
new file mode 100644
index 00000000..19f7bc70
--- /dev/null
+++ b/Src/TimberApi.SpecificationPatcherSystem/PropertyModifier.cs
@@ -0,0 +1,8 @@
+namespace TimberApi.SpecificationPatcherSystem;
+
+internal class PropertyModifier(string modifier, string argument)
+{
+    public string Modifier { get; } = modifier;
+
+    public string Argument { get; } = argument;
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationPatcherSystem/SpecificationModifierApplier.cs b/Src/TimberApi.SpecificationPatcherSystem/SpecificationModifierApplier.cs
new file mode 100644
index 00000000..c960a3e2
--- /dev/null
+++ b/Src/TimberApi.SpecificationPatcherSystem/SpecificationModifierApplier.cs
@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+using Timberborn.SerializationSystem;
+using Timberborn.TimbermeshMaterials;
+using UnityEngine.UIElements;
+
+namespace TimberApi.SpecificationPatcherSystem;
+
+internal class SpecificationModifierApplier
+{
+    private static IDictionary<string, ISpecificationModifierResolver> _specificationModifierResolvers = null!;
+    
+    public static readonly List<JsonMerger.ArrayModification> ArrayModifications = [];
+
+    public SpecificationModifierApplier(IEnumerable<ISpecificationModifierResolver> specificationModifierResolvers)
+    {
+        _specificationModifierResolvers = specificationModifierResolvers.ToDictionary(resolver => resolver.Modifier.ToCamelCase());
+    }
+    
+    public static void ProcessCustomTokens(JToken parentToken, string keyword, ICollection<JsonMerger.ArrayModification> arrayModifications)
+    {
+        if (keyword == JsonMerger.AppendKeyword)
+        {
+            return;
+        }
+        
+        // Debug.LogWarning(parentToken);
+        
+        foreach (var modifyingProperty in parentToken.Children<JProperty>().Where(modifyingProperty => modifyingProperty.Name.Contains("@")).ToList())
+        {
+            // Debug.LogError(modifyingProperty.Name);
+
+            var propertyModifiers = ExtractPropertyModifiers(modifyingProperty);
+
+            ProcessPropertyModifiers(modifyingProperty, propertyModifiers);
+            
+            modifyingProperty.Remove();
+        }
+        
+
+        foreach (var arrayAppender in ArrayModifications)
+        {
+            var existingProperty = ((JObject)parentToken).SelectToken(arrayAppender.Path);
+            
+            if (existingProperty == null)
+            {
+                JsonMerger.AddNewArrayProperty((JObject)parentToken, arrayAppender);
+            }
+            else
+            {
+                if (existingProperty.Type == JTokenType.Array)
+                {
+                    JsonMerger.AddToExistingArrayProperty(existingProperty, arrayAppender.JProperty);
+                }
+                else
+                {
+                    ((JValue)existingProperty).Value = (string)arrayAppender.JProperty.Value!;
+                }
+            }
+        }
+        
+        // Debug.LogWarning(parentToken);
+
+        
+        ArrayModifications.Clear();
+    }
+
+    private static void ProcessPropertyModifiers(JProperty modifyingProperty,
+        IEnumerable<PropertyModifier> propertyModifiers)
+    {
+        var propertyKeywords = new List<string>();
+        
+        foreach (var propertyModifier in propertyModifiers)
+        {
+            propertyKeywords.Add($"@{propertyModifier.Modifier}({propertyModifier.Argument})");
+            
+            if (!_specificationModifierResolvers.ContainsKey(propertyModifier.Modifier))
+            {
+                throw new Exception($"Modifier (@{propertyModifier.Modifier}) does not have a resolver.");
+            }
+            
+            if (! _specificationModifierResolvers[propertyModifier.Modifier].Resolve(propertyModifier.Argument))
+            {
+                return;
+            }
+        }
+        
+        CreateArrayModification(modifyingProperty, propertyKeywords, ArrayModifications);
+    }
+
+    private static void CreateArrayModification(
+        JProperty modifyingProperty,
+        IReadOnlyCollection<string> keywords,
+        ICollection<JsonMerger.ArrayModification> arrayModifications)
+    {
+        var path = ReplaceMany(modifyingProperty.Path, keywords, string.Empty, StringComparison.OrdinalIgnoreCase);
+        var parentPath = modifyingProperty.Parent == null ? string.Empty : modifyingProperty.Parent.Path;
+        var content = modifyingProperty.Value;
+        modifyingProperty.Value = null!;
+        var jProperty = new JProperty(ReplaceMany(modifyingProperty.Name, keywords, string.Empty, StringComparison.OrdinalIgnoreCase), content);
+        
+        arrayModifications.Add(new JsonMerger.ArrayModification(jProperty, path, parentPath));
+    }
+
+    private static IEnumerable<PropertyModifier> ExtractPropertyModifiers(JProperty property)
+    {
+        foreach (var modifierString in property.Name.Split("@").Skip(1))
+        {
+            if (! modifierString.EndsWith(")") || ! modifierString.Contains("("))
+            {
+                throw new Exception($"Modifier pattern invalid, example pattern \"@example(argument)\". Current: @{modifierString}");
+            }
+
+            var argumentStartIndex = modifierString.IndexOf('(');
+
+            var modifier = modifierString[..argumentStartIndex];
+            
+            var argument = modifierString.Substring(argumentStartIndex + 1, modifierString.Length - argumentStartIndex - 2);
+            
+            yield return new PropertyModifier(modifier, argument);
+        }
+    }
+    
+    private static void AddToExistingProperty(JToken existingProperty, JProperty propertyModification)
+    {
+        if (propertyModification.Type == JTokenType.Array)
+        {
+            JsonMerger.AddToExistingArrayProperty(existingProperty, propertyModification);
+        }
+        
+        ((JProperty)existingProperty).Value = "POPKEK";
+    }
+    
+    private static string ReplaceMany(string value, IEnumerable<string> oldValues, string newValue, StringComparison comparisonType)
+    {
+        return oldValues.Aggregate(value, (current, oldValue) => current.Replace(oldValue, newValue, comparisonType));
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationPatcherSystem/SpecificationModifierConfigurator.cs b/Src/TimberApi.SpecificationPatcherSystem/SpecificationModifierConfigurator.cs
new file mode 100644
index 00000000..2df36a05
--- /dev/null
+++ b/Src/TimberApi.SpecificationPatcherSystem/SpecificationModifierConfigurator.cs
@@ -0,0 +1,16 @@
+using Bindito.Core;
+using TimberApi.SpecificationPatcherSystem.SpecificationModifierResolvers;
+
+namespace TimberApi.SpecificationPatcherSystem;
+
+[Context("MainMenu")]
+[Context("MapEditor")]
+[Context("Game")]
+public class SpecificationModifierConfigurator : Configurator
+{
+    public void Configure(IContainerDefinition containerDefinition)
+    {
+        containerDefinition.Bind<SpecificationModifierApplier>().AsSingleton();
+        containerDefinition.MultiBind<ISpecificationModifierResolver>().To<ModSpecificationModifierResolver>().AsSingleton();
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationPatcherSystem/SpecificationModifierResolvers/ModSpecificationModifierResolver.cs b/Src/TimberApi.SpecificationPatcherSystem/SpecificationModifierResolvers/ModSpecificationModifierResolver.cs
new file mode 100644
index 00000000..fcea4fb4
--- /dev/null
+++ b/Src/TimberApi.SpecificationPatcherSystem/SpecificationModifierResolvers/ModSpecificationModifierResolver.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Linq;
+using Timberborn.Modding;
+
+namespace TimberApi.SpecificationPatcherSystem.SpecificationModifierResolvers;
+
+public class ModSpecificationModifierResolver(ModRepository modRepository) : ISpecificationModifierResolver
+{
+    public string Modifier => "mod";
+    
+    public bool Resolve(string argument)
+    {
+        return modRepository.EnabledMods.Any(mod => string.Equals(mod.Manifest.Id, argument, StringComparison.CurrentCultureIgnoreCase));
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationPatcherSystem/Test.cs b/Src/TimberApi.SpecificationPatcherSystem/Test.cs
new file mode 100644
index 00000000..b109b7e1
--- /dev/null
+++ b/Src/TimberApi.SpecificationPatcherSystem/Test.cs
@@ -0,0 +1,11 @@
+using Timberborn.SerializationSystem;
+
+namespace TimberApi.SpecificationPatcherSystem;
+
+public class Test
+{
+    public void Tester()
+    {
+        // JsonMerger
+    }
+}
\ No newline at end of file
diff --git a/Debug/AutoModStarter/AutoModStarter.csproj b/Src/TimberApi.SpecificationPatcherSystem/TimberApi.SpecificationPatcherSystem.csproj
similarity index 60%
rename from Debug/AutoModStarter/AutoModStarter.csproj
rename to Src/TimberApi.SpecificationPatcherSystem/TimberApi.SpecificationPatcherSystem.csproj
index 6578cf32..6a42189f 100644
--- a/Debug/AutoModStarter/AutoModStarter.csproj
+++ b/Src/TimberApi.SpecificationPatcherSystem/TimberApi.SpecificationPatcherSystem.csproj
@@ -3,20 +3,17 @@
         <TargetFramework>netstandard2.1</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <Authors>TheBloodEyes</Authors>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Lib.Harmony" Version="2.3.3"/>
-        <PackageReference Include="MonoMod.RuntimeDetour" Version="21.12.13.1"/>
-        <PackageReference Include="BepInEx.Analyzers" Version="1.0.7" PrivateAssets="all"/>
-        <PackageReference Include="BepInEx.Core" Version="5.4.17"/>
-        <PackageReference Include="BepInEx.PluginInfoProps" Version="1.1.0"/>
-        <PackageReference Include="BepInEx.BaseLib" Version="5.4.19"/>
-        <PackageReference Include="UnityEngine.Modules" Version="6000.0.4"/>
+        <ProjectReference Include="..\TimberApi.SpecificationSystem\TimberApi.SpecificationSystem.csproj" />
+        <ProjectReference Include="..\TimberApi\TimberApi.csproj"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1"/>
+    <ItemGroup >
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -24,14 +21,21 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Documents\Mods\TimberAPI\core\" />
     </ItemGroup>
 
     <PropertyGroup>
         <CopyDllToPath>false</CopyDllToPath>
+        <ModPath>Documents/Mods</ModPath>
     </PropertyGroup>
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
         <Message Text="### Copying files to plugins ###" Importance="high"/>
-        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(SolutionDir)\Timberborn\BepInEx\plugins\$(ProjectName)"/>
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\version-0.7\core"/><Copy SourceFiles="$(TargetDir)$(TargetName).pdb" DestinationFolder="$(ModPath)\$(SolutionName)\version-0.7\core"/>
     </Target>
 </Project>
diff --git a/Src/TimberApi.SpecificationSystem/BlueprintExtensions.cs b/Src/TimberApi.SpecificationSystem/BlueprintExtensions.cs
new file mode 100644
index 00000000..870c70f1
--- /dev/null
+++ b/Src/TimberApi.SpecificationSystem/BlueprintExtensions.cs
@@ -0,0 +1,30 @@
+using Timberborn.BlueprintSystem;
+using UnityEngine;
+
+namespace TimberApi.SpecificationSystem;
+
+internal class BlueprintExtensionHelper
+{
+    public static AdvancedDeserializer AdvancedDeserializer;
+
+    public BlueprintExtensionHelper(AdvancedDeserializer advancedDeserializer)
+    {
+        AdvancedDeserializer = advancedDeserializer;
+    }
+}
+
+public static class BlueprintExtensions
+{
+    public static T GetSpecOrDefault<T>(this ComponentSpec componentSpec) where T : ComponentSpec, new()
+    {
+        var result = componentSpec.GetSpec<T>();
+
+        if (result != null)
+        {
+            return result;
+        }
+        
+        return new T();
+    }
+    
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/BootstrapperConfigurator.cs b/Src/TimberApi.SpecificationSystem/BootstrapperConfigurator.cs
index 87033b36..d5e279c4 100644
--- a/Src/TimberApi.SpecificationSystem/BootstrapperConfigurator.cs
+++ b/Src/TimberApi.SpecificationSystem/BootstrapperConfigurator.cs
@@ -3,16 +3,12 @@
 
 namespace TimberApi.SpecificationSystem;
 
-internal class BootstrapperConfigurator : IConfigurator
+[Context("Bootstrapper")]
+internal class BootstrapperConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<IAssetProvider>().To<GeneratedSpecificationAssetProvider>().AsSingleton();
-        containerDefinition.Bind<GeneratedSpecificationAssetRepository>().AsSingleton();
-    }
-
-    public static void Patch(IContainerDefinition containerDefinition)
-    {
-        containerDefinition.Install(new BootstrapperConfigurator());
+        MultiBind<IAssetProvider>().To<GeneratedSpecAssetProvider>().AsSingleton().AsExported();
+        Bind<GeneratedSpecAssetRepository>().AsSingleton().AsExported();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/EarlyLoadConfigurator.cs b/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/EarlyLoadConfigurator.cs
index c64db3d0..e2f1d82b 100644
--- a/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/EarlyLoadConfigurator.cs
+++ b/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/EarlyLoadConfigurator.cs
@@ -2,20 +2,20 @@
 
 namespace TimberApi.SpecificationSystem.EarlyPrefabCollectionPatches;
 
-[Context("MapEditor")]
-public class EarlyLoadConfigurator : IConfigurator
-{
-    public void Configure(IContainerDefinition containerDefinition)
-    {
-        containerDefinition.Bind<MapEditorEarlyLoadPrefabCollection>().AsSingleton();
-    }
-}
-
-[Context("Game")]
-public class EarlyLoadGameConfigurator : IConfigurator
-{
-    public void Configure(IContainerDefinition containerDefinition)
-    {
-        containerDefinition.Bind<GameEarlyLoadPrefabCollection>().AsSingleton();
-    }
-}
\ No newline at end of file
+// [Context("MapEditor")]
+// public class EarlyLoadConfigurator : Configurator
+// {
+//     protected override void Configure()
+//     {
+//         Bind<MapEditorEarlyLoadPrefabCollection>().AsSingleton();
+//     }
+// }
+//
+// [Context("Game")]
+// public class EarlyLoadGameConfigurator : Configurator
+// {
+//     protected override void Configure()
+//     {
+//         Bind<GameEarlyLoadPrefabCollection>().AsSingleton();
+//     }
+// }
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/EarlyLoadPatcher.cs b/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/EarlyLoadPatcher.cs
index 6469c8b7..fcedd875 100644
--- a/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/EarlyLoadPatcher.cs
+++ b/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/EarlyLoadPatcher.cs
@@ -1,5 +1,7 @@
 using HarmonyLib;
+using TimberApi.DependencyContainerSystem;
 using TimberApi.HarmonySystem;
+using Timberborn.BlueprintSystem;
 using Timberborn.FactionSystem;
 using Timberborn.GameFactionSystem;
 using Timberborn.GameScene;
@@ -15,29 +17,43 @@ public static void Patch(Harmony harmony)
     {
         harmony.Patch(
             harmony.GetMethodInfo<PrefabGroupService>(nameof(PrefabGroupService.Load)),
-            harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(BlockingLoadableSingletonLoad))
-        );
-
-        harmony.Patch(
-            harmony.GetMethodInfo<FactionService>(nameof(FactionService.Load)),
-            harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(BlockingLoadableSingletonLoad))
-        );
-
-        harmony.Patch(
-            harmony.GetMethodInfo<GameSceneWorldSaveSupplier>(nameof(GameSceneWorldSaveSupplier.Load)),
-            harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(BlockingLoadableSingletonLoad))
-        );
-
-        harmony.Patch(
-            harmony.GetMethodInfo<FactionSpecificationService>(nameof(FactionSpecificationService.Load)),
-            harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(BlockingLoadableSingletonLoad))
+            postfix: harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(FixyPixy))
         );
+        
+        
+        // harmony.Patch(
+        //     harmony.GetMethodInfo<PrefabGroupService>(nameof(PrefabGroupService.Load)),
+        //     harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(BlockingLoadableSingletonLoad))
+        // );
+        //
+        // harmony.Patch(
+        //     harmony.GetMethodInfo<FactionService>(nameof(FactionService.Load)),
+        //     harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(BlockingLoadableSingletonLoad))
+        // );
+        //
+        // harmony.Patch(
+        //     harmony.GetMethodInfo<GameSceneSerializedWorldSupplier>(nameof(GameSceneSerializedWorldSupplier.Load)),
+        //     harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(BlockingLoadableSingletonLoad))
+        // );
+        //
+        // harmony.Patch(
+        //     harmony.GetMethodInfo<FactionSpecService>(nameof(FactionSpecService.Load)),
+        //     harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(BlockingLoadableSingletonLoad))
+        // );
+        //
+        // harmony.Patch(
+        //     harmony.GetMethodInfo<SpecService>(nameof(SpecService.Load)),
+        //     harmony.GetHarmonyMethod<EarlyLoadPatcher>(nameof(BlockingLoadableSingletonLoad))
+        // );
+    }
+    
+    public static void FixyPixy()
+    {
+        DependencyContainer.GetInstance<GeneratedSpecLoader>().RegenerateSpecBlueprints();
     }
 
     public static bool BlockingLoadableSingletonLoad()
     {
-        if (SceneManager.CurrentScene == Scene.MainMenu) return true;
-
         return !BlockLoading;
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/GameEarlyLoadPrefabCollection.cs b/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/GameEarlyLoadPrefabCollection.cs
index bc2c89bf..ea0d7b68 100644
--- a/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/GameEarlyLoadPrefabCollection.cs
+++ b/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/GameEarlyLoadPrefabCollection.cs
@@ -1,8 +1,9 @@
 using TimberApi.SingletonSystem;
+using Timberborn.BlueprintSystem;
 using Timberborn.FactionSystem;
 using Timberborn.GameFactionSystem;
 using Timberborn.GameScene;
-using Timberborn.PrefabGroupSystem;
+using Timberborn.TemplateCollectionSystem;
 using Timberborn.WorldPersistence;
 
 namespace TimberApi.SpecificationSystem.EarlyPrefabCollectionPatches;
@@ -14,20 +15,24 @@ namespace TimberApi.SpecificationSystem.EarlyPrefabCollectionPatches;
  */
 public class GameEarlyLoadPrefabCollection(
     FactionService factionService,
-    IWorldSaveSupplier worldSaveSupplier,
-    PrefabGroupService prefabGroupService,
-    FactionSpecificationService factionSpecificationService)
+    ISerializedWorldSupplier worldEntitiesLoader,
+    TemplateCollectionService templateCollectionService,
+    FactionSpecService factionSpecificationService,
+    ISpecService specService)
     : ITimberApiLoadableSingleton
 {
     public void Load()
     {
         EarlyLoadPatcher.BlockLoading = false;
-
-        ((GameSceneWorldSaveSupplier)worldSaveSupplier).Load();
+        
+        ((GameSceneSerializedWorldSupplier)worldEntitiesLoader).Load();
+        
+        ((SpecService)specService).Load();
         factionSpecificationService.Load();
         factionService.Load();
-        prefabGroupService.Load();
-
+         
+        templateCollectionService.Load();
+        
         EarlyLoadPatcher.BlockLoading = true;
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/MapEditorEarlyLoadPrefabCollection.cs b/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/MapEditorEarlyLoadPrefabCollection.cs
index 86910f44..e3f9ec9b 100644
--- a/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/MapEditorEarlyLoadPrefabCollection.cs
+++ b/Src/TimberApi.SpecificationSystem/EarlyPrefabCollectionPatches/MapEditorEarlyLoadPrefabCollection.cs
@@ -1,5 +1,7 @@
 using TimberApi.SingletonSystem;
+using Timberborn.BlueprintSystem;
 using Timberborn.PrefabGroupSystem;
+using UnityEngine;
 
 namespace TimberApi.SpecificationSystem.EarlyPrefabCollectionPatches;
 
@@ -8,12 +10,13 @@ namespace TimberApi.SpecificationSystem.EarlyPrefabCollectionPatches;
  * This requires the faction, so we need to load it as early as possible.
  * By doing this code that requires generated specification based on models don't need to do magic and can keep in their normal lifecycle. eg. BottomBarRework
  */
-public class MapEditorEarlyLoadPrefabCollection(PrefabGroupService prefabGroupService) : ITimberApiLoadableSingleton
+public class MapEditorEarlyLoadPrefabCollection(PrefabGroupService prefabGroupService, ISpecService specService) : ITimberApiLoadableSingleton
 {
     public void Load()
     {
         EarlyLoadPatcher.BlockLoading = false;
 
+        specService.Load();
         prefabGroupService.Load();
 
         EarlyLoadPatcher.BlockLoading = true;
diff --git a/Src/TimberApi.SpecificationSystem/GeneratedObjectSpecAlreadyExistsException.cs b/Src/TimberApi.SpecificationSystem/GeneratedObjectSpecAlreadyExistsException.cs
new file mode 100644
index 00000000..98609e45
--- /dev/null
+++ b/Src/TimberApi.SpecificationSystem/GeneratedObjectSpecAlreadyExistsException.cs
@@ -0,0 +1,6 @@
+using System;
+
+namespace TimberApi.SpecificationSystem;
+
+public class GeneratedObjectSpecAlreadyExistsException(string fullPath)
+    : Exception($"The given spec path was already generated \"{fullPath}\"");
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/GeneratedObjectSpecificationAlreadyExistsException.cs b/Src/TimberApi.SpecificationSystem/GeneratedObjectSpecificationAlreadyExistsException.cs
deleted file mode 100644
index 14453e9e..00000000
--- a/Src/TimberApi.SpecificationSystem/GeneratedObjectSpecificationAlreadyExistsException.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-using System;
-
-namespace TimberApi.SpecificationSystem;
-
-public class GeneratedObjectSpecificationAlreadyExistsException(string fullPath)
-    : Exception($"The given specification path was already generated \"{fullPath}\"");
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/GeneratedSpec.cs b/Src/TimberApi.SpecificationSystem/GeneratedSpec.cs
new file mode 100644
index 00000000..03affea8
--- /dev/null
+++ b/Src/TimberApi.SpecificationSystem/GeneratedSpec.cs
@@ -0,0 +1,32 @@
+using Newtonsoft.Json;
+
+namespace TimberApi.SpecificationSystem;
+
+public class GeneratedSpec
+{
+    private static readonly string _specPath = "blueprints";
+
+    public GeneratedSpec(string path, string specName, string json, bool isUnityObjectSpec = false)
+    {
+        FullPath = $"{_specPath}/{path}/{specName}".ToLower();
+        SpecName = specName;
+        Json = json;
+        IsUnityObjectSpec = isUnityObjectSpec;
+    }
+
+    public GeneratedSpec(string path, string specName, object json, bool isUnityObjectSpec = false)
+    {
+        FullPath = $"{_specPath}/{path}/{specName}".ToLower();
+        SpecName = specName;
+        Json = JsonConvert.SerializeObject(json);
+        IsUnityObjectSpec = isUnityObjectSpec;
+    }
+
+    public virtual bool IsUnityObjectSpec { get; }
+
+    public string FullPath { get; }
+
+    public string SpecName { get; }
+
+    public string Json { get; }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/GeneratedSpecAssetProvider.cs b/Src/TimberApi.SpecificationSystem/GeneratedSpecAssetProvider.cs
new file mode 100644
index 00000000..1e5d6652
--- /dev/null
+++ b/Src/TimberApi.SpecificationSystem/GeneratedSpecAssetProvider.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Timberborn.AssetSystem;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace TimberApi.SpecificationSystem;
+
+internal class GeneratedSpecAssetProvider(
+    GeneratedSpecAssetRepository generatedSpecAssetRepository)
+    : IAssetProvider
+{
+    public bool IsBuiltIn => false;
+
+    public bool TryLoad<T>(string path, Type type, out OrderedAsset orderedAsset)  where T : Object
+    {
+        if (type == typeof(TextAsset) && generatedSpecAssetRepository.GeneratedSpecAssets.TryGetValue(path, out var asset))
+        {
+            orderedAsset = asset;
+
+            return true;
+        }
+
+        orderedAsset = new OrderedAsset();
+        return false;
+    }
+
+    public IEnumerable<OrderedAsset> LoadAll<T>(string path) where T : Object
+    {
+        if (typeof(T) != typeof(TextAsset)) return new List<OrderedAsset>();
+
+        return generatedSpecAssetRepository.GeneratedSpecAssets
+            .Where(registeredSpecification => registeredSpecification.Key.StartsWith(path))
+            .Select(registeredSpecification => registeredSpecification.Value);
+    }
+
+    public void Reset()
+    {
+        generatedSpecAssetRepository.Reset();
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/GeneratedSpecAssetRepository.cs b/Src/TimberApi.SpecificationSystem/GeneratedSpecAssetRepository.cs
new file mode 100644
index 00000000..2864ff09
--- /dev/null
+++ b/Src/TimberApi.SpecificationSystem/GeneratedSpecAssetRepository.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using Timberborn.AssetSystem;
+using UnityEngine;
+
+namespace TimberApi.SpecificationSystem;
+
+internal class GeneratedSpecAssetRepository
+{
+    private readonly Dictionary<string, GeneratedSpec> _cachedObjectSpecs = new();
+
+    private readonly HashSet<string> _newCachedObjectSpecPaths = new();
+
+    public readonly Dictionary<string, OrderedAsset> GeneratedSpecAssets = new();
+
+    public void AddSpecRange(IEnumerable<GeneratedSpec> generatedSpecs)
+    {
+        try
+        {
+            foreach (var generatedSpec in generatedSpecs)
+            {
+                var spec = generatedSpec;
+
+                if (generatedSpec.IsUnityObjectSpec)
+                {
+                    if (!_cachedObjectSpecs.TryGetValue(generatedSpec.FullPath, out spec))
+                    {
+                        spec = generatedSpec;
+                        _cachedObjectSpecs.Add(generatedSpec.FullPath, generatedSpec);
+                        _newCachedObjectSpecPaths.Add(generatedSpec.FullPath);
+                    }
+                    else if (_newCachedObjectSpecPaths.Contains(spec.FullPath))
+                    {
+                        throw new GeneratedObjectSpecAlreadyExistsException(spec.FullPath);
+                    }
+                }
+
+                GeneratedSpecAssets[spec.FullPath] = CreateOrderedSpecAsset(spec);
+            }
+        }
+        catch (Exception exception)
+        {
+            Debug.LogError("Something went wrong while adding generated specifications.");
+            throw exception;
+        }
+    }
+
+    public void Reset()
+    {
+        GeneratedSpecAssets.Clear();
+        _newCachedObjectSpecPaths.Clear();
+    }
+
+    private static OrderedAsset CreateOrderedSpecAsset(GeneratedSpec spec)
+    {
+        var asset = new TextAsset(spec.Json)
+        {
+            name = spec.SpecName
+        };
+
+        return new OrderedAsset(-1, asset);
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/GeneratedSpecification.cs b/Src/TimberApi.SpecificationSystem/GeneratedSpecification.cs
deleted file mode 100644
index e9af4f18..00000000
--- a/Src/TimberApi.SpecificationSystem/GeneratedSpecification.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Newtonsoft.Json;
-
-namespace TimberApi.SpecificationSystem;
-
-public class GeneratedSpecification
-{
-    private static readonly string _specificationPath = "specifications";
-
-    public GeneratedSpecification(string path, string specificationName, string json, bool objectSpecification = false)
-    {
-        FullPath = $"{_specificationPath}/{path}/{specificationName}".ToLower();
-        SpecificationName = specificationName;
-        Json = json;
-        ObjectSpecification = objectSpecification;
-    }
-
-    public GeneratedSpecification(string path, string specificationName, object json, bool objectSpecification = false)
-    {
-        FullPath = $"{_specificationPath}/{path}/{specificationName}".ToLower();
-        SpecificationName = specificationName;
-        Json = JsonConvert.SerializeObject(json);
-        ObjectSpecification = objectSpecification;
-    }
-
-    public virtual bool ObjectSpecification { get; }
-
-    public string FullPath { get; }
-
-    public string SpecificationName { get; }
-
-    public string Json { get; }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/GeneratedSpecificationAssetProvider.cs b/Src/TimberApi.SpecificationSystem/GeneratedSpecificationAssetProvider.cs
deleted file mode 100644
index 18ed3c3d..00000000
--- a/Src/TimberApi.SpecificationSystem/GeneratedSpecificationAssetProvider.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Timberborn.AssetSystem;
-using UnityEngine;
-using Object = UnityEngine.Object;
-
-namespace TimberApi.SpecificationSystem;
-
-internal class GeneratedSpecificationAssetProvider(
-    GeneratedSpecificationAssetRepository generatedSpecificationAssetRepository)
-    : IAssetProvider
-{
-    public bool IsBuiltIn => false;
-
-    public bool TryLoad<T>(string path, out OrderedAsset<T> orderedAsset) where T : Object
-    {
-        if (typeof(T) == typeof(TextAsset) &&
-            generatedSpecificationAssetRepository.GeneratedSpecificationAssets.ContainsKey(path))
-        {
-            orderedAsset = generatedSpecificationAssetRepository.GeneratedSpecificationAssets[path].As<T>();
-
-            return true;
-        }
-
-        orderedAsset = new OrderedAsset<T>();
-        return false;
-    }
-
-    public IEnumerable<OrderedAsset<T>> LoadAll<T>(string path) where T : Object
-    {
-        if (typeof(T) != typeof(TextAsset)) return new List<OrderedAsset<T>>();
-
-        return (IEnumerable<OrderedAsset<T>>)generatedSpecificationAssetRepository.GeneratedSpecificationAssets
-            .Where(registeredSpecification => registeredSpecification.Key.StartsWith(path))
-            .Select(registeredSpecification => registeredSpecification.Value);
-    }
-
-    public void Reset()
-    {
-        generatedSpecificationAssetRepository.Reset();
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/GeneratedSpecificationAssetRepository.cs b/Src/TimberApi.SpecificationSystem/GeneratedSpecificationAssetRepository.cs
deleted file mode 100644
index d4fe33dc..00000000
--- a/Src/TimberApi.SpecificationSystem/GeneratedSpecificationAssetRepository.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Timberborn.AssetSystem;
-using UnityEngine;
-
-namespace TimberApi.SpecificationSystem;
-
-internal class GeneratedSpecificationAssetRepository
-{
-    private readonly Dictionary<string, GeneratedSpecification> _cachedObjectSpecifications = new();
-
-    private readonly HashSet<string> _newCachedObjectSpecificationPaths = new();
-
-    public readonly Dictionary<string, OrderedAsset<TextAsset>> GeneratedSpecificationAssets = new();
-
-    public void AddSpecificationRange(IEnumerable<GeneratedSpecification> generatedSpecifications)
-    {
-        try
-        {
-            foreach (var generatedSpecification in generatedSpecifications)
-            {
-                var specification = generatedSpecification;
-
-                if (generatedSpecification.ObjectSpecification)
-                {
-                    if (!_cachedObjectSpecifications.TryGetValue(generatedSpecification.FullPath, out specification))
-                    {
-                        specification = generatedSpecification;
-                        _cachedObjectSpecifications.Add(generatedSpecification.FullPath, generatedSpecification);
-                        _newCachedObjectSpecificationPaths.Add(generatedSpecification.FullPath);
-                    }
-                    else if (_newCachedObjectSpecificationPaths.Contains(specification.FullPath))
-                    {
-                        throw new GeneratedObjectSpecificationAlreadyExistsException(specification.FullPath);
-                    }
-                }
-
-                GeneratedSpecificationAssets[specification.FullPath] = CreateOrderedSpecificationAsset(specification);
-            }
-        }
-        catch (Exception exception)
-        {
-            Debug.LogError("Something went wrong while adding generated specifications.");
-            throw exception;
-        }
-    }
-
-    public void Reset()
-    {
-        GeneratedSpecificationAssets.Clear();
-        _newCachedObjectSpecificationPaths.Clear();
-    }
-
-    private static OrderedAsset<TextAsset> CreateOrderedSpecificationAsset(GeneratedSpecification specification)
-    {
-        var asset = new TextAsset(specification.Json)
-        {
-            name = specification.SpecificationName
-        };
-
-        return new OrderedAsset<TextAsset>(-1, asset);
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/GeneratedSpecificationLoader.cs b/Src/TimberApi.SpecificationSystem/GeneratedSpecificationLoader.cs
index d2c3ecfb..b942810f 100644
--- a/Src/TimberApi.SpecificationSystem/GeneratedSpecificationLoader.cs
+++ b/Src/TimberApi.SpecificationSystem/GeneratedSpecificationLoader.cs
@@ -1,16 +1,33 @@
+
+
+using System;
 using System.Collections.Generic;
-using TimberApi.SingletonSystem;
+using System.Reflection;
+using Timberborn.BlueprintSystem;
 
 namespace TimberApi.SpecificationSystem;
 
-internal class GeneratedSpecificationLoader(
-    GeneratedSpecificationAssetRepository generatedSpecificationAssetRepository,
-    IEnumerable<ISpecificationGenerator> specificationGenerators)
-    : ITimberApiPostLoadableSingleton
+#nullable disable
+internal class GeneratedSpecLoader(
+    GeneratedSpecAssetRepository generatedSpecAssetRepository,
+    IEnumerable<ISpecGenerator> specificationGenerators,
+    ISpecService specService)
 {
-    public void PostLoad()
+    public void RegenerateSpecBlueprints()
     {
         foreach (var specificationGenerator in specificationGenerators)
-            generatedSpecificationAssetRepository.AddSpecificationRange(specificationGenerator.Generate());
+        {
+            generatedSpecAssetRepository.AddSpecRange(specificationGenerator.Generate());
+        }
+
+        // Reloads the spec service, because everything is cached now. This is unoptimized but it is how it is for now.
+        // Might give problems with faction specs if they would have changed.
+        var test = ((Dictionary<Type, List<Lazy<Blueprint>>>)specService.GetType()
+            .GetField("_cachedBlueprints", BindingFlags.Instance | BindingFlags.NonPublic)!
+            .GetValue(specService));
+        
+        test.Clear();
+        specService.Load();
     }
-}
\ No newline at end of file
+
+}
diff --git a/Src/TimberApi.SpecificationSystem/ISpecGenerator.cs b/Src/TimberApi.SpecificationSystem/ISpecGenerator.cs
new file mode 100644
index 00000000..2e59d213
--- /dev/null
+++ b/Src/TimberApi.SpecificationSystem/ISpecGenerator.cs
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+
+namespace TimberApi.SpecificationSystem;
+
+public interface ISpecGenerator
+{
+    IEnumerable<GeneratedSpec> Generate();
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/ISpecificationGenerator.cs b/Src/TimberApi.SpecificationSystem/ISpecificationGenerator.cs
deleted file mode 100644
index 956ed3d4..00000000
--- a/Src/TimberApi.SpecificationSystem/ISpecificationGenerator.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System.Collections.Generic;
-
-namespace TimberApi.SpecificationSystem;
-
-public interface ISpecificationGenerator
-{
-    IEnumerable<GeneratedSpecification> Generate();
-}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/ModStarter.cs b/Src/TimberApi.SpecificationSystem/ModStarter.cs
index 90ae5683..b55d60e2 100644
--- a/Src/TimberApi.SpecificationSystem/ModStarter.cs
+++ b/Src/TimberApi.SpecificationSystem/ModStarter.cs
@@ -1,6 +1,5 @@
 using System;
 using HarmonyLib;
-using TimberApi.HarmonySystem;
 using TimberApi.SpecificationSystem.EarlyPrefabCollectionPatches;
 using Timberborn.ModManagerScene;
 using UnityEngine;
@@ -15,12 +14,6 @@ public void StartMod()
         {
             var harmony = new Harmony("TimberApi.SpecificationSystem");
 
-            harmony.Patch(
-                harmony.GetMethodInfo<Timberborn.Bootstrapper.BootstrapperConfigurator>(
-                    nameof(Timberborn.Bootstrapper.BootstrapperConfigurator.Configure)),
-                harmony.GetHarmonyMethod<BootstrapperConfigurator>(nameof(BootstrapperConfigurator.Patch))
-            );
-
             EarlyLoadPatcher.Patch(harmony);
         }
         catch (Exception e)
diff --git a/Src/TimberApi.SpecificationSystem/OptionalComponentSpec.cs b/Src/TimberApi.SpecificationSystem/OptionalComponentSpec.cs
new file mode 100644
index 00000000..d7e9f097
--- /dev/null
+++ b/Src/TimberApi.SpecificationSystem/OptionalComponentSpec.cs
@@ -0,0 +1,8 @@
+using Timberborn.BlueprintSystem;
+
+namespace TimberApi.SpecificationSystem;
+
+public abstract record OptionalComponentSpec : ComponentSpec
+{
+
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/SpecSystemConfigurator.cs b/Src/TimberApi.SpecificationSystem/SpecSystemConfigurator.cs
new file mode 100644
index 00000000..5523384a
--- /dev/null
+++ b/Src/TimberApi.SpecificationSystem/SpecSystemConfigurator.cs
@@ -0,0 +1,16 @@
+using Bindito.Core;
+using UnityEngine;
+
+namespace TimberApi.SpecificationSystem;
+
+[Context("Game")]
+[Context("MainMenu")]
+[Context("MapEditor")]
+internal class SpecSystemConfigurator : Configurator
+{
+    protected override void Configure()
+    {
+        Bind<BlueprintExtensionHelper>().AsSingleton();
+        Bind<GeneratedSpecLoader>().AsSingleton();
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/SpecificationSystemConfigurator.cs b/Src/TimberApi.SpecificationSystem/SpecificationSystemConfigurator.cs
deleted file mode 100644
index eed465d8..00000000
--- a/Src/TimberApi.SpecificationSystem/SpecificationSystemConfigurator.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Bindito.Core;
-
-namespace TimberApi.SpecificationSystem;
-
-[Context("Game")]
-[Context("MainMenu")]
-[Context("MapEditor")]
-internal class SpecificationSystemConfigurator : IConfigurator
-{
-    public void Configure(IContainerDefinition containerDefinition)
-    {
-        containerDefinition.Bind<GeneratedSpecificationLoader>().AsSingleton();
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.SpecificationSystem/TimberApi.SpecificationSystem.csproj b/Src/TimberApi.SpecificationSystem/TimberApi.SpecificationSystem.csproj
index 1656e57d..2f88797e 100644
--- a/Src/TimberApi.SpecificationSystem/TimberApi.SpecificationSystem.csproj
+++ b/Src/TimberApi.SpecificationSystem/TimberApi.SpecificationSystem.csproj
@@ -11,8 +11,8 @@
         <ProjectReference Include="..\TimberApi\TimberApi.csproj"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+    <ItemGroup>
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -20,6 +20,8 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -29,6 +31,6 @@
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
         <Message Text="### Copying files to plugins ###" Importance="high"/>
-        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\core"/>
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\version-0.7\core"/>
     </Target>
 </Project>
diff --git a/Src/TimberApi.Tools/TimberApi.Tools.csproj b/Src/TimberApi.Tools/TimberApi.Tools.csproj
index 29659baf..e4ec4b2a 100644
--- a/Src/TimberApi.Tools/TimberApi.Tools.csproj
+++ b/Src/TimberApi.Tools/TimberApi.Tools.csproj
@@ -12,8 +12,8 @@
         <ProjectReference Include="..\TimberApi\TimberApi.csproj"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+    <ItemGroup>
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -21,6 +21,8 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -30,6 +32,6 @@
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
         <Message Text="### Copying files to plugins ###" Importance="high"/>
-        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\core"/>
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\version-0.7\core"/>
     </Target>
 </Project>
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ApiToolGroup.cs b/Src/TimberApi.Tools/ToolGroupSystem/ApiToolGroup.cs
index 56592331..a6af1c88 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ApiToolGroup.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ApiToolGroup.cs
@@ -1,29 +1,28 @@
-using Timberborn.ToolSystem;
 using UnityEngine;
 
 namespace TimberApi.Tools.ToolGroupSystem;
 
-public class ApiToolGroup : ToolGroup, IToolGroup
+public class ApiToolGroup(
+    string id,
+    string? groupId,
+    int order,
+    string section,
+    string displayNameLocKey,
+    bool devMode,
+    Sprite icon)
+    : IToolGroup
 {
-    public ApiToolGroup(string id, string? groupId, int order, string section, string displayNameLocKey, bool devMode,
-        Sprite icon)
-    {
-        Id = id;
-        base.DisplayNameLocKey = displayNameLocKey;
-        Order = order;
-        Icon = icon;
-        DevMode = devMode;
-        Section = section;
-        GroupId = groupId;
-    }
+    public string Id { get; } = id;
 
-    public string Id { get; }
+    public string? GroupId { get; } = groupId;
 
-    public string? GroupId { get; }
+    public string DisplayNameLocKey { get; } = displayNameLocKey;
 
-    public int Order { get; }
+    public Sprite Icon { get; } = icon;
+    
+    public int Order { get; } = order;
 
-    public string Section { get; }
+    public string Section { get; } = section;
 
-    public bool DevMode { get; }
-}
\ No newline at end of file
+    public bool DevMode { get; } = devMode;
+}
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ExitingToolGroup.cs b/Src/TimberApi.Tools/ToolGroupSystem/ExitingToolGroup.cs
index e72867fd..c0622016 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ExitingToolGroup.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ExitingToolGroup.cs
@@ -7,6 +7,6 @@ namespace TimberApi.Tools.ToolGroupSystem;
 ///     Requires IConstructionModeEnabler to disable construction mode even when it's in the other ToolGroups, reason is
 ///     unknown.
 /// </summary>
-public class ExitingToolGroup : ToolGroup, IConstructionModeEnabler
+public class ExitingToolGroup : IConstructionModeEnabler
 {
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/IToolGroupFactory.cs b/Src/TimberApi.Tools/ToolGroupSystem/IToolGroupFactory.cs
index 268aa3e8..730ae4e3 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/IToolGroupFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/IToolGroupFactory.cs
@@ -4,5 +4,5 @@ public interface IToolGroupFactory
 {
     public string Id { get; }
 
-    public IToolGroup Create(ToolGroupSpecification toolGroupSpecification);
+    public IToolGroup Create(TimberApiToolGroupSpec toolGroupSpec);
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/TimberbornGroupGenerator.cs b/Src/TimberApi.Tools/ToolGroupSystem/TimberbornGroupGenerator.cs
index 62511739..cb81dc0c 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/TimberbornGroupGenerator.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/TimberbornGroupGenerator.cs
@@ -1,45 +1,56 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using TimberApi.SpecificationSystem;
-
+using Timberborn.BlueprintSystem;
 namespace TimberApi.Tools.ToolGroupSystem;
 
-public class TimberbornGroupGenerator : ISpecificationGenerator
+public class TimberbornGroupGenerator(ISpecService specService) : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
-        yield return MapEditorGroupDevelopment();
-        yield return RuinsGroupDevelopment();
-        yield return OtherGroupHidden();
+        // TODO: Double generated spec is not possible, it should be possible if it's not a object spec.
+        // yield return MapEditorGroupDevelopment();
+        // yield return RuinsGroupDevelopment();
+        // yield return OtherGroupHidden();
+        yield break;
     }
-
-    private static GeneratedSpecification MapEditorGroupDevelopment()
+    
+    private static GeneratedSpec MapEditorGroupDevelopment()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            DevMode = true
+            TimberApiToolGroupSpec = new
+            {
+                DevMode = true,
+            },
         });
-
-        return new GeneratedSpecification(json, "MapEditor", "ToolGroupSpecification");
+        
+        return new GeneratedSpec("ToolGroups", "TimberApiToolGroup.MapEditor", json);
     }
 
-    private static GeneratedSpecification RuinsGroupDevelopment()
+    private static GeneratedSpec RuinsGroupDevelopment()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            DevMode = true
+            TimberApiToolGroupSpec = new
+            {
+                DevMode = false,
+            }
         });
 
-        return new GeneratedSpecification(json, "Ruins", "ToolGroupSpecification");
+        return new GeneratedSpec("ToolGroups", "TimberApiToolGroup.Ruins", json);
     }
 
-    private static GeneratedSpecification OtherGroupHidden()
+    private static GeneratedSpec OtherGroupHidden()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Hidden = true
+            TimberApiToolGroupSpec = new
+            {
+                Hidden = true,
+            }
         });
 
-        return new GeneratedSpecification(json, "Other", "ToolGroupSpecification");
+        return new GeneratedSpec("ToolGroups", "TimberApiToolGroup.Other", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupConfigurator.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupConfigurator.cs
index 43d076a5..06270ac7 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupConfigurator.cs
@@ -10,19 +10,19 @@ namespace TimberApi.Tools.ToolGroupSystem;
 
 [Context("Game")]
 [Context("MapEditor")]
-public class ToolGroupConfigurator : IConfigurator
+public class ToolGroupConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<ToolGroupSpecificationService>().AsSingleton();
-        containerDefinition.Bind<ToolGroupSpecificationDeserializer>().AsSingleton();
-        containerDefinition.Bind<ToolGroupService>().AsSingleton();
-        containerDefinition.Bind<ToolGroupFactoryService>().AsSingleton();
-        containerDefinition.MultiBind<IToolGroupFactory>().To<ConstructionModeToolGroupFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolGroupFactory>().To<DefaultToolGroupFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolGroupFactory>().To<PlantingModeToolGroupFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolGroupFactory>().To<TreeCuttingAreaToolGroupFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolGroupFactory>().To<BuilderPriorityToolGroupFactory>().AsSingleton();
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<TimberbornGroupGenerator>().AsSingleton();
+        Bind<ToolGroupSpecService>().AsSingleton();
+        Bind<ToolGroupService>().AsSingleton();
+        Bind<ToolGroupFactoryService>().AsSingleton();
+        MultiBind<IToolGroupFactory>().To<ConstructionModeToolGroupFactory>().AsSingleton();
+        MultiBind<IToolGroupFactory>().To<DefaultToolGroupFactory>().AsSingleton();
+        MultiBind<IToolGroupFactory>().To<PlantingModeToolGroupFactory>().AsSingleton();
+        MultiBind<IToolGroupFactory>().To<TreeCuttingAreaToolGroupFactory>().AsSingleton();
+        MultiBind<IToolGroupFactory>().To<BuilderPriorityToolGroupFactory>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<TimberbornGroupGenerator>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<ToolGroupSpecConvertGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupExtensionSpec.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupExtensionSpec.cs
new file mode 100644
index 00000000..f527a2d7
--- /dev/null
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupExtensionSpec.cs
@@ -0,0 +1,25 @@
+using Timberborn.BlueprintSystem;
+using Timberborn.ToolSystem;
+
+namespace TimberApi.Tools.ToolGroupSystem;
+
+public record TimberApiToolGroupSpec : ToolGroupSpec
+{
+    [Serialize]
+    public string Type { get; init; } = "ConstructionModeToolGroup";
+
+    [Serialize]
+    public string? GroupId { get; init; } = null;
+
+    [Serialize]
+    public string Layout { get; init; } = "Green";
+
+    [Serialize]
+    public string Section { get; init; } = "BottomBar";
+
+    [Serialize]
+    public bool DevMode { get; init; } = false;
+
+    [Serialize]
+    public bool Hidden { get; init; } = false;
+}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupService.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupService.cs
index a791597b..34677cb2 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupService.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupService.cs
@@ -3,12 +3,13 @@
 using System.Linq;
 using TimberApi.Tools.ToolGroupUI;
 using Timberborn.SingletonSystem;
+using Timberborn.ToolButtonSystem;
 using Timberborn.ToolSystem;
 
 namespace TimberApi.Tools.ToolGroupSystem;
 
 public class ToolGroupService(
-    ToolGroupSpecificationService toolGroupSpecificationService,
+    ToolGroupSpecService toolGroupSpecService,
     ToolGroupButtonFactoryService toolGroupButtonFactoryService,
     ToolGroupFactoryService toolGroupFactoryService)
     : ILoadableSingleton
@@ -28,15 +29,14 @@ public void Load()
 
         var toolGroupButtons = new Dictionary<string, ToolGroupButton>();
 
-        foreach (var toolGroupSpecification in toolGroupSpecificationService.ToolGroupSpecifications
-                     .OrderBy(x => x.Layout).ThenBy(x => x.Order))
+        foreach (var toolGroupSpecification in toolGroupSpecService.ToolGroupSpecs.OrderBy(x => x.Layout).ThenBy(x => x.Order))
         {
             var toolGroup = toolGroupFactoryService.Get(toolGroupSpecification.Type).Create(toolGroupSpecification);
 
             toolGroups.Add(toolGroupSpecification.Id.ToLower(), toolGroup);
 
-            var button = toolGroupButtonFactoryService.Get(toolGroupSpecification.Layout)
-                .Create(toolGroup, toolGroupSpecification);
+            var button = toolGroupButtonFactoryService.Get(toolGroupSpecification.Layout).Create(toolGroup, toolGroupSpecification);
+            
             toolGroupButtons.Add(toolGroupSpecification.Id.ToLower(), button);
         }
 
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecConvertGenerator.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecConvertGenerator.cs
new file mode 100644
index 00000000..bf9e8c46
--- /dev/null
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecConvertGenerator.cs
@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using TimberApi.SpecificationSystem;
+using Timberborn.AssetSystem;
+using UnityEngine;
+
+namespace TimberApi.Tools.ToolGroupSystem;
+
+public class ToolGroupSpecConvertGenerator(IAssetLoader assetLoader) : ISpecGenerator
+{
+    public IEnumerable<GeneratedSpec> Generate()
+    {
+        foreach (var toolGroupText in assetLoader.LoadAll<TextAsset>("Blueprints/ToolGroups").Where(asset => asset.Asset.name.ToLower().StartsWith("toolgroup.")))
+        {
+            var toolGroupSpec = JObject.Parse(toolGroupText.Asset.text)["ToolGroupSpec"];
+
+            if (toolGroupSpec == null)
+            {
+                continue;
+            }
+
+            var json = JsonConvert.SerializeObject(new
+            {
+                TimberApiToolGroupSpec = new
+                {
+                    Id = toolGroupSpec["Id"],
+                    Order = toolGroupSpec["Order"],
+                    NameLocKey = toolGroupSpec["NameLocKey"],
+                    Icon = toolGroupSpec["Icon"],
+                    FallbackGroup = toolGroupSpec["FallbackGroup"],
+                    DevMode = true,
+                },
+            });
+            
+            yield return new GeneratedSpec("ToolGroups", "TimberApi" + toolGroupText.Asset.name, json);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecService.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecService.cs
new file mode 100644
index 00000000..9d8c78cd
--- /dev/null
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecService.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Timberborn.BlueprintSystem;
+using Timberborn.SingletonSystem;
+using Timberborn.ToolSystem;
+using Timberborn.WaterBuildingsUI;
+using UnityEngine;
+
+namespace TimberApi.Tools.ToolGroupSystem;
+
+public class ToolGroupSpecService(ISpecService specService) : ILoadableSingleton
+{
+    private ImmutableDictionary<string, TimberApiToolGroupSpec> _toolGroupSpec;
+
+    public ImmutableArray<TimberApiToolGroupSpec> ToolGroupSpecs => _toolGroupSpec.Select(pair => pair.Value).ToImmutableArray();
+
+    public void Load()
+    {
+        _toolGroupSpec = specService.GetSpecs<TimberApiToolGroupSpec>().ToImmutableDictionary(specification => specification.Id.ToLower());
+    }
+
+    public ToolGroupSpec Get(string id)
+    {
+        if (!_toolGroupSpec.TryGetValue(id.ToLower(), out var toolGroupSpecification))
+            throw new KeyNotFoundException($"The given ToolId ({id.ToLower()}) cannot be found.");
+
+        return toolGroupSpecification;
+    }
+
+    public IEnumerable<TimberApiToolGroupSpec> GetByGroupId(string groupId)
+    {
+        return _toolGroupSpec
+            .Where(pair => pair.Value.GroupId?.ToLower() == groupId.ToLower())
+            .Select(pair => pair.Value);
+    }
+
+    public IEnumerable<TimberApiToolGroupSpec> GetBySection(string section)
+    {
+        return _toolGroupSpec
+            .Where(pair => section.ToLower().Equals(pair.Value.Section.ToLower()))
+            .Select(pair => pair.Value);
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecification.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecification.cs
deleted file mode 100644
index 5e80614b..00000000
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecification.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Timberborn.SerializationSystem;
-using UnityEngine;
-
-namespace TimberApi.Tools.ToolGroupSystem;
-
-public class ToolGroupSpecification(
-    string id,
-    string type,
-    int order,
-    string nameLocKey,
-    Sprite icon,
-    bool fallbackGroup,
-    string? groupId,
-    string layout,
-    string section,
-    bool devMode,
-    bool hidden,
-    ObjectSave? groupInformation)
-    : ToolGroupSpecification<ObjectSave>(id, type, order, nameLocKey, icon, fallbackGroup, groupId, layout, section,
-        devMode, hidden,
-        groupInformation);
-
-public class ToolGroupSpecification<T>(
-    string id,
-    string type,
-    int order,
-    string nameLocKey,
-    Sprite icon,
-    bool fallbackGroup,
-    string? groupId,
-    string layout,
-    string section,
-    bool devMode,
-    bool hidden,
-    T? groupInformation)
-    : Timberborn.ToolSystem.ToolGroupSpecification(id, order, nameLocKey, icon, fallbackGroup)
-{
-    public string Type { get; set; } = type;
-
-    public string? GroupId { get; } = groupId;
-
-    public string Layout { get; } = layout;
-
-    public string Section { get; } = section;
-
-    public bool DevMode { get; } = devMode;
-
-    public bool Hidden { get; } = hidden;
-
-    public T? GroupInformation { get; } = groupInformation;
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecificationDeserializer.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecificationDeserializer.cs
deleted file mode 100644
index 00f08159..00000000
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecificationDeserializer.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using TimberApi.Extensions;
-using Timberborn.AssetSystem;
-using Timberborn.Persistence;
-using Timberborn.SerializationSystem;
-using UnityEngine;
-
-namespace TimberApi.Tools.ToolGroupSystem;
-
-public class ToolGroupSpecificationDeserializer : IObjectSerializer<ToolGroupSpecification>
-{
-    private readonly IAssetLoader _assetLoader;
-
-    protected ToolGroupSpecificationDeserializer(IAssetLoader assetLoader)
-    {
-        _assetLoader = assetLoader;
-    }
-
-    public void Serialize(ToolGroupSpecification value, IObjectSaver objectSaver)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Obsoletable<ToolGroupSpecification> Deserialize(IObjectLoader objectLoader)
-    {
-        return new ToolGroupSpecification(
-            objectLoader.Get(new PropertyKey<string>("Id")),
-            objectLoader.GetValueOrDefault(new PropertyKey<string>("Type"), "ConstructionModeToolGroup"),
-            objectLoader.Get(new PropertyKey<int>("Order")),
-            objectLoader.Get(new PropertyKey<string>("NameLocKey")),
-            _assetLoader.Load<Sprite>(objectLoader.Get(new PropertyKey<string>("Icon"))),
-            objectLoader.GetValueOrDefault(new PropertyKey<bool>("FallbackGroup"), false),
-            objectLoader.GetValueOrNull(new PropertyKey<string>("GroupId")),
-            objectLoader.GetValueOrDefault(new PropertyKey<string>("Layout"), "Green"),
-            objectLoader.GetValueOrDefault(new PropertyKey<string>("Section"), "BottomBar"),
-            objectLoader.GetValueOrDefault(new PropertyKey<bool>("DevMode"), false),
-            objectLoader.GetValueOrDefault(new PropertyKey<bool>("Hidden"), false),
-            GetGroupInformationObjectSave(objectLoader)
-        );
-    }
-
-    private static ObjectSave? GetGroupInformationObjectSave(IObjectLoader objectLoader)
-    {
-        if (!objectLoader.Has(new PropertyKey<ObjectSave>("GroupInformation"))) return null;
-
-        return ((ObjectLoader)objectLoader)._objectSave.Get<ObjectSave>("GroupInformation");
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecificationService.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecificationService.cs
deleted file mode 100644
index d0905fbf..00000000
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroupSpecificationService.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using Timberborn.Persistence;
-using Timberborn.SingletonSystem;
-
-namespace TimberApi.Tools.ToolGroupSystem;
-
-public class ToolGroupSpecificationService(
-    ISpecificationService specificationService,
-    ToolGroupSpecificationDeserializer toolGroupSpecificationDeserializer)
-    : ILoadableSingleton
-{
-    private ImmutableDictionary<string, ToolGroupSpecification> _toolGroupSpecifications = null!;
-
-    public ImmutableArray<ToolGroupSpecification> ToolGroupSpecifications =>
-        _toolGroupSpecifications.Select(pair => pair.Value).ToImmutableArray();
-
-    public void Load()
-    {
-        _toolGroupSpecifications = specificationService.GetSpecifications(toolGroupSpecificationDeserializer)
-            .ToImmutableDictionary(specification => specification.Id.ToLower());
-    }
-
-    public ToolGroupSpecification Get(string id)
-    {
-        if (!_toolGroupSpecifications.TryGetValue(id.ToLower(), out var toolGroupSpecification))
-            throw new KeyNotFoundException($"The given ToolId ({id.ToLower()}) cannot be found.");
-
-        return toolGroupSpecification;
-    }
-
-    public IEnumerable<ToolGroupSpecification> GetByGroupId(string groupId)
-    {
-        return _toolGroupSpecifications
-            .Where(pair => pair.Value.GroupId?.ToLower() == groupId.ToLower())
-            .Select(pair => pair.Value);
-    }
-
-    public IEnumerable<ToolGroupSpecification> GetBySection(string section)
-    {
-        return _toolGroupSpecifications
-            .Where(pair => pair.Value.Section.ToLower().Equals(section.ToLower()))
-            .Select(pair => pair.Value);
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/BuilderPriority/BuilderPriorityToolGroup.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/BuilderPriority/BuilderPriorityToolGroup.cs
index e1551049..e68d8820 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/BuilderPriority/BuilderPriorityToolGroup.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/BuilderPriority/BuilderPriorityToolGroup.cs
@@ -2,27 +2,25 @@
 
 namespace TimberApi.Tools.ToolGroupSystem.ToolGroups.BuilderPriority;
 
-public sealed class BuilderPriorityToolGroup : Timberborn.BuilderPrioritySystemUI.BuilderPriorityToolGroup, IToolGroup
+public sealed class BuilderPriorityToolGroup(
+    string id,
+    string? groupId,
+    int order,
+    string section,
+    string displayNameLocKey,
+    bool devMode,
+    Sprite icon)
+    : IToolGroup
 {
-    public BuilderPriorityToolGroup(string id, string? groupId, int order, string section, string displayNameLocKey,
-        bool devMode, Sprite icon)
-    {
-        Id = id;
-        DisplayNameLocKey = displayNameLocKey;
-        Order = order;
-        Icon = icon;
-        DevMode = devMode;
-        Section = section;
-        GroupId = groupId;
-    }
+    public string Id { get; } = id;
 
-    public string Id { get; }
+    public string? GroupId { get; } = groupId;
 
-    public string? GroupId { get; }
+    public string DisplayNameLocKey { get; } = displayNameLocKey;
+    public Sprite Icon { get; } = icon;
+    public int Order { get; } = order;
 
-    public int Order { get; }
+    public string Section { get; } = section;
 
-    public string Section { get; }
-
-    public bool DevMode { get; }
+    public bool DevMode { get; } = devMode;
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/BuilderPriority/BuilderPriorityToolGroupFactory.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/BuilderPriority/BuilderPriorityToolGroupFactory.cs
index 8747cabd..8fbb1c6c 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/BuilderPriority/BuilderPriorityToolGroupFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/BuilderPriority/BuilderPriorityToolGroupFactory.cs
@@ -4,16 +4,16 @@ public class BuilderPriorityToolGroupFactory : IToolGroupFactory
 {
     public string Id => "BuilderPriorityToolGroup";
 
-    public IToolGroup Create(ToolGroupSpecification toolGroupSpecification)
+    public IToolGroup Create(TimberApiToolGroupSpec toolGroupSpec)
     {
         return new BuilderPriorityToolGroup(
-            toolGroupSpecification.Id,
-            toolGroupSpecification.GroupId,
-            toolGroupSpecification.Order,
-            toolGroupSpecification.Section,
-            toolGroupSpecification.NameLocKey,
-            toolGroupSpecification.DevMode,
-            toolGroupSpecification.Icon
+            toolGroupSpec.Id,
+            toolGroupSpec.GroupId,
+            toolGroupSpec.Order,
+            toolGroupSpec.Section,
+            toolGroupSpec.NameLocKey,
+            toolGroupSpec.DevMode,
+            toolGroupSpec.Icon
         );
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/ConstructionMode/ConstructionModeToolGroupFactory.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/ConstructionMode/ConstructionModeToolGroupFactory.cs
index 9b26edf4..398556bf 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/ConstructionMode/ConstructionModeToolGroupFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/ConstructionMode/ConstructionModeToolGroupFactory.cs
@@ -4,16 +4,16 @@ public class ConstructionModeToolGroupFactory : IToolGroupFactory
 {
     public string Id => "ConstructionModeToolGroup";
 
-    public IToolGroup Create(ToolGroupSpecification toolGroupSpecification)
+    public IToolGroup Create(TimberApiToolGroupSpec toolGroupSpec)
     {
         return new ConstructionModeToolGroup(
-            toolGroupSpecification.Id,
-            toolGroupSpecification.GroupId,
-            toolGroupSpecification.Order,
-            toolGroupSpecification.Section,
-            toolGroupSpecification.NameLocKey,
-            toolGroupSpecification.DevMode,
-            toolGroupSpecification.Icon
+            toolGroupSpec.Id,
+            toolGroupSpec.GroupId,
+            toolGroupSpec.Order,
+            toolGroupSpec.Section,
+            toolGroupSpec.NameLocKey,
+            toolGroupSpec.DevMode,
+            toolGroupSpec.Icon
         );
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/Default/DefaultToolGroupFactory.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/Default/DefaultToolGroupFactory.cs
index e53c12f3..248e4749 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/Default/DefaultToolGroupFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/Default/DefaultToolGroupFactory.cs
@@ -4,16 +4,16 @@ public class DefaultToolGroupFactory : IToolGroupFactory
 {
     public string Id => "DefaultToolGroup";
 
-    public IToolGroup Create(ToolGroupSpecification toolGroupSpecification)
+    public IToolGroup Create(TimberApiToolGroupSpec toolGroupSpec)
     {
         return new ApiToolGroup(
-            toolGroupSpecification.Id,
-            toolGroupSpecification.GroupId,
-            toolGroupSpecification.Order,
-            toolGroupSpecification.Section,
-            toolGroupSpecification.NameLocKey,
-            toolGroupSpecification.DevMode,
-            toolGroupSpecification.Icon
+            toolGroupSpec.Id,
+            toolGroupSpec.GroupId,
+            toolGroupSpec.Order,
+            toolGroupSpec.Section,
+            toolGroupSpec.NameLocKey,
+            toolGroupSpec.DevMode,
+            toolGroupSpec.Icon
         );
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/PlantingMode/PlantingModeToolGroupFactory.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/PlantingMode/PlantingModeToolGroupFactory.cs
index 48352d59..459b8a86 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/PlantingMode/PlantingModeToolGroupFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/PlantingMode/PlantingModeToolGroupFactory.cs
@@ -4,16 +4,16 @@ public class PlantingModeToolGroupFactory : IToolGroupFactory
 {
     public string Id => "PlantingModeToolGroup";
 
-    public IToolGroup Create(ToolGroupSpecification toolGroupSpecification)
+    public IToolGroup Create(TimberApiToolGroupSpec toolGroupSpec)
     {
         return new PlantingModeToolGroup(
-            toolGroupSpecification.Id,
-            toolGroupSpecification.GroupId,
-            toolGroupSpecification.Order,
-            toolGroupSpecification.Section,
-            toolGroupSpecification.NameLocKey,
-            toolGroupSpecification.DevMode,
-            toolGroupSpecification.Icon
+            toolGroupSpec.Id,
+            toolGroupSpec.GroupId,
+            toolGroupSpec.Order,
+            toolGroupSpec.Section,
+            toolGroupSpec.NameLocKey,
+            toolGroupSpec.DevMode,
+            toolGroupSpec.Icon
         );
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/TreeCuttingArea/TreeCuttingAreaToolGroupFactory.cs b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/TreeCuttingArea/TreeCuttingAreaToolGroupFactory.cs
index 24b09555..d096408e 100644
--- a/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/TreeCuttingArea/TreeCuttingAreaToolGroupFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupSystem/ToolGroups/TreeCuttingArea/TreeCuttingAreaToolGroupFactory.cs
@@ -4,16 +4,16 @@ public class TreeCuttingAreaToolGroupFactory : IToolGroupFactory
 {
     public string Id => "TreeCuttingAreaToolGroup";
 
-    public IToolGroup Create(ToolGroupSpecification toolGroupSpecification)
+    public IToolGroup Create(TimberApiToolGroupSpec toolGroupSpec)
     {
         return new TreeCuttingAreaToolGroup(
-            toolGroupSpecification.Id,
-            toolGroupSpecification.GroupId,
-            toolGroupSpecification.Order,
-            toolGroupSpecification.Section,
-            toolGroupSpecification.NameLocKey,
-            toolGroupSpecification.DevMode,
-            toolGroupSpecification.Icon
+            toolGroupSpec.Id,
+            toolGroupSpec.GroupId,
+            toolGroupSpec.Order,
+            toolGroupSpec.Section,
+            toolGroupSpec.NameLocKey,
+            toolGroupSpec.DevMode,
+            toolGroupSpec.Icon
         );
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonBlueFactory.cs b/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonBlueFactory.cs
index 25626f66..df6896e3 100644
--- a/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonBlueFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonBlueFactory.cs
@@ -1,6 +1,5 @@
 using TimberApi.Tools.ToolGroupSystem;
 using Timberborn.ToolSystem;
-using ToolGroupSpecification = Timberborn.ToolSystem.ToolGroupSpecification;
 
 namespace TimberApi.Tools.ToolGroupUI.Factories;
 
@@ -8,7 +7,7 @@ public class ToolGroupButtonBlueFactory(ToolGroupButtonFactory toolGroupButtonFa
 {
     public string Id => "Blue";
 
-    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpecification toolGroupSpecification)
+    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpec toolGroupSpec)
     {
         return toolGroupButtonFactory.Create((ToolGroup)toolGroup, toolGroup.Icon, "UI/Images/BottomBar/button-bg-02");
     }
diff --git a/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonBrownFactory.cs b/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonBrownFactory.cs
index e2ca5afe..9e1ab193 100644
--- a/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonBrownFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonBrownFactory.cs
@@ -1,6 +1,5 @@
 using TimberApi.Tools.ToolGroupSystem;
 using Timberborn.ToolSystem;
-using ToolGroupSpecification = Timberborn.ToolSystem.ToolGroupSpecification;
 
 namespace TimberApi.Tools.ToolGroupUI.Factories;
 
@@ -8,9 +7,8 @@ public class ToolGroupButtonBrownFactory(ToolGroupButtonFactory toolGroupButtonF
 {
     public string Id => "Brown";
 
-    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpecification toolGroupSpecification)
+    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpec toolGroupSpec)
     {
-        return toolGroupButtonFactory.Create((ToolGroup)toolGroup, toolGroup.Icon,
-            "UI/Images/BottomBar/subbutton-bg-01");
+        return toolGroupButtonFactory.Create((ToolGroup)toolGroup, toolGroup.Icon, "UI/Images/BottomBar/subbutton-bg-01");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonGreenFactory.cs b/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonGreenFactory.cs
index 7c265432..3ac57dad 100644
--- a/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonGreenFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonGreenFactory.cs
@@ -1,6 +1,5 @@
 using TimberApi.Tools.ToolGroupSystem;
 using Timberborn.ToolSystem;
-using ToolGroupSpecification = Timberborn.ToolSystem.ToolGroupSpecification;
 
 namespace TimberApi.Tools.ToolGroupUI.Factories;
 
@@ -8,7 +7,7 @@ public class ToolGroupButtonGreenFactory(ToolGroupButtonFactory toolGroupButtonF
 {
     public string Id => "Green";
 
-    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpecification toolGroupSpecification)
+    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpec toolGroupSpec)
     {
         return toolGroupButtonFactory.Create((ToolGroup)toolGroup, toolGroup.Icon, "UI/Images/BottomBar/button-bg-03");
     }
diff --git a/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonRedFactory.cs b/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonRedFactory.cs
index 30be263d..c3d1bf19 100644
--- a/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonRedFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupUI/Factories/ToolGroupButtonRedFactory.cs
@@ -1,6 +1,5 @@
 using TimberApi.Tools.ToolGroupSystem;
 using Timberborn.ToolSystem;
-using ToolGroupSpecification = Timberborn.ToolSystem.ToolGroupSpecification;
 
 namespace TimberApi.Tools.ToolGroupUI.Factories;
 
@@ -8,7 +7,7 @@ public class ToolGroupButtonRedFactory(ToolGroupButtonFactory toolGroupButtonFac
 {
     public string Id => "Red";
 
-    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpecification toolGroupSpecification)
+    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpec toolGroupSpec)
     {
         return toolGroupButtonFactory.Create((ToolGroup)toolGroup, toolGroup.Icon, "UI/Images/BottomBar/button-bg-01");
     }
diff --git a/Src/TimberApi.Tools/ToolGroupUI/IToolGroupButtonFactory.cs b/Src/TimberApi.Tools/ToolGroupUI/IToolGroupButtonFactory.cs
index f8552d63..bf2c45ae 100644
--- a/Src/TimberApi.Tools/ToolGroupUI/IToolGroupButtonFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupUI/IToolGroupButtonFactory.cs
@@ -1,6 +1,5 @@
 using TimberApi.Tools.ToolGroupSystem;
 using Timberborn.ToolSystem;
-using ToolGroupSpecification = Timberborn.ToolSystem.ToolGroupSpecification;
 
 namespace TimberApi.Tools.ToolGroupUI;
 
@@ -8,5 +7,5 @@ public interface IToolGroupButtonFactory
 {
     public string Id { get; }
 
-    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpecification toolGroupSpecification);
+    public ToolGroupButton Create(IToolGroup toolGroup, ToolGroupSpec toolGroupSpec);
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolGroupUI/ToolGroupButtonFactory.cs b/Src/TimberApi.Tools/ToolGroupUI/ToolGroupButtonFactory.cs
index b58aab9f..ab76b91d 100644
--- a/Src/TimberApi.Tools/ToolGroupUI/ToolGroupButtonFactory.cs
+++ b/Src/TimberApi.Tools/ToolGroupUI/ToolGroupButtonFactory.cs
@@ -26,8 +26,7 @@ public ToolGroupButton Create(ToolGroup toolGroup, Sprite toolGroupImage, string
     public ToolGroupButton Create(ToolGroup toolGroup, Sprite toolGroupImage, Sprite backgroundImage)
     {
         var visualElement = visualElementLoader.LoadVisualElement("Common/BottomBar/ToolGroupButton");
-        visualElement.Q<VisualElement>("ToolGroupButtonWrapper").Q<VisualElement>("").style.backgroundImage =
-            new StyleBackground(backgroundImage);
+        visualElement.Q<VisualElement>("ToolGroupButtonWrapper").Q<VisualElement>("").style.backgroundImage = new StyleBackground(backgroundImage);
         InitializeElement(visualElement, toolGroup, toolGroupImage);
         var toolGroupButton = new ToolGroupButton(loc,
             toolGroupManager,
diff --git a/Src/TimberApi.Tools/ToolGroupUI/ToolGroupUIConfigurator.cs b/Src/TimberApi.Tools/ToolGroupUI/ToolGroupUIConfigurator.cs
index cf32efeb..a4a965de 100644
--- a/Src/TimberApi.Tools/ToolGroupUI/ToolGroupUIConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolGroupUI/ToolGroupUIConfigurator.cs
@@ -5,15 +5,15 @@ namespace TimberApi.Tools.ToolGroupUI;
 
 [Context("Game")]
 [Context("MapEditor")]
-public class ToolGroupUIConfigurator : IConfigurator
+public class ToolGroupUIConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<ToolGroupButtonFactoryService>().AsSingleton();
-        containerDefinition.Bind<ToolGroupButtonFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolGroupButtonFactory>().To<ToolGroupButtonRedFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolGroupButtonFactory>().To<ToolGroupButtonBrownFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolGroupButtonFactory>().To<ToolGroupButtonBlueFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolGroupButtonFactory>().To<ToolGroupButtonGreenFactory>().AsSingleton();
+        Bind<ToolGroupButtonFactoryService>().AsSingleton();
+        Bind<ToolGroupButtonFactory>().AsSingleton();
+        MultiBind<IToolGroupButtonFactory>().To<ToolGroupButtonRedFactory>().AsSingleton();
+        MultiBind<IToolGroupButtonFactory>().To<ToolGroupButtonBrownFactory>().AsSingleton();
+        MultiBind<IToolGroupButtonFactory>().To<ToolGroupButtonBlueFactory>().AsSingleton();
+        MultiBind<IToolGroupButtonFactory>().To<ToolGroupButtonGreenFactory>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/BaseToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/BaseToolFactory.cs
deleted file mode 100644
index c09972a9..00000000
--- a/Src/TimberApi.Tools/ToolSystem/BaseToolFactory.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Timberborn.AssetSystem;
-using Timberborn.Persistence;
-using Timberborn.SerializationSystem;
-using Timberborn.ToolSystem;
-using UnityEngine;
-
-namespace TimberApi.Tools.ToolSystem;
-
-public abstract class BaseToolFactory<T> : IToolFactory
-{
-    public abstract string Id { get; }
-
-    public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup)
-    {
-        return CreateTool(toolSpecification, GetToolInformation(toolSpecification), toolGroup);
-    }
-
-    protected abstract Tool CreateTool(ToolSpecification toolSpecification, T toolInformation, ToolGroup? toolGroup);
-
-    private T GetToolInformation(ToolSpecification toolSpecification)
-    {
-        var objectLoader = ObjectLoader.CreateBasicLoader(toolSpecification.ToolInformation);
-
-        return DeserializeToolInformation(objectLoader);
-    }
-
-    protected abstract T DeserializeToolInformation(IObjectLoader objectLoader);
-}
-
-public class SpecificationService(
-    ObjectSaveReaderWriter objectSaveReaderWriter,
-    IAssetLoader assetLoader)
-    : ISpecificationService
-{
-    public static readonly string SpecificationPath = "Specifications";
-    public static readonly string OptionalSpecificationSuffix = ".optional";
-    public readonly IAssetLoader _assetLoader = assetLoader;
-    public readonly ObjectSaveReaderWriter _objectSaveReaderWriter = objectSaveReaderWriter;
-
-    static SpecificationService()
-    {
-    }
-
-    public IEnumerable<T> GetSpecifications<T>(IObjectSerializer<T> serializer)
-    {
-        var type = typeof(T).Name;
-        foreach (var source in _assetLoader.LoadAll<TextAsset>(SpecificationPath)
-                     .Select((Func<LoadedAsset<TextAsset>, TextAsset>)(loadedAsset => loadedAsset.Asset))
-                     .Where((Func<TextAsset, bool>)(asset => asset.name.StartsWith(type + ".")))
-                     .GroupBy((Func<TextAsset, string>)(asset =>
-                         asset.name.Replace(OptionalSpecificationSuffix, string.Empty)))
-                     .Where<IGrouping<string, TextAsset>>((Func<IGrouping<string, TextAsset>, bool>)(assetGroup =>
-                         assetGroup.Any((Func<TextAsset, bool>)(asset =>
-                             !asset.name.EndsWith(OptionalSpecificationSuffix))))))
-            yield return ObjectLoader
-                .CreateBasicLoader(_objectSaveReaderWriter
-                    .ReadJsons(source.Select((Func<TextAsset, string>)(asset => asset.text))).Wrap(type))
-                .Get(new PropertyKey<T>(type), serializer);
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/IToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/IToolFactory.cs
index 132088d7..36d515e3 100644
--- a/Src/TimberApi.Tools/ToolSystem/IToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/IToolFactory.cs
@@ -1,3 +1,4 @@
+using TimberApi.Tools.ToolGroupSystem;
 using Timberborn.ToolSystem;
 
 namespace TimberApi.Tools.ToolSystem;
@@ -6,5 +7,5 @@ public interface IToolFactory
 {
     public string Id { get; }
 
-    public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null);
+    public ITool Create(ToolSpec toolSpec, IToolGroup? toolGroup = null);
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/ToolService.cs b/Src/TimberApi.Tools/ToolSystem/ToolService.cs
index a8bd763a..90f0002b 100644
--- a/Src/TimberApi.Tools/ToolSystem/ToolService.cs
+++ b/Src/TimberApi.Tools/ToolSystem/ToolService.cs
@@ -4,38 +4,40 @@
 using TimberApi.Tools.ToolGroupSystem;
 using TimberApi.Tools.ToolUI;
 using Timberborn.SingletonSystem;
+using Timberborn.ToolButtonSystem;
 using Timberborn.ToolSystem;
+using UnityEngine;
 
 namespace TimberApi.Tools.ToolSystem;
 
 public class ToolService(
-    ToolSpecificationService toolSpecificationService,
+    ToolSpecService toolSpecService,
     ToolFactoryService toolFactoryService,
     ToolButtonFactoryService toolButtonFactoryService,
-    ToolGroupService toolGroupService)
+    TimberApi.Tools.ToolGroupSystem.ToolGroupService toolGroupService)
     : ILoadableSingleton
 {
     private ImmutableDictionary<string, ToolButton> _toolButtons = null!;
 
-    private ImmutableDictionary<string, Tool> _tools = null!;
+    private ImmutableDictionary<string, ITool> _tools = null!;
 
-    public IEnumerable<Tool> Tools => _tools.Select(pair => pair.Value).ToImmutableArray();
+    public IEnumerable<ITool> Tools => _tools.Select(pair => pair.Value).ToImmutableArray();
 
     public IEnumerable<ToolButton> ToolButtons => _toolButtons.Select(pair => pair.Value).ToImmutableArray();
 
     public void Load()
     {
-        var tools = new Dictionary<string, Tool>();
+        var tools = new Dictionary<string, ITool>();
 
         var toolButtons = new Dictionary<string, ToolButton>();
 
-        foreach (var specification in toolSpecificationService.ToolSpecifications)
+        foreach (var specification in toolSpecService.ToolSpecifications)
         {
             var toolFactory = toolFactoryService.Get(specification.Type);
-
+            
             var tool = specification.GroupId is null
                 ? toolFactory.Create(specification)
-                : toolFactory.Create(specification, (ToolGroup)toolGroupService.GetToolGroup(specification.GroupId));
+                : toolFactory.Create(specification, (IToolGroup)toolGroupService.GetToolGroup(specification.GroupId));
 
             tools.Add(specification.Id.ToLower(), tool);
 
@@ -47,7 +49,7 @@ public void Load()
         _toolButtons = toolButtons.ToImmutableDictionary();
     }
 
-    public Tool GetTool(string id)
+    public ITool GetTool(string id)
     {
         if (!_tools.TryGetValue(id.ToLower(), out var tool))
             throw new KeyNotFoundException($"The given ToolId ({id.ToLower()}) cannot be found.");
diff --git a/Src/TimberApi.Tools/ToolSystem/ToolSpec.cs b/Src/TimberApi.Tools/ToolSystem/ToolSpec.cs
new file mode 100644
index 00000000..a71b49bb
--- /dev/null
+++ b/Src/TimberApi.Tools/ToolSystem/ToolSpec.cs
@@ -0,0 +1,51 @@
+using System.Collections.Immutable;
+using TimberApi.SpecificationSystem;
+using Timberborn.BlueprintSystem;
+using Timberborn.LocalizationSerialization;
+
+namespace TimberApi.Tools.ToolSystem;
+
+public record ToolSpec : OptionalComponentSpec
+{
+    [Serialize]
+    public string Id { get; init; }
+
+    [Serialize]
+    public string? GroupId { get; init; } = null;
+
+    [Serialize]
+    public ImmutableArray<string> Scenes { get; init; } = ["Game"];
+
+    [Serialize]
+    public string Section { get; init; } = "BottomBar";
+
+    [Serialize]
+    public string Type { get; init; }
+
+    [Serialize]
+    public string Layout { get; init; } = "Default";
+
+    [Serialize]
+    public int Order { get; init; }
+
+    [Serialize]
+    public string Icon { get; init; }
+
+    [Serialize("NameLocKey")]
+    public LocalizedText Name { get; init; }
+
+    [Serialize]
+    public string NameLocKey { get; init; }
+
+    [Serialize("DescriptionLocKey")]
+    public LocalizedText Description { get; init; }
+
+    [Serialize]
+    public string DescriptionLocKey { get; init; }
+
+    [Serialize]
+    public bool Hidden { get; init; } = false;
+
+    [Serialize]
+    public bool DevMode { get; init; } = false;
+}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/ToolSpecificationService.cs b/Src/TimberApi.Tools/ToolSystem/ToolSpecService.cs
similarity index 58%
rename from Src/TimberApi.Tools/ToolSystem/ToolSpecificationService.cs
rename to Src/TimberApi.Tools/ToolSystem/ToolSpecService.cs
index 16bf1d26..7c917d51 100644
--- a/Src/TimberApi.Tools/ToolSystem/ToolSpecificationService.cs
+++ b/Src/TimberApi.Tools/ToolSystem/ToolSpecService.cs
@@ -2,29 +2,26 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using Timberborn.Persistence;
+using Timberborn.BlueprintSystem;
 using Timberborn.SingletonSystem;
 
 namespace TimberApi.Tools.ToolSystem;
 
-public class ToolSpecificationService(
-    ISpecificationService specificationService,
-    ToolSpecificationDeserializer toolSpecificationDeserializer)
-    : ILoadableSingleton
+public class ToolSpecService(ISpecService specService) : ILoadableSingleton
 {
-    private ImmutableDictionary<string, ToolSpecification> _toolSpecifications = null!;
+    private ImmutableDictionary<string, ToolSpec> _toolSpecifications = null!;
 
-    public ImmutableArray<ToolSpecification> ToolSpecifications =>
+    public ImmutableArray<ToolSpec> ToolSpecifications =>
         _toolSpecifications.Select(pair => pair.Value).ToImmutableArray();
 
     public void Load()
     {
-        _toolSpecifications = specificationService.GetSpecifications(toolSpecificationDeserializer)
-            .Where(specification => specification.Scenes.Contains(SceneManager.CurrentScene.ToString()))
+        _toolSpecifications = specService.GetSpecs<ToolSpec>()
+            .Where(toolSpec => toolSpec.Scenes.Contains(ContextManager.CurrentContext))
             .ToImmutableDictionary(specification => specification.Id.ToLower());
     }
 
-    public ToolSpecification Get(string id)
+    public ToolSpec Get(string id)
     {
         if (!_toolSpecifications.TryGetValue(id.ToLower(), out var toolSpecification))
             throw new KeyNotFoundException($"The given ToolId ({id.ToLower()}) cannot be found.");
@@ -32,21 +29,21 @@ public ToolSpecification Get(string id)
         return toolSpecification;
     }
 
-    public IEnumerable<ToolSpecification> GetByGroupId(string groupId)
+    public IEnumerable<ToolSpec> GetByGroupId(string groupId)
     {
         return _toolSpecifications
             .Where(pair => pair.Value.GroupId?.ToLower() == groupId.ToLower())
             .Select(pair => pair.Value);
     }
 
-    public IEnumerable<ToolSpecification> GetBySection(string section)
+    public IEnumerable<ToolSpec> GetBySection(string section)
     {
         return _toolSpecifications
             .Where(pair => string.Equals(pair.Value.Section, section, StringComparison.CurrentCultureIgnoreCase))
             .Select(pair => pair.Value);
     }
 
-    public IEnumerable<ToolSpecification> GetByType(string type)
+    public IEnumerable<ToolSpec> GetByType(string type)
     {
         return _toolSpecifications
             .Where(pair => string.Equals(pair.Value.Type, type, StringComparison.CurrentCultureIgnoreCase))
diff --git a/Src/TimberApi.Tools/ToolSystem/ToolSpecification.cs b/Src/TimberApi.Tools/ToolSystem/ToolSpecification.cs
deleted file mode 100644
index 01fad261..00000000
--- a/Src/TimberApi.Tools/ToolSystem/ToolSpecification.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using Timberborn.SerializationSystem;
-
-namespace TimberApi.Tools.ToolSystem;
-
-public class ToolSpecification(
-    string id,
-    string? groupId,
-    IEnumerable<string> scenes,
-    string section,
-    string type,
-    string layout,
-    int order,
-    string icon,
-    string nameLocKey,
-    string descriptionLocKey,
-    bool hidden,
-    bool devMode,
-    ObjectSave? toolInformation)
-    : ToolSpecification<ObjectSave>(id, groupId, scenes, section, type, layout, order, icon, nameLocKey, descriptionLocKey,
-        hidden, devMode,
-        toolInformation);
-
-public class ToolSpecification<T>(
-    string id,
-    string? groupId,
-    IEnumerable<string> scenes,
-    string section,
-    string type,
-    string layout, 
-    int order,
-    string icon,
-    string nameLocKey,
-    string descriptionLocKey,
-    bool hidden,
-    bool devMode,
-    T? toolInformation)
-{
-    public string Id { get; } = id;
-
-    public string? GroupId { get; } = groupId;
-    
-    public HashSet<string> Scenes { get; } = scenes.ToHashSet();
-
-    public string Section { get; } = section;
-
-    public string Type { get; } = type;
-
-    public string Layout { get; } = layout;
-
-    public int Order { get; } = order;
-
-    public string Icon { get; } = icon;
-
-    public string NameLocKey { get; } = nameLocKey;
-
-    public string DescriptionLocKey { get; } = descriptionLocKey;
-
-    public bool Hidden { get; } = hidden;
-
-    public bool DevMode { get; } = devMode;
-
-    public T? ToolInformation { get; } = toolInformation;
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/ToolSpecificationDeserliaser.cs b/Src/TimberApi.Tools/ToolSystem/ToolSpecificationDeserliaser.cs
deleted file mode 100644
index 1c70c611..00000000
--- a/Src/TimberApi.Tools/ToolSystem/ToolSpecificationDeserliaser.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TimberApi.Extensions;
-using Timberborn.Persistence;
-using Timberborn.SerializationSystem;
-
-namespace TimberApi.Tools.ToolSystem;
-
-public class ToolSpecificationDeserializer : IObjectSerializer<ToolSpecification>
-{
-    public void Serialize(ToolSpecification value, IObjectSaver objectSaver)
-    {
-        throw new NotImplementedException();
-    }
-
-    public Obsoletable<ToolSpecification> Deserialize(IObjectLoader objectLoader)
-    {
-        return new ToolSpecification(
-            objectLoader.Get(new PropertyKey<string>("Id")),
-            objectLoader.GetValueOrNull(new PropertyKey<string>("GroupId")),
-            objectLoader.GetValueOrDefault(new ListKey<string>("Scenes"), ["Game"]),
-            objectLoader.GetValueOrDefault(new PropertyKey<string>("Section"), "BottomBar"),
-            objectLoader.Get(new PropertyKey<string>("Type")),
-            objectLoader.GetValueOrDefault(new PropertyKey<string>("Layout"), "Default"),
-            objectLoader.Get(new PropertyKey<int>("Order")),
-            objectLoader.Get(new PropertyKey<string>("Icon")),
-            objectLoader.Get(new PropertyKey<string>("NameLocKey")),
-            objectLoader.Get(new PropertyKey<string>("DescriptionLocKey")),
-            objectLoader.GetValueOrDefault(new PropertyKey<bool>("Hidden"), false),
-            objectLoader.GetValueOrDefault(new PropertyKey<bool>("DevMode"), false),
-            GetToolInformationObjectSave(objectLoader)
-        );
-    }
-
-    private static ObjectSave? GetToolInformationObjectSave(IObjectLoader objectLoader)
-    {
-        if (!objectLoader.Has(new PropertyKey<ObjectSave>("ToolInformation"))) return null;
-
-        return ((ObjectLoader)objectLoader)._objectSave.Get<ObjectSave>("ToolInformation");
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/ToolSystemConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/ToolSystemConfigurator.cs
index 4d825c51..14677af1 100644
--- a/Src/TimberApi.Tools/ToolSystem/ToolSystemConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/ToolSystemConfigurator.cs
@@ -3,14 +3,13 @@
 namespace TimberApi.Tools.ToolSystem;
 
 [Context("Game")]
-[Context("MapEditor")]
-public class ToolSystemConfigurator : IConfigurator
+// [Context("MapEditor")]
+public class ToolSystemConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<ToolService>().AsSingleton();
-        containerDefinition.Bind<ToolSpecificationDeserializer>().AsSingleton();
-        containerDefinition.Bind<ToolFactoryService>().AsSingleton();
-        containerDefinition.Bind<ToolSpecificationService>().AsSingleton();
+        Bind<ToolService>().AsSingleton();
+        Bind<ToolFactoryService>().AsSingleton();
+        Bind<ToolSpecService>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/BeaverGenerator/BeaverGeneratorToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/BeaverGenerator/BeaverGeneratorToolConfigurator.cs
index 797c1f8e..85807432 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/BeaverGenerator/BeaverGeneratorToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/BeaverGenerator/BeaverGeneratorToolConfigurator.cs
@@ -4,10 +4,10 @@
 namespace TimberApi.Tools.ToolSystem.Tools.BeaverGenerator;
 
 [Context("Game")]
-internal class BeaverGeneratorToolConfigurator : IConfigurator
+internal class BeaverGeneratorToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<BeaverGeneratorToolGenerator>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<BeaverGeneratorToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/BeaverGenerator/BeaverGeneratorToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/BeaverGenerator/BeaverGeneratorToolGenerator.cs
index 1f59d257..41ae6c90 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/BeaverGenerator/BeaverGeneratorToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/BeaverGenerator/BeaverGeneratorToolGenerator.cs
@@ -5,28 +5,33 @@
 
 namespace TimberApi.Tools.ToolSystem.Tools.BeaverGenerator;
 
-internal class BeaverGeneratorToolGenerator : ISpecificationGenerator
+internal class BeaverGeneratorToolGenerator : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "BeaverGenerator",
-            Type = "GenericTool",
-            Layout = "GrouplessRed",
-            Order = 60,
-            NameLocKey = "Cursor",
-            DescriptionLocKey = "Cursor",
-            Icon = "Sprites/BottomBar/BeaverGeneratorTool",
-            DevMode = true,
-            Hidden = false,
-            ToolInformation = new
+            ToolSpec = new
             {
-                BottomBarSection = 0,
+                Id = "BeaverGenerator",
+                Type = "GenericTool",
+                Layout = "GrouplessRed",
+                Order = 60,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/BeaverGeneratorTool",
+                DevMode = true,
+                Hidden = false,
+            },
+            GenericToolSpec = new {
                 ClassName = typeof(BeaverGeneratorTool).FullName
+            },
+            BottomBarSpec = new
+            {
+                Section = 0,
             }
         });
 
-        yield return new GeneratedSpecification("tools", "ToolSpecification.BeaverGenerator", json);
+        yield return new GeneratedSpec("tools", "Tool.BeaverGenerator", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/BotGenerator/BotGeneratorToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/BotGenerator/BotGeneratorToolConfigurator.cs
index 4aa2d90c..d8fb7ae5 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/BotGenerator/BotGeneratorToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/BotGenerator/BotGeneratorToolConfigurator.cs
@@ -4,10 +4,10 @@
 namespace TimberApi.Tools.ToolSystem.Tools.BotGenerator;
 
 [Context("Game")]
-public class BotGeneratorToolConfigurator : IConfigurator
+public class BotGeneratorToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<BotGeneratorToolGenerator>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<BotGeneratorToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/BotGenerator/BotGeneratorToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/BotGenerator/BotGeneratorToolGenerator.cs
index af6467d4..2c92086c 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/BotGenerator/BotGeneratorToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/BotGenerator/BotGeneratorToolGenerator.cs
@@ -5,28 +5,33 @@
 
 namespace TimberApi.Tools.ToolSystem.Tools.BotGenerator;
 
-public class BotGeneratorToolGenerator : ISpecificationGenerator
+public class BotGeneratorToolGenerator : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "BotGenerator",
-            Type = "GenericTool",
-            Layout = "GrouplessRed",
-            Order = 70,
-            NameLocKey = "Cursor",
-            DescriptionLocKey = "Cursor",
-            Icon = "Sprites/BottomBar/BotGeneratorTool",
-            DevMode = true,
-            Hidden = false,
-            ToolInformation = new
+            ToolSpec = new
             {
-                BottomBarSection = 0,
+                Id = "BotGenerator",
+                Type = "GenericTool",
+                Layout = "GrouplessRed",
+                Order = 70,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/BotGeneratorTool",
+                DevMode = true,
+                Hidden = false,
+            },
+            GenericToolSpec = new {
                 ClassName = typeof(BotGeneratorTool).FullName
+            },
+            BottomBarSpec = new
+            {
+                Section = 0,
             }
         });
-
-        yield return new GeneratedSpecification("Tools", "ToolSpecification.BotGenerator", json);
+        
+        yield return new GeneratedSpec("Tools", "Tool.BotGenerator", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolConfigurator.cs
index 3e7f917e..16b5319d 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolConfigurator.cs
@@ -4,11 +4,11 @@
 namespace TimberApi.Tools.ToolSystem.Tools.BuilderPriority;
 
 [Context("Game")]
-public class BuilderPriorityToolConfigurator : IConfigurator
+public class BuilderPriorityToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<IToolFactory>().To<BuilderPriorityToolFactory>().AsSingleton();
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<BuilderPriorityToolGenerator>().AsSingleton();
+        MultiBind<IToolFactory>().To<BuilderPriorityToolFactory>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<BuilderPriorityToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolFactory.cs
index d52c59b5..534a64fc 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolFactory.cs
@@ -1,25 +1,23 @@
-using Timberborn.Persistence;
+using System;
+using Timberborn.PrioritySystem;
 using Timberborn.ToolSystem;
 using TimberbornBuilderPriorityToolFactory = Timberborn.BuilderPrioritySystemUI.BuilderPriorityToolFactory;
 
 namespace TimberApi.Tools.ToolSystem.Tools.BuilderPriority;
 
-public class BuilderPriorityToolFactory(TimberbornBuilderPriorityToolFactory builderPriorityToolFactory)
-    : BaseToolFactory<BuilderPriorityToolToolInformation>
+public class BuilderPriorityToolFactory(TimberbornBuilderPriorityToolFactory builderPriorityToolFactory) : IToolFactory
 {
-    public override string Id => "PriorityTool";
-
-    protected override Tool CreateTool(ToolSpecification toolSpecification,
-        BuilderPriorityToolToolInformation toolInformation, ToolGroup? toolGroup)
+    public string Id => "PriorityTool";
+    
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
-        var priorityTool = builderPriorityToolFactory.Create(toolInformation.Priority);
+        var builderPriorityToolSpec = toolSpec.GetSpec<PriorityToolSpec>();
+
+        Enum.TryParse(builderPriorityToolSpec.Priority, out Priority priority);
+        
+        var priorityTool = builderPriorityToolFactory.Create(priority);
         priorityTool.ToolGroup = toolGroup;
 
         return priorityTool;
     }
-
-    protected override BuilderPriorityToolToolInformation DeserializeToolInformation(IObjectLoader objectLoader)
-    {
-        return new BuilderPriorityToolToolInformation(objectLoader.Get(new PropertyKey<string>("Priority")));
-    }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolGenerator.cs
index 85cec0ac..0b499d97 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolGenerator.cs
@@ -1,60 +1,68 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using TimberApi.SpecificationSystem;
+using Timberborn.BlueprintSystem;
 using Timberborn.PrioritySystem;
+using UnityEngine;
 
 namespace TimberApi.Tools.ToolSystem.Tools.BuilderPriority;
 
-public class BuilderPriorityToolGenerator : ISpecificationGenerator
+public class BuilderPriorityToolGenerator : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
         foreach (var priority in Priorities.Ascending)
         {
             var json = JsonConvert.SerializeObject(new
             {
-                Id = priority,
-                GroupId = "Priority",
-                Type = "PriorityTool",
-                Layout = "Default",
-                Order = (int)priority,
-                Icon = $"Sprites/Priority/Buttons/{priority}",
-                NameLocKey = "CAN NOT BE MODIFIED",
-                DescriptionLocKey = "CAN NOT BE MODIFIED",
-                Hidden = false,
-                DevMode = false,
-                ToolInformation = new
+                ToolSpec = new
+                {
+                    Id = priority,
+                    GroupId = "Priority",
+                    Type = "PriorityTool",
+                    Layout = "Default",
+                    Order = (int)priority,
+                    Icon = $"Sprites/Priority/Buttons/{priority}",
+                    NameLocKey = "Tool.FixedName",
+                    DescriptionLocKey = "Tool.FixedDescription",
+                    Hidden = false,
+                    DevMode = false,
+                },
+                PriorityToolSpec = new
                 {
                     Priority = priority
                 }
             });
-
-            yield return new GeneratedSpecification("Tools", $"ToolSpecification.{priority.ToString()}", json);
+        
+            yield return new GeneratedSpec("Tools", $"Tool.{priority.ToString()}", json);
         }
 
         yield return CreatePriorityToolGroup();
     }
 
-    private static GeneratedSpecification CreatePriorityToolGroup()
+    private static GeneratedSpec CreatePriorityToolGroup()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "Priority",
-            Layout = "Blue",
-            Order = 50,
-            Type = "BuilderPriorityToolGroup",
-            NameLocKey = "ToolGroups.Priority",
-            Icon = "Sprites/BottomBar/PriorityToolGroupIcon",
-            Section = "BottomBar",
-            DevMode = false,
-            Hidden = false,
-            FallbackGroup = false,
-            GroupInformation = new
+            TimberApiToolGroupSpec = new
+            {
+                Id = "Priority",
+                Order = 50,
+                NameLocKey = "ToolGroups.Priority",
+                Icon = "Sprites/BottomBar/PriorityToolGroupIcon",
+                FallbackGroup = false,
+                Type = "BuilderPriorityToolGroup",
+                Layout = "Blue",
+                Section = "BottomBar",
+                DevMode = false,
+                Hidden = false,
+            },
+            BottomBarSpec = new
             {
-                BottomBarSection = 0
+                Section = 0,
             }
         });
 
-        return new GeneratedSpecification("Tools", "ToolGroupSpecification.Priority", json);
+        return new GeneratedSpec("ToolGroups", "TimberApiToolGroup.Priority", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolToolInformation.cs b/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolToolInformation.cs
deleted file mode 100644
index bbe74024..00000000
--- a/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolToolInformation.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using Timberborn.PrioritySystem;
-using UnityEngine;
-
-namespace TimberApi.Tools.ToolSystem.Tools.BuilderPriority;
-
-public class BuilderPriorityToolToolInformation
-{
-    public BuilderPriorityToolToolInformation(string priority)
-    {
-        if (Enum.TryParse(priority, out Priority result))
-        {
-            Priority = result;
-        }
-        else
-        {
-            Debug.LogWarning($"Priority {priority} is not not a valid priority. Defaulting back to Normal");
-            Priority = Priority.Normal;
-        }
-    }
-
-    public Priority Priority { get; }
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/PriorityToolSpec.cs b/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/PriorityToolSpec.cs
new file mode 100644
index 00000000..ee5026fa
--- /dev/null
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/BuilderPriority/PriorityToolSpec.cs
@@ -0,0 +1,9 @@
+using Timberborn.BlueprintSystem;
+
+namespace TimberApi.Tools.ToolSystem.Tools.BuilderPriority;
+
+public record PriorityToolSpec : ComponentSpec
+{
+    [Serialize]
+    public string Priority { get; init; }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolConfigurator.cs
index 4ec397a9..d8ac3abc 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolConfigurator.cs
@@ -4,11 +4,11 @@
 namespace TimberApi.Tools.ToolSystem.Tools.CancelPlanting;
 
 [Context("Game")]
-public class CancelPlantingToolConfigurator : IConfigurator
+public class CancelPlantingToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<IToolFactory>().To<CancelPlantingToolFactory>().AsSingleton();
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<CancelPlantingToolGenerator>().AsSingleton();
+        MultiBind<IToolFactory>().To<CancelPlantingToolFactory>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<CancelPlantingToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolFactory.cs
index f432e034..a42a50c5 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolFactory.cs
@@ -13,7 +13,7 @@ public class CancelPlantingToolFactory(
 {
     public string Id => "CancelPlantingTool";
 
-    public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
         return new CancelPlantingTool(plantingSelectionService, loc, selectionToolProcessorFactory, toolGroup);
     }
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolGenerator.cs
index a6a20ce2..d1d65179 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/CancelPlanting/CancelPlantingToolGenerator.cs
@@ -1,52 +1,63 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using TimberApi.SpecificationSystem;
+using Timberborn.ToolSystem;
 
 namespace TimberApi.Tools.ToolSystem.Tools.CancelPlanting;
 
-public class CancelPlantingToolGenerator : ISpecificationGenerator
+public class CancelPlantingToolGenerator : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
         yield return FieldsCancelPlantingTool();
         yield return ForestryCancelPlantingTool();
     }
 
-    private static GeneratedSpecification ForestryCancelPlantingTool()
+    private static GeneratedSpec ForestryCancelPlantingTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "ForestryCancelPlanting",
-            GroupId = "Forestry",
-            Type = "CancelPlantingTool",
-            Layout = "Default",
-            Order = 1000,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/CancelToolIcon",
-            DevMode = false,
-            Hidden = false
+            ToolSpec = new
+            {
+                Id = "ForestryCancelPlanting",
+                GroupId = "Forestry",
+                Type = "CancelPlantingTool",
+                Layout = "Default",
+                Order = 1000,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/CancelToolIcon",
+                DevMode = false,
+                Hidden = false
+            }
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.ForestryCancelPlanting", json);
+        return new GeneratedSpec("Tools", "Tool.ForestryCancelPlanting", json);
     }
 
-    private static GeneratedSpecification FieldsCancelPlantingTool()
+    private static GeneratedSpec FieldsCancelPlantingTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "FieldsCancelPlanting",
-            GroupId = "Fields",
-            Type = "CancelPlantingTool",
-            Layout = "Default",
-            Order = 1000,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/CancelToolIcon",
-            DevMode = false,
-            Hidden = false
+            ToolSpec = new
+            {
+                Id = "FieldsCancelPlanting",
+                GroupId = "Fields",
+                Type = "CancelPlantingTool",
+                Layout = "Default",
+                Order = 1000,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/CancelToolIcon",
+                DevMode = false,
+                Hidden = false
+            },
+            BottomBarSpec = new
+            {
+                Section = 1,
+            }
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.FieldsCancelPlanting", json);
+        return new GeneratedSpec("Tools", "Tool.FieldsCancelPlanting", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Cursor/CursorToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Cursor/CursorToolConfigurator.cs
index 48baf927..de460152 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Cursor/CursorToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Cursor/CursorToolConfigurator.cs
@@ -4,10 +4,10 @@
 namespace TimberApi.Tools.ToolSystem.Tools.Cursor;
 
 [Context("Game")]
-public class CursorToolConfigurator : IConfigurator
+public class CursorToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<CursorToolGenerator>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<CursorToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Cursor/CursorToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Cursor/CursorToolGenerator.cs
index 203bd346..f05d4205 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Cursor/CursorToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Cursor/CursorToolGenerator.cs
@@ -5,28 +5,33 @@
 
 namespace TimberApi.Tools.ToolSystem.Tools.Cursor;
 
-public class CursorToolGenerator : ISpecificationGenerator
+public class CursorToolGenerator : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "Cursor",
-            Type = "GenericTool",
-            Layout = "GrouplessRed",
-            Order = 0,
-            NameLocKey = "Cursor",
-            DescriptionLocKey = "Cursor",
-            Icon = "Sprites/BottomBar/Cursor",
-            DevMode = false,
-            Hidden = false,
-            ToolInformation = new
+            ToolSpec = new
             {
-                BottomBarSection = 0,
-                ClassName = typeof(CursorTool).FullName,
-            }
+                Id = "Cursor",
+                Type = "GenericTool",
+                Layout = "GrouplessRed",
+                Order = 0,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/Cursor",
+                DevMode = false,
+                Hidden = false,
+            },
+            GenericToolSpec = new {
+                ClassName = typeof(CursorTool).FullName
+            },
+            BottomBarSpec = new
+            {
+                Section = 0,
+            },
         });
 
-        yield return new GeneratedSpecification("Tools", "ToolSpecification.Cursor", json);
+        yield return new GeneratedSpec("Tools", "Tool.Cursor", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/BuildingDeconstructionToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/BuildingDeconstructionToolFactory.cs
index 5c30fb60..90cba702 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/BuildingDeconstructionToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/BuildingDeconstructionToolFactory.cs
@@ -7,7 +7,7 @@ public class BuildingDeconstructionToolFactory(BuildingDeconstructionTool buildi
 {
     public string Id => "BuildingDeconstructionTool";
 
-    public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
         buildingDeconstructionTool.Initialize(toolGroup);
         return buildingDeconstructionTool;
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DeleteRubbleToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DeleteRubbleToolFactory.cs
index f967c44e..75aaf5fb 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DeleteRubbleToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DeleteRubbleToolFactory.cs
@@ -8,7 +8,7 @@ public class DeleteRubbleToolFactory(RecoveredGoodStackDeletionTool recoveredGoo
 {
     public string Id => "DeleteRecoveredGoodStackTool";
 
-    public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
         recoveredGoodStackDeletionTool.Initialize(toolGroup);
         return recoveredGoodStackDeletionTool;
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishableSelectionToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishableSelectionToolFactory.cs
index f47f4bde..d63cc8e1 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishableSelectionToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishableSelectionToolFactory.cs
@@ -7,7 +7,7 @@ public class DemolishableSelectionToolFactory(DemolishableSelectionTool demolish
 {
     public string Id => "DemolishableSelectionTool";
 
-    public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
         demolishableSelectionTool.Initialize(toolGroup);
         return demolishableSelectionTool;
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishableUnselectionToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishableUnselectionToolFactory.cs
index 4ef52fb7..a7cf68d9 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishableUnselectionToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishableUnselectionToolFactory.cs
@@ -7,7 +7,7 @@ public class DemolishableUnselectionToolFactory(DemolishableUnselectionTool demo
 {
     public string Id => "DemolishableUnselectionTool";
 
-    public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
         demolishableUnselectionTool.Initialize(toolGroup);
         return demolishableUnselectionTool;
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishingToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishingToolConfigurator.cs
index 75526b19..8bc599cb 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishingToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishingToolConfigurator.cs
@@ -4,15 +4,15 @@
 namespace TimberApi.Tools.ToolSystem.Tools.Demolishing;
 
 [Context("Game")]
-public class DemolishingToolConfigurator : IConfigurator
+public class DemolishingToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<IToolFactory>().To<DemolishableUnselectionToolFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolFactory>().To<DemolishableSelectionToolFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolFactory>().To<EntityBlockObjectDeletionToolFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolFactory>().To<BuildingDeconstructionToolFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolFactory>().To<DeleteRubbleToolFactory>().AsSingleton();
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<DemolishingToolGenerator>().AsSingleton();
+        MultiBind<IToolFactory>().To<DemolishableUnselectionToolFactory>().AsSingleton();
+        MultiBind<IToolFactory>().To<DemolishableSelectionToolFactory>().AsSingleton();
+        MultiBind<IToolFactory>().To<EntityBlockObjectDeletionToolFactory>().AsSingleton();
+        MultiBind<IToolFactory>().To<BuildingDeconstructionToolFactory>().AsSingleton();
+        MultiBind<IToolFactory>().To<DeleteRubbleToolFactory>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<DemolishingToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishingToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishingToolGenerator.cs
index 218ba973..e2b5979b 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishingToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/DemolishingToolGenerator.cs
@@ -4,9 +4,9 @@
 
 namespace TimberApi.Tools.ToolSystem.Tools.Demolishing;
 
-public class DemolishingToolGenerator : ISpecificationGenerator
+public class DemolishingToolGenerator : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
         yield return CreateDemolishingToolGroup();
         yield return DemolishableSelectionTool();
@@ -16,121 +16,155 @@ public IEnumerable<GeneratedSpecification> Generate()
         yield return EntityBlockObjectDeletionTool();
     }
 
-    private static GeneratedSpecification EntityBlockObjectDeletionTool()
+    private static GeneratedSpec EntityBlockObjectDeletionTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "EntityBlockObjectDeletion",
-            GroupId = "Demolishing",
-            Type = "EntityBlockObjectDeletionTool",
-            Layout = "Default",
-            Order = 30,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/DeleteObjectIcon",
-            DevMode = false,
-            Hidden = false
+            ToolSpec = new
+            {
+                Id = "EntityBlockObjectDeletion",
+                GroupId = "Demolishing",
+                Type = "EntityBlockObjectDeletionTool",
+                Layout = "Default",
+                Order = 30,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/DeleteObjectIcon",
+                DevMode = false,
+                Hidden = false
+            },
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.EntityBlockObjectDeletion", json);
+        return new GeneratedSpec("Tools", "Tool.EntityBlockObjectDeletion", json);
     }
 
-    private static GeneratedSpecification DeleteRecoveredGoodStackTool()
+    private static GeneratedSpec DeleteRecoveredGoodStackTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "DeleteRecoveredGoodStack",
-            GroupId = "Demolishing",
-            Type = "DeleteRecoveredGoodStackTool",
-            Layout = "Default",
-            Order = 10,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/DeleteRecoveredGoodStackToolIcon",
-            DevMode = false,
-            Hidden = false
+            ToolSpec = new
+            {
+                Id = "DeleteRecoveredGoodStack",
+                GroupId = "Demolishing",
+                Type = "DeleteRecoveredGoodStackTool",
+                Layout = "Default",
+                Order = 10,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/DeleteRecoveredGoodStackToolIcon",
+                DevMode = false,
+                Hidden = false,
+            },
+            BottomBarSpec = new
+            {
+                Section = 1,
+            },
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.DeleteRecoveredGoodStack", json);
+        return new GeneratedSpec("Tools", "Tool.DeleteRecoveredGoodStack", json);
     }
 
-    private static GeneratedSpecification BuildingDeconstructionTool()
+    private static GeneratedSpec BuildingDeconstructionTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "BuildingDeconstruction",
-            GroupId = "Demolishing",
-            Type = "BuildingDeconstructionTool",
-            Layout = "Default",
-            Order = 0,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/DeleteObjectIcon",
-            DevMode = false,
-            Hidden = false
+            ToolSpec = new
+            {
+                Id = "BuildingDeconstruction",
+                GroupId = "Demolishing",
+                Type = "BuildingDeconstructionTool",
+                Layout = "Default",
+                Order = 0,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/DeleteObjectIcon",
+                DevMode = false,
+                Hidden = false,
+            },
+            BottomBarSpec = new
+            {
+                Section = 1,
+            },
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.BuildingDeconstruction", json);
+        return new GeneratedSpec("Tools", "Tool.BuildingDeconstruction", json);
     }
 
-    private static GeneratedSpecification DemolishableSelectionTool()
+    private static GeneratedSpec DemolishableSelectionTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "DemolishableSelection",
-            GroupId = "Demolishing",
-            Type = "DemolishableSelectionTool",
-            Layout = "Default",
-            Order = 20,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/DemolishResourcesTool",
-            DevMode = false,
-            Hidden = false
+            ToolSpec = new
+            {
+                Id = "DemolishableSelection",
+                GroupId = "Demolishing",
+                Type = "DemolishableSelectionTool",
+                Layout = "Default",
+                Order = 20,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/DemolishResourcesTool",
+                DevMode = false,
+                Hidden = false
+            },
+            BottomBarSpec = new
+            {
+                Section = 1,
+            }
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.DemolishableSelection", json);
+        return new GeneratedSpec("Tools", "Tool.DemolishableSelection", json);
     }
 
-    private static GeneratedSpecification DemolishableUnselectionTool()
+    private static GeneratedSpec DemolishableUnselectionTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "DemolishableUnselection",
-            GroupId = "Demolishing",
-            Type = "DemolishableUnselectionTool",
-            Layout = "Default",
-            Order = 1000,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/CancelToolIcon",
-            DevMode = false,
-            Hidden = false
+            ToolSpec = new
+            {
+                Id = "DemolishableUnselection",
+                GroupId = "Demolishing",
+                Type = "DemolishableUnselectionTool",
+                Layout = "Default",
+                Order = 1000,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/CancelToolIcon",
+                DevMode = false,
+                Hidden = false
+            },
+            BottomBarSpec = new
+            {
+                Section = 1,
+            }
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.DemolishableUnselection", json);
+        return new GeneratedSpec("Tools", "Tool.DemolishableUnselection", json);
     }
 
-    private static GeneratedSpecification CreateDemolishingToolGroup()
+    private static GeneratedSpec CreateDemolishingToolGroup()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "Demolishing",
-            Layout = "Blue",
-            Order = 40,
-            Type = "ConstructionModeToolGroup",
-            NameLocKey = "ToolGroups.Demolishing",
-            Icon = "Sprites/BottomBar/DeleteGroupIcon",
-            Section = "BottomBar",
-            DevMode = false,
-            Hidden = false,
-            FallbackGroup = false,
-            GroupInformation = new
+            TimberApiToolGroupSpec = new
+            {
+                Id = "Demolishing",
+                Order = 40,
+                NameLocKey = "ToolGroups.Demolishing",
+                Icon = "Sprites/BottomBar/DeleteGroupIcon",
+                FallbackGroup = false,
+                Type = "ConstructionModeToolGroup",
+                Layout = "Blue",
+                Section = "BottomBar",
+                DevMode = false,
+                Hidden = false,
+            },
+            BottomBarSpec = new
             {
-                BottomBarSection = 0
+                Section = 0,
             }
         });
 
-        return new GeneratedSpecification("Tools", "ToolGroupSpecification.Demolishing", json);
+        return new GeneratedSpec("ToolGroups", "TimberApiToolGroup.Demolishing", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/EntityBlockObjectDeletionToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/EntityBlockObjectDeletionToolFactory.cs
index f3c501a7..6c4d3eb2 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/EntityBlockObjectDeletionToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Demolishing/EntityBlockObjectDeletionToolFactory.cs
@@ -8,7 +8,7 @@ public class EntityBlockObjectDeletionToolFactory(EntityBlockObjectDeletionTool
 {
     public string Id => "EntityBlockObjectDeletionTool";
 
-    public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
         entityBlockObjectDeletionTool.Initialize(toolGroup);
         return entityBlockObjectDeletionTool;
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolConfigurator.cs
index 77de2c7b..c4eb0794 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolConfigurator.cs
@@ -5,10 +5,10 @@
 namespace TimberApi.Tools.ToolSystem.Tools.GenericTool;
 
 [Context("Game")]
-public class GenericToolConfigurator : IConfigurator
+public class GenericToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<IToolFactory>().To<GenericToolFactory>().AsSingleton();
+        MultiBind<IToolFactory>().To<GenericToolFactory>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolFactory.cs
index 47255e5d..5ec3704e 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolFactory.cs
@@ -3,24 +3,23 @@
 using System.Linq;
 using TimberApi.DependencyContainerSystem;
 using TimberApi.SingletonSystem;
-using Timberborn.Persistence;
 using Timberborn.ToolSystem;
 
 namespace TimberApi.Tools.ToolSystem.Tools.GenericTool;
 
-public class GenericToolFactory : BaseToolFactory<GenericToolToolInformation>, IEarlyLoadableSingleton
+public class GenericToolFactory : IToolFactory, IEarlyLoadableSingleton
 {
-    private readonly PropertyKey<string> _classnameKey = new("ClassName");
+    public string Id => "GenericTool";
     
-    public override string Id => "GenericTool";
-
     private List<Type> _toolTypes = null!;
-
-    protected override Tool CreateTool(ToolSpecification toolSpecification, GenericToolToolInformation toolInformation, ToolGroup? toolGroup)
+    
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
-        if (DependencyContainer.GetInstance(GetTypeFromName(toolInformation.ClassName)) is not Tool tool)
+        var genericToolSpec = toolSpec.GetSpec<GenericToolSpec>();
+        
+        if (DependencyContainer.GetInstance(GetTypeFromName(genericToolSpec.ClassName)) is not Tool tool)
         {
-            throw new Exception($"GenericToolFactory could not find the Tool {toolInformation.ClassName}");
+            throw new Exception($"GenericToolFactory could not find the Tool {genericToolSpec.ClassName}");
         }
         
         tool.ToolGroup = toolGroup;
@@ -28,11 +27,6 @@ protected override Tool CreateTool(ToolSpecification toolSpecification, GenericT
         return tool;
     }
 
-    protected override GenericToolToolInformation DeserializeToolInformation(IObjectLoader objectLoader)
-    {
-        return new GenericToolToolInformation(objectLoader.Get(_classnameKey));
-    }
-    
     public void EarlyLoad()
     {
         _toolTypes = AppDomain.CurrentDomain
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolSpec.cs b/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolSpec.cs
new file mode 100644
index 00000000..c6d3741e
--- /dev/null
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolSpec.cs
@@ -0,0 +1,9 @@
+using Timberborn.BlueprintSystem;
+
+namespace TimberApi.Tools.ToolSystem.Tools.GenericTool;
+
+public record GenericToolSpec : ComponentSpec
+{
+    [Serialize]
+    public string ClassName { get; init; }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolToolInformation.cs b/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolToolInformation.cs
deleted file mode 100644
index 3997ee01..00000000
--- a/Src/TimberApi.Tools/ToolSystem/Tools/GenericTool/GenericToolToolInformation.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace TimberApi.Tools.ToolSystem.Tools.GenericTool;
-
-public class GenericToolToolInformation(string className)
-{
-    public string ClassName { get; } = className;
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolFactory.cs
index 6f49bf58..fb8fa7d5 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolFactory.cs
@@ -1,55 +1,43 @@
+using System;
 using System.Linq;
 using Timberborn.AreaSelectionSystem;
 using Timberborn.BlockObjectTools;
 using Timberborn.BlockSystem;
 using Timberborn.InputSystem;
-using Timberborn.Persistence;
 using Timberborn.PrefabSystem;
 using Timberborn.ToolSystem;
 using Timberborn.UISound;
+using UnityEngine;
 
 namespace TimberApi.Tools.ToolSystem.Tools.PlaceableObject;
 
 public class PlaceableObjectToolFactory(
     PrefabService prefabService,
-    InputService inputService,
-    PreviewPlacerFactory previewPlacerFactory,
-    UISoundController uiSoundController,
-    ToolUnlockingService toolUnlockingService,
     BlockObjectToolDescriber blockObjectToolDescriber,
-    AreaPickerFactory areaPickerFactory,
-    BlockObjectPlacerService blockObjectPlacerService)
-    : BaseToolFactory<PlaceableObjectToolToolInformation>
+    BlockObjectPlacerService blockObjectPlacerService,
+    BlockObjectToolFactory blockObjectToolFactory) : IToolFactory
 {
-    public override string Id => "PlaceableObjectTool";
-
-    protected override Tool CreateTool(ToolSpecification toolSpecification,
-        PlaceableObjectToolToolInformation toolInformation, ToolGroup? toolGroup)
+    public string Id => "PlaceableObjectTool";
+    
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
-        var prefab = prefabService.GetAll<Prefab>().Single(o => o.IsNamed(toolInformation.PrefabName));
-        var placeableBlockObject = prefab.GetComponentFast<PlaceableBlockObject>();
+        var placeableObjectToolSpec = toolSpec.GetSpec<PlaceableObjectToolSpec>();
 
-        placeableBlockObject._devModeTool = toolSpecification.DevMode;
-        placeableBlockObject._toolOrder = toolSpecification.Order;
+        var prefab = prefabService.GetAll<PrefabSpec>().Single(o => o.IsNamed(placeableObjectToolSpec.PrefabName));
         
-        var matchingPlacer = blockObjectPlacerService.GetMatchingPlacer(prefab.GetComponentFast<BlockObject>());
-        var previewPlacer = previewPlacerFactory.Create(placeableBlockObject);
+        var placeableBlockObject = prefab.GetComponentFast<PlaceableBlockObjectSpec>();
+
+        placeableBlockObject._devModeTool = toolSpec.DevMode;
+        placeableBlockObject._toolOrder = toolSpec.Order;
         
-        return new BlockObjectTool(
+        var matchingPlacer = blockObjectPlacerService.GetMatchingPlacer(prefab.GetComponentFast<BlockObjectSpec>());
+        // var previewPlacer = previewPlacerFactory.Create(placeableBlockObject);
+
+        return blockObjectToolFactory.Create(
             placeableBlockObject,
-            toolGroup,
-            inputService,
-            areaPickerFactory,
-            uiSoundController,
-            toolUnlockingService,
             matchingPlacer,
             blockObjectToolDescriber,
-            previewPlacer
-        );
-    }
+            toolGroup);
 
-    protected override PlaceableObjectToolToolInformation DeserializeToolInformation(IObjectLoader objectLoader)
-    {
-        return new PlaceableObjectToolToolInformation(objectLoader.Get(new PropertyKey<string>("PrefabName")));
     }
 }
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolGenerator.cs
index feba2470..16693838 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolGenerator.cs
@@ -8,37 +8,39 @@
 
 namespace TimberApi.Tools.ToolSystem.Tools.PlaceableObject;
 
-public class PlaceableObjectToolGenerator(PrefabService prefabService) : ISpecificationGenerator
+public class PlaceableObjectToolGenerator(PrefabService prefabService) : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
-        foreach (var placeableBlockObject in prefabService.GetAll<PlaceableBlockObject>())
+        foreach (var placeableBlockObject in prefabService.GetAll<PlaceableBlockObjectSpec>())
         {
             if (!placeableBlockObject.UsableWithCurrentFeatureToggles) continue;
 
             var labeledEntitySpec = placeableBlockObject.GetComponentFast<LabeledEntitySpec>();
-            var prefab = placeableBlockObject.GetComponentFast<Prefab>();
-            var wonder = placeableBlockObject.GetComponentFast<Wonder>();
+            var prefab = placeableBlockObject.GetComponentFast<PrefabSpec>();
+            var wonder = placeableBlockObject.GetComponentFast<WonderSpec>();
             
             var json = JsonConvert.SerializeObject(new
             {
-                Id = prefab.PrefabName,
-                GroupId = placeableBlockObject.ToolGroupId,
-                Type = "PlaceableObjectTool",
-                Layout = !wonder ? "Default" : "WonderDefault",
-                Order = placeableBlockObject.ToolOrder,
-                Icon = labeledEntitySpec.ImagePath,
-                NameLocKey = labeledEntitySpec.DisplayNameLocKey,
-                labeledEntitySpec.DescriptionLocKey,
-                Hidden = false,
-                DevMode = placeableBlockObject.DevModeTool,
-                ToolInformation = new
+                ToolSpec = new
                 {
-                    prefab.PrefabName
+                    Id = prefab.PrefabName,
+                    GroupId = placeableBlockObject.ToolGroupId,
+                    Type = "PlaceableObjectTool",
+                    Layout = !wonder ? "Default" : "WonderDefault",
+                    Order = placeableBlockObject.ToolOrder,
+                    Icon = labeledEntitySpec.ImagePath,
+                    NameLocKey = labeledEntitySpec.DisplayNameLocKey,
+                    labeledEntitySpec.DescriptionLocKey,
+                    Hidden = false,
+                    DevMode = placeableBlockObject.DevModeTool,
+                },
+                PlaceableObjectToolSpec = new {
+                    PrefabName = prefab.PrefabName 
                 }
             });
 
-            yield return new GeneratedSpecification("Tools", $"ToolSpecification.{prefab.PrefabName}", json, true);
+            yield return new GeneratedSpec("Tools", $"Tool.{prefab.PrefabName}", json, true);
         }
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolSpec.cs b/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolSpec.cs
new file mode 100644
index 00000000..e6dae558
--- /dev/null
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolSpec.cs
@@ -0,0 +1,9 @@
+using Timberborn.BlueprintSystem;
+
+namespace TimberApi.Tools.ToolSystem.Tools.PlaceableObject;
+
+public record PlaceableObjectToolSpec : ComponentSpec
+{
+    [Serialize]
+    public string PrefabName { get; init; }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolToolInformation.cs b/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolToolInformation.cs
deleted file mode 100644
index 1ea2a7e9..00000000
--- a/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableObjectToolToolInformation.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace TimberApi.Tools.ToolSystem.Tools.PlaceableObject;
-
-public class PlaceableObjectToolToolInformation(string prefabName)
-{
-    public string PrefabName { get; } = prefabName;
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableToolConfigurator.cs
index 0056474b..31ac62f6 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/PlaceableObject/PlaceableToolConfigurator.cs
@@ -4,11 +4,11 @@
 namespace TimberApi.Tools.ToolSystem.Tools.PlaceableObject;
 
 [Context("Game")]
-public class PlaceableToolConfigurator : IConfigurator
+public class PlaceableToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<IToolFactory>().To<PlaceableObjectToolFactory>().AsSingleton();
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<PlaceableObjectToolGenerator>().AsSingleton();
+        MultiBind<IToolFactory>().To<PlaceableObjectToolFactory>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<PlaceableObjectToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolConfigurator.cs
index d982e01a..c6728026 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolConfigurator.cs
@@ -4,11 +4,11 @@
 namespace TimberApi.Tools.ToolSystem.Tools.Planting;
 
 [Context("Game")]
-public class PlantingToolConfigurator : IConfigurator
+public class PlantingToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<IToolFactory>().To<PlantingToolFactory>().AsSingleton();
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<PlantingToolGenerator>().AsSingleton();
+        MultiBind<IToolFactory>().To<PlantingToolFactory>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<PlantingToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolFactory.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolFactory.cs
index ac0ac8f0..bfe1132c 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolFactory.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolFactory.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Linq;
+using Timberborn.BlueprintSystem;
 using Timberborn.EntitySystem;
 using Timberborn.Localization;
-using Timberborn.Persistence;
+using Timberborn.MortalSystem;
 using Timberborn.Planting;
 using Timberborn.PlantingUI;
 using Timberborn.PrefabSystem;
@@ -19,16 +20,17 @@ public class PlantingToolFactory(
     ILoc loc,
     PrefabService prefabService,
     ToolUnlockingService toolUnlockingService)
-    : BaseToolFactory<PlantingToolToolInformation>
+    : IToolFactory
 {
-    public override string Id => "PlantingTool";
-
-    protected override Tool CreateTool(ToolSpecification toolSpecification, PlantingToolToolInformation toolInformation,
-        ToolGroup? toolGroup)
+    public string Id => "PlantingTool";
+    
+    public Tool Create(ToolSpec toolSpec, ToolGroup? toolGroup = null)
     {
-        var prefab = prefabService.GetAll<Prefab>()
-            .First(o => o.IsNamedExactly(toolInformation.PrefabName));
-        var plantable = prefab.GetComponentFast<Plantable>();
+        var plantingToolSpec = toolSpec.GetSpec<PlantingToolSpec>();
+        
+        var prefab = prefabService.GetAll<PrefabSpec>().First(o => o.IsNamedExactly(plantingToolSpec.PrefabName));
+        
+        var plantable = prefab.GetComponentFast<PlantableSpec>();
 
         return new PlantingTool(
             plantableDescriber,
@@ -40,13 +42,8 @@ protected override Tool CreateTool(ToolSpecification toolSpecification, Planting
             GetPlanterBuildingName(plantable),
             toolGroup);
     }
-
-    protected override PlantingToolToolInformation DeserializeToolInformation(IObjectLoader objectLoader)
-    {
-        return new PlantingToolToolInformation(objectLoader.Get(new PropertyKey<string>("PrefabName")));
-    }
     
-    private string GetPlanterBuildingName(Plantable plantable)
+    private string GetPlanterBuildingName(PlantableSpec plantable)
     {
         return loc.T(prefabService.GetAll<PlanterBuildingSpec>().Single((Func<PlanterBuildingSpec, bool>) (building => building.PlantableResourceGroup == plantable.ResourceGroup)).GetComponentFast<LabeledEntitySpec>().DisplayNameLocKey);
     }
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolGenerator.cs
index 5ea2a5d4..98c18d97 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolGenerator.cs
@@ -7,43 +7,46 @@
 using Timberborn.NaturalResources;
 using Timberborn.Planting;
 using Timberborn.PrefabSystem;
+using UnityEngine;
 
 namespace TimberApi.Tools.ToolSystem.Tools.Planting;
 
-public class PlantingToolGenerator(PrefabService prefabService) : ISpecificationGenerator
+public class PlantingToolGenerator(PrefabService prefabService) : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
-        var plantables = prefabService.GetAll<Plantable>().ToList();
+        var plantables = prefabService.GetAll<PlantableSpec>().ToList();
         
         foreach (var plantable in plantables)
         {
             var labeledEntitySpec = plantable.GetComponentFast<LabeledEntitySpec>();
             
-            var prefab = plantable.GetComponentFast<Prefab>();
-
-            var isCrop = plantable.GetComponentFast<Crop>() != null;
-            var naturalResource = plantable.GetComponentFast<NaturalResource>();
+            var prefab = plantable.GetComponentFast<PrefabSpec>();
 
+            var isCrop = plantable.GetComponentFast<CropSpec>() != null;
+            var naturalResource = plantable.GetComponentFast<NaturalResourceSpec>();
+            
             var json = JsonConvert.SerializeObject(new
             {
-                Id = plantable.PrefabName,
-                GroupId = isCrop ? "Fields" : "Forestry",
-                Type = "PlantingTool",
-                Layout = "Default",
-                Order = naturalResource.OrderId,
-                Icon = labeledEntitySpec.ImagePath,
-                NameLocKey = labeledEntitySpec.DisplayNameLocKey,
-                labeledEntitySpec.DescriptionLocKey,
-                Hidden = false,
-                DevMode = false,
-                ToolInformation = new
+                ToolSpec = new
                 {
-                    prefab.PrefabName
+                    Id = plantable.PrefabName,
+                    GroupId = isCrop ? "Fields" : "Forestry",
+                    Type = "PlantingTool",
+                    Layout = "Default",
+                    Order = naturalResource.Order,
+                    Icon = labeledEntitySpec.ImagePath,
+                    NameLocKey = labeledEntitySpec.DisplayNameLocKey,
+                    labeledEntitySpec.DescriptionLocKey,
+                    Hidden = false,
+                    DevMode = false,
+                },
+                PlantingToolSpec = new {
+                    PrefabName = prefab.PrefabName 
                 }
             });
 
-            yield return new GeneratedSpecification("Tools", $"ToolSpecification.{plantable.PrefabName}", json, true);
+            yield return new GeneratedSpec("Tools", $"Tool.{plantable.PrefabName}", json, true);
         }
 
         yield return CreateFieldsToolGroupSpecification();
@@ -51,50 +54,56 @@ public IEnumerable<GeneratedSpecification> Generate()
         yield return CreateForestryPlantingToolGroupSpecification();
     }
 
-    private static GeneratedSpecification CreateFieldsToolGroupSpecification()
+    private static GeneratedSpec CreateFieldsToolGroupSpecification()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "Fields",
-            Layout = "Blue",
-            Order = 20,
-            Type = "PlantingModeToolGroup",
-            NameLocKey = "ToolGroups.FieldsPlanting",
-            Icon = "Sprites/BottomBar/FieldsPlantingToolGroupIcon",
-            Section = "BottomBar",
-            DevMode = false,
-            Hidden = false,
-            FallbackGroup = false,
-            GroupInformation = new
+            TimberApiToolGroupSpec = new
+            {
+                Id = "Fields",
+                Order = 20,
+                NameLocKey = "ToolGroups.FieldsPlanting",
+                Icon = "Sprites/BottomBar/FieldsPlantingToolGroupIcon",
+                FallbackGroup = false,
+                Type = "PlantingModeToolGroup",
+                Layout = "Blue",
+                Section = "BottomBar",
+                DevMode = false,
+                Hidden = false,
+            },
+            BottomBarSpec = new
             {
-                BottomBarSection = 0
+                Section = 0,
             }
         });
 
 
-        return new GeneratedSpecification("Tools", "ToolGroupSpecification.Fields", json);
+        return new GeneratedSpec("ToolGroups", "TimberApiToolGroups.Fields", json);
     }
 
-    private static GeneratedSpecification CreateForestryPlantingToolGroupSpecification()
+    private static GeneratedSpec CreateForestryPlantingToolGroupSpecification()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "Forestry",
-            Layout = "Blue",
-            Order = 30,
-            Type = "PlantingModeToolGroup",
-            NameLocKey = "ToolGroups.ForestryPlanting",
-            Icon = "Sprites/BottomBar/ForestryPlantingToolGroupIcon",
-            Section = "BottomBar",
-            DevMode = false,
-            Hidden = false,
-            FallbackGroup = false,
-            GroupInformation = new
+            TimberApiToolGroupSpec = new
+            {
+                Id = "Forestry",
+                Order = 30,
+                NameLocKey = "ToolGroups.ForestryPlanting",
+                Icon = "Sprites/BottomBar/ForestryPlantingToolGroupIcon",
+                FallbackGroup = false,
+                Type = "PlantingModeToolGroup",
+                Layout = "Blue",
+                Section = "BottomBar",
+                DevMode = false,
+                Hidden = false,
+            },
+            BottomBarSpec = new
             {
-                BottomBarSection = 0
+                Section = 0,
             }
         });
 
-        return new GeneratedSpecification("Tools", "ToolGroupSpecification.Forestry", json);
+        return new GeneratedSpec("ToolGroups", "TimberApiToolGroups.Forestry", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolSpec.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolSpec.cs
new file mode 100644
index 00000000..b851669e
--- /dev/null
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolSpec.cs
@@ -0,0 +1,9 @@
+using Timberborn.BlueprintSystem;
+
+namespace TimberApi.Tools.ToolSystem.Tools.Planting;
+
+public record PlantingToolSpec : ComponentSpec
+{
+    [Serialize]
+    public string PrefabName { get; init; }
+}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolToolInformation.cs b/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolToolInformation.cs
deleted file mode 100644
index 7fe71312..00000000
--- a/Src/TimberApi.Tools/ToolSystem/Tools/Planting/PlantingToolToolInformation.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace TimberApi.Tools.ToolSystem.Tools.Planting;
-
-public class PlantingToolToolInformation(string prefabName)
-{
-    public string PrefabName { get; } = prefabName;
-}
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/SettingBox/SettingBoxToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/SettingBox/SettingBoxToolConfigurator.cs
index 53de5a2e..2ad35e7d 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/SettingBox/SettingBoxToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/SettingBox/SettingBoxToolConfigurator.cs
@@ -4,11 +4,11 @@
 namespace TimberApi.Tools.ToolSystem.Tools.SettingBox;
 
 [Context("Game")]
-public class SettingBoxToolConfigurator : IConfigurator
+public class SettingBoxToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<SettingBoxTool>().AsSingleton();
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<SettingBoxToolGenerator>().AsSingleton();
+        Bind<SettingBoxTool>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<SettingBoxToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/SettingBox/SettingBoxToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/SettingBox/SettingBoxToolGenerator.cs
index 115ec154..7f1c089a 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/SettingBox/SettingBoxToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/SettingBox/SettingBoxToolGenerator.cs
@@ -4,33 +4,38 @@
 
 namespace TimberApi.Tools.ToolSystem.Tools.SettingBox;
 
-public class SettingBoxToolGenerator : ISpecificationGenerator
+public class SettingBoxToolGenerator : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
         yield return SettingBoxTool();
     }
 
-    private static GeneratedSpecification SettingBoxTool()
+    private static GeneratedSpec SettingBoxTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "SettingBox",
-            Type = "GenericTool",
-            Layout = "GrouplessRed",
-            Order = 1000,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/Options",
-            DevMode = false,
-            Hidden = false,
-            ToolInformation = new
+            ToolSpec = new
             {
-                BottomBarSection = 2,
+                Id = "SettingBox",
+                Type = "GenericTool",
+                Layout = "GrouplessRed",
+                Order = 1000,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/Options",
+                DevMode = false,
+                Hidden = false,
+            },
+            GenericToolSpec = new {
                 ClassName = typeof(SettingBoxTool).FullName
-            }
+            },
+            BottomBarSpec = new
+            {
+                Section = 2,
+            },
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.SettingBox", json);
+        return new GeneratedSpec("Tools", "Tool.SettingBox", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaToolConfigurator.cs
index 188a2f83..54024ac4 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaToolConfigurator.cs
@@ -4,10 +4,10 @@
 namespace TimberApi.Tools.ToolSystem.Tools.TreeCuttingArea;
 
 [Context("Game")]
-public class TreeCuttingAreaToolConfigurator : IConfigurator
+public class TreeCuttingAreaToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<TreeCuttingAreaToolGenerator>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<TreeCuttingAreaToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaToolGenerator.cs
index 2973e807..a21c5d19 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaToolGenerator.cs
@@ -5,83 +5,98 @@
 
 namespace TimberApi.Tools.ToolSystem.Tools.TreeCuttingArea;
 
-public class TreeCuttingAreaToolGenerator : ISpecificationGenerator
+public class TreeCuttingAreaToolGenerator : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
         yield return CreateCuttingTreeGroup();
         yield return TreeCuttingAreaSelectionTool();
         yield return TreeCuttingAreaUnselectionTool();
     }
 
-    private static GeneratedSpecification TreeCuttingAreaUnselectionTool()
+    private static GeneratedSpec TreeCuttingAreaUnselectionTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "TreeCuttingAreaUnselection",
-            GroupId = "TreeCutting",
-            Type = "GenericTool",
-            Layout = "Default",
-            Order = 1000,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/CancelToolIcon",
-            DevMode = false,
-            Hidden = false,
-            ToolInformation = new
+            ToolSpec = new
+            {
+                Id = "TreeCuttingAreaUnselection",
+                GroupId = "TreeCutting",
+                Type = "GenericTool",
+                Layout = "Default",
+                Order = 1000,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/CancelToolIcon",
+                DevMode = false,
+                Hidden = false,
+            },
+            GenericToolSpec = new
             {
-                BottomBarSection = 0,
                 ClassName = typeof(TreeCuttingAreaUnselectionTool).FullName
-            }
+            },
+            BottomBarSpec = new
+            {
+                Section = 0,
+            },
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.TreeCuttingAreaUnselection", json);
+        return new GeneratedSpec("Tools", "Tool.TreeCuttingAreaUnselection", json);
     }
 
-    private static GeneratedSpecification TreeCuttingAreaSelectionTool()
+    private static GeneratedSpec TreeCuttingAreaSelectionTool()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "TreeCuttingAreaSelection",
-            GroupId = "TreeCutting",
-            Type = "GenericTool",
-            Layout = "Default",
-            Order = 0,
-            NameLocKey = "CAN NOT BE MODIFIED",
-            DescriptionLocKey = "CAN NOT BE MODIFIED",
-            Icon = "Sprites/BottomBar/TreeCuttingAreaSelectionTool",
-            DevMode = false,
-            Hidden = false,
-            ToolInformation = new
+            ToolSpec = new
+            {
+                Id = "TreeCuttingAreaSelection",
+                GroupId = "TreeCutting",
+                Type = "GenericTool",
+                Layout = "Default",
+                Order = 0,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/TreeCuttingAreaSelectionTool",
+                DevMode = false,
+                Hidden = false,
+            },
+            GenericToolSpec = new
             {
-                BottomBarSection = 0,
                 ClassName = typeof(TreeCuttingAreaSelectionTool).FullName
-            }
+            },
+            BottomBarSpec = new
+            {
+                Section = 0,
+            },
         });
 
-        return new GeneratedSpecification("Tools", "ToolSpecification.TreeCuttingAreaSelection", json);
+        return new GeneratedSpec("Tools", "Tool.TreeCuttingAreaSelection", json);
     }
 
-    private static GeneratedSpecification CreateCuttingTreeGroup()
+    private static GeneratedSpec CreateCuttingTreeGroup()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "TreeCutting",
-            Layout = "Blue",
-            Order = 10,
-            Type = "TreeCuttingAreaToolGroup",
-            NameLocKey = "ToolGroups.TreeCutting",
-            Icon = "Sprites/BottomBar/TreeToolGroupIcon",
-            Section = "BottomBar",
-            DevMode = false,
-            Hidden = false,
-            FallbackGroup = false,
-            GroupInformation = new
+            TimberApiToolGroupSpec = new
+            {
+                Id = "TreeCutting",
+                Order = 10,
+                NameLocKey = "ToolGroups.TreeCutting",
+                Icon = "Sprites/BottomBar/TreeToolGroupIcon",
+                FallbackGroup = false,
+                Type = "TreeCuttingAreaToolGroup",
+                Layout = "Blue",
+                Section = "BottomBar",
+                DevMode = false,
+                Hidden = false,
+            },
+            BottomBarSpec = new
             {
-                BottomBarSection = 0
+                Section = 0,
             }
         });
 
-        return new GeneratedSpecification("Tools", "ToolGroupSpecification.TreeCutting", json);
+        return new GeneratedSpec("ToolGroups", "TimberApiToolGroups.TreeCutting", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolConfigurator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolConfigurator.cs
index 3addfd3b..b1344cc9 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolConfigurator.cs
@@ -4,10 +4,10 @@
 namespace TimberApi.Tools.ToolSystem.Tools.WaterGenerator;
 
 [Context("Game")]
-public class WaterGeneratorToolConfigurator : IConfigurator
+public class WaterGeneratorToolConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.MultiBind<ISpecificationGenerator>().To<WaterGeneratorToolGenerator>().AsSingleton();
+        MultiBind<ISpecGenerator>().To<WaterGeneratorToolGenerator>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolGenerator.cs b/Src/TimberApi.Tools/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolGenerator.cs
index e3aee356..3c1dec59 100644
--- a/Src/TimberApi.Tools/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolGenerator.cs
+++ b/Src/TimberApi.Tools/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolGenerator.cs
@@ -5,28 +5,33 @@
 
 namespace TimberApi.Tools.ToolSystem.Tools.WaterGenerator;
 
-public class WaterGeneratorToolGenerator : ISpecificationGenerator
+public class WaterGeneratorToolGenerator : ISpecGenerator
 {
-    public IEnumerable<GeneratedSpecification> Generate()
+    public IEnumerable<GeneratedSpec> Generate()
     {
         var json = JsonConvert.SerializeObject(new
         {
-            Id = "WaterGenerator",
-            Type = "GenericTool",
-            Layout = "GrouplessRed",
-            Order = 80,
-            NameLocKey = "Cursor",
-            DescriptionLocKey = "Cursor",
-            Icon = "Sprites/BottomBar/WaterHeightBrushTool",
-            DevMode = true,
-            Hidden = false,
-            ToolInformation = new
+            ToolSpec = new
             {
-                BottomBarSection = 0,
+                Id = "WaterGenerator",
+                Type = "GenericTool",
+                Layout = "GrouplessRed",
+                Order = 80,
+                NameLocKey = "Tool.FixedName",
+                DescriptionLocKey = "Tool.FixedDescription",
+                Icon = "Sprites/BottomBar/WaterHeightBrushTool",
+                DevMode = true,
+                Hidden = false,
+            },
+            GenericToolSpec = new {
                 ClassName = typeof(WaterHeightBrushTool).FullName
-            }
+            },
+            BottomBarSpec = new
+            {
+                Section = 0,
+            },
         });
 
-        yield return new GeneratedSpecification("Root", "ToolSpecification.WaterGenerator", json);
+        yield return new GeneratedSpec("Root", "Tool.WaterGenerator", json);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonBlueFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonBlueFactory.cs
index ca9ca933..85a74981 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonBlueFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonBlueFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonBlueFactory(ToolButtonFactory toolButtonFactory) : IToolB
 {
     public string Id => "Blue";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.Create(tool, toolGroupSpecification.Icon, "UI/Images/BottomBar/button-bg-02");
+        return toolButtonFactory.Create(tool, toolGroupSpec.Icon, "UI/Images/BottomBar/button-bg-02");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonBrownFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonBrownFactory.cs
index 7de500bf..04d3ed48 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonBrownFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonBrownFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonBrownFactory(ToolButtonFactory toolButtonFactory) : ITool
 {
     public string Id => "Brown";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.Create(tool, toolGroupSpecification.Icon, "UI/Images/BottomBar/subbutton-bg-01");
+        return toolButtonFactory.Create(tool, toolGroupSpec.Icon, "UI/Images/BottomBar/subbutton-bg-01");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonDefaultFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonDefaultFactory.cs
index 75b52d7a..a1143a0c 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonDefaultFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonDefaultFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonDefaultFactory(ToolButtonFactory toolButtonFactory) : ITo
 {
     public string Id => "Default";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.Create(tool, toolGroupSpecification.Icon);
+        return toolButtonFactory.Create(tool, toolGroupSpec.Icon);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGreenFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGreenFactory.cs
index 5716dc8c..8e7948f5 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGreenFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGreenFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonGreenFactory(ToolButtonFactory toolButtonFactory) : ITool
 {
     public string Id => "Green";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.Create(tool, toolGroupSpecification.Icon, "UI/Images/BottomBar/button-bg-03");
+        return toolButtonFactory.Create(tool, toolGroupSpec.Icon, "UI/Images/BottomBar/button-bg-03");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessBlueFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessBlueFactory.cs
index 9d8baec2..4ac4fddf 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessBlueFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessBlueFactory.cs
@@ -7,9 +7,9 @@ public class ToolButtonGrouplessBlueFactory(ToolButtonFactory toolButtonFactory)
 {
     public string Id => "GrouplessBlue";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.CreateGroupless(tool, toolGroupSpecification.Icon,
+        return toolButtonFactory.CreateGroupless(tool, toolGroupSpec.Icon,
             "UI/Images/BottomBar/button-bg-02");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessBrownFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessBrownFactory.cs
index 7546c980..46f64013 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessBrownFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessBrownFactory.cs
@@ -7,9 +7,9 @@ public class ToolButtonGrouplessBrownFactory(ToolButtonFactory toolButtonFactory
 {
     public string Id => "GrouplessBrown";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.CreateGroupless(tool, toolGroupSpecification.Icon,
+        return toolButtonFactory.CreateGroupless(tool, toolGroupSpec.Icon,
             "UI/Images/BottomBar/subbutton-bg-01");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessGreenFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessGreenFactory.cs
index e3f76410..723d7a5c 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessGreenFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessGreenFactory.cs
@@ -7,9 +7,9 @@ public class ToolButtonGrouplessGreenFactory(ToolButtonFactory toolButtonFactory
 {
     public string Id => "GrouplessGreen";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.CreateGroupless(tool, toolGroupSpecification.Icon,
+        return toolButtonFactory.CreateGroupless(tool, toolGroupSpec.Icon,
             "UI/Images/BottomBar/button-bg-03");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessRedFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessRedFactory.cs
index 1b653c16..45488df9 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessRedFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonGrouplessRedFactory.cs
@@ -7,9 +7,8 @@ public class ToolButtonGrouplessRedFactory(ToolButtonFactory toolButtonFactory)
 {
     public string Id => "GrouplessRed";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.CreateGroupless(tool, toolGroupSpecification.Icon,
-            "UI/Images/BottomBar/button-bg-01");
+        return toolButtonFactory.CreateGroupless(tool, toolGroupSpec.Icon, "UI/Images/BottomBar/button-bg-01");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonRedFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonRedFactory.cs
index b13502db..21801bb6 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonRedFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonRedFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonRedFactory(ToolButtonFactory toolButtonFactory) : IToolBu
 {
     public string Id => "Red";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.Create(tool, toolGroupSpecification.Icon, "UI/Images/BottomBar/button-bg-01");
+        return toolButtonFactory.Create(tool, toolGroupSpec.Icon, "UI/Images/BottomBar/button-bg-01");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderBlueFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderBlueFactory.cs
index ae4e296a..c9dbf214 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderBlueFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderBlueFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonWonderBlueFactory(ToolButtonFactory toolButtonFactory) :
 {
     public string Id => "WonderBlue";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.CreateHex(tool, toolGroupSpecification.Icon, "UI/Images/BottomBar/button-bg-02");
+        return toolButtonFactory.CreateHex(tool, toolGroupSpec.Icon, "UI/Images/BottomBar/button-bg-02");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderBrownFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderBrownFactory.cs
index fd2b1dcc..bf39aecf 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderBrownFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderBrownFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonWonderBrownFactory(ToolButtonFactory toolButtonFactory) :
 {
     public string Id => "WonderBrown";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.CreateHex(tool, toolGroupSpecification.Icon, "UI/Images/BottomBar/subbutton-bg-01");
+        return toolButtonFactory.CreateHex(tool, toolGroupSpec.Icon, "UI/Images/BottomBar/subbutton-bg-01");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderFactory.cs
index 75007865..5331aae3 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonWonderFactory(ToolButtonFactory toolButtonFactory) : IToo
 {
     public string Id => "WonderDefault";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.CreateHex(tool, toolGroupSpecification.Icon);
+        return toolButtonFactory.CreateHex(tool, toolGroupSpec.Icon);
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderGreenFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderGreenFactory.cs
index 1cca5b5b..c9bf781e 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderGreenFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderGreenFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonWonderGreenFactory(ToolButtonFactory toolButtonFactory) :
 {
     public string Id => "WonderGreen";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.CreateHex(tool, toolGroupSpecification.Icon, "UI/Images/BottomBar/button-bg-03");
+        return toolButtonFactory.CreateHex(tool, toolGroupSpec.Icon, "UI/Images/BottomBar/button-bg-03");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderRedFactory.cs b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderRedFactory.cs
index b0a134e5..0b503d4f 100644
--- a/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderRedFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/Factories/ToolButtonWonderRedFactory.cs
@@ -7,8 +7,8 @@ public class ToolButtonWonderRedFactory(ToolButtonFactory toolButtonFactory) : I
 {
     public string Id => "WonderRed";
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification)
+    public ToolButton Create(Tool tool, ToolSpec toolGroupSpec)
     {
-        return toolButtonFactory.CreateHex(tool, toolGroupSpecification.Icon, "UI/Images/BottomBar/button-bg-01");
+        return toolButtonFactory.CreateHex(tool, toolGroupSpec.Icon, "UI/Images/BottomBar/button-bg-01");
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/IToolButtonFactory.cs b/Src/TimberApi.Tools/ToolUI/IToolButtonFactory.cs
index 5aeace0b..248e72fd 100644
--- a/Src/TimberApi.Tools/ToolUI/IToolButtonFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/IToolButtonFactory.cs
@@ -1,4 +1,5 @@
 using TimberApi.Tools.ToolSystem;
+using Timberborn.ToolButtonSystem;
 using Timberborn.ToolSystem;
 
 namespace TimberApi.Tools.ToolUI;
@@ -7,5 +8,5 @@ public interface IToolButtonFactory
 {
     public string Id { get; }
 
-    public ToolButton Create(Tool tool, ToolSpecification toolGroupSpecification);
+    public ToolButton Create(ITool tool, ToolSpec toolGroupSpec);
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/ToolButtonFactory.cs b/Src/TimberApi.Tools/ToolUI/ToolButtonFactory.cs
index dedff72c..757fd0c9 100644
--- a/Src/TimberApi.Tools/ToolUI/ToolButtonFactory.cs
+++ b/Src/TimberApi.Tools/ToolUI/ToolButtonFactory.cs
@@ -88,7 +88,6 @@ public ToolButton CreateHex(Tool tool, Sprite toolImage, string backgroundImage)
         return Create(tool, toolImage, root);
     }
 
-
     public ToolButton Create(Tool tool, Sprite toolImage, VisualElement root)
     {
         root.Q<VisualElement>("ToolImage").style.backgroundImage = new StyleBackground(toolImage);
diff --git a/Src/TimberApi.Tools/ToolUI/ToolGroupUIConfigurator.cs b/Src/TimberApi.Tools/ToolUI/ToolGroupUIConfigurator.cs
index 32df9a1b..278e8a83 100644
--- a/Src/TimberApi.Tools/ToolUI/ToolGroupUIConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolUI/ToolGroupUIConfigurator.cs
@@ -5,28 +5,28 @@ namespace TimberApi.Tools.ToolUI;
 
 [Context("Game")]
 [Context("MapEditor")]
-public class ToolGroupUIConfigurator : IConfigurator
+public class ToolGroupUIConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<ToolButtonFactoryService>().AsSingleton();
+        Bind<ToolButtonFactoryService>().AsSingleton();
 
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonBlueFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonRedFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonGreenFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonBrownFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonBlueFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonRedFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonGreenFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonBrownFactory>().AsSingleton();
 
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonGrouplessBrownFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonGrouplessGreenFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonGrouplessRedFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonGrouplessBlueFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonGrouplessBrownFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonGrouplessGreenFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonGrouplessRedFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonGrouplessBlueFactory>().AsSingleton();
 
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonWonderBrownFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonWonderGreenFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonWonderRedFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonWonderBlueFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonWonderBrownFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonWonderGreenFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonWonderRedFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonWonderBlueFactory>().AsSingleton();
 
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonWonderFactory>().AsSingleton();
-        containerDefinition.MultiBind<IToolButtonFactory>().To<ToolButtonDefaultFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonWonderFactory>().AsSingleton();
+        MultiBind<IToolButtonFactory>().To<ToolButtonDefaultFactory>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.Tools/ToolUI/ToolUIConfigurator.cs b/Src/TimberApi.Tools/ToolUI/ToolUIConfigurator.cs
index d24cb58d..404657b1 100644
--- a/Src/TimberApi.Tools/ToolUI/ToolUIConfigurator.cs
+++ b/Src/TimberApi.Tools/ToolUI/ToolUIConfigurator.cs
@@ -4,10 +4,10 @@ namespace TimberApi.Tools.ToolUI;
 
 [Context("Game")]
 [Context("MapEditor")]
-public class ToolUIConfigurator : IConfigurator
+public class ToolUIConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<ToolButtonFactory>().AsSingleton();
+        Bind<ToolButtonFactory>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIBuilderSystem/BaseBuilder.cs b/Src/TimberApi.UIBuilderSystem/BaseBuilder.cs
index 60e5d885..a2ada4c1 100644
--- a/Src/TimberApi.UIBuilderSystem/BaseBuilder.cs
+++ b/Src/TimberApi.UIBuilderSystem/BaseBuilder.cs
@@ -1,5 +1,4 @@
 using Bindito.Core;
-using TimberApi.DependencyContainerSystem;
 using TimberApi.UIBuilderSystem.StyleSheetSystem;
 using Timberborn.CoreUI;
 using UnityEngine.UIElements;
@@ -34,7 +33,7 @@ private void InitializeStyleSheet()
     {
         if (!BuilderStyleSheetCache.TryGet(GetType(), out var styleSheet))
         {
-            var styleSheetBuilder = DependencyContainer.GetInstance<StyleSheetBuilder>();
+            var styleSheetBuilder = new StyleSheetBuilder();
 
             InitializeStyleSheet(styleSheetBuilder);
 
diff --git a/Src/TimberApi.UIBuilderSystem/ElementBuilders/BaseElementBuilder.cs b/Src/TimberApi.UIBuilderSystem/ElementBuilders/BaseElementBuilder.cs
index 08df0ab4..235bd4d7 100644
--- a/Src/TimberApi.UIBuilderSystem/ElementBuilders/BaseElementBuilder.cs
+++ b/Src/TimberApi.UIBuilderSystem/ElementBuilders/BaseElementBuilder.cs
@@ -67,6 +67,12 @@ public TBuilder AddComponent(Type builderType)
         Root.Add(UIBuilder.Build(builderType));
         return BuilderInstance;
     }
+    
+    public TBuilder AddComponent(BaseBuilder baseBuilder)
+    {
+        Root.Add(baseBuilder.BuildElement());
+        return BuilderInstance;
+    }
 
     public TBuilder AddComponent(VisualElement element)
     {
diff --git a/Src/TimberApi.UIBuilderSystem/TimberApi.UIBuilderSystem.csproj b/Src/TimberApi.UIBuilderSystem/TimberApi.UIBuilderSystem.csproj
index 627b6375..a0787030 100644
--- a/Src/TimberApi.UIBuilderSystem/TimberApi.UIBuilderSystem.csproj
+++ b/Src/TimberApi.UIBuilderSystem/TimberApi.UIBuilderSystem.csproj
@@ -11,8 +11,8 @@
         <ProjectReference Include="..\TimberApi\TimberApi.csproj"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+    <ItemGroup >
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -20,10 +20,8 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
-    </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="StyleSheetSystem\PropertyBuilderExtensions\" />
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -33,6 +31,6 @@
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
         <Message Text="### Copying files to plugins ###" Importance="high"/>
-        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\core"/>
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\TimberApi.UIBuilder\version-0.7"/>
     </Target>
 </Project>
diff --git a/Src/TimberApi.UIBuilderSystem/UIBuilderSystemConfigurator.cs b/Src/TimberApi.UIBuilderSystem/UIBuilderSystemConfigurator.cs
index 44a56c8d..833bbfdd 100644
--- a/Src/TimberApi.UIBuilderSystem/UIBuilderSystemConfigurator.cs
+++ b/Src/TimberApi.UIBuilderSystem/UIBuilderSystemConfigurator.cs
@@ -7,37 +7,36 @@ namespace TimberApi.UIBuilderSystem;
 [Context("MainMenu")]
 [Context("MapEditor")]
 [Context("Game")]
-public class UIBuilderSystemConfigurator : IConfigurator
+public class UIBuilderSystemConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<LabelBuilder>().AsTransient();
-        containerDefinition.Bind<LocalizableLabelBuilder>().AsTransient();
+        Bind<LabelBuilder>().AsTransient();
+        Bind<LocalizableLabelBuilder>().AsTransient();
         
-        containerDefinition.Bind<SliderIntBuilder>().AsTransient();
-        containerDefinition.Bind<LocalizableSliderIntBuilder>().AsTransient();
+        Bind<SliderIntBuilder>().AsTransient();
+        Bind<LocalizableSliderIntBuilder>().AsTransient();
 
-        containerDefinition.Bind<SliderBuilder>().AsTransient();
-        containerDefinition.Bind<LocalizableSliderBuilder>().AsTransient();
+        Bind<SliderBuilder>().AsTransient();
+        Bind<LocalizableSliderBuilder>().AsTransient();
         
-        containerDefinition.Bind<MinMaxSliderBuilder>().AsTransient();
-        containerDefinition.Bind<LocalizableMinMaxSliderBuilder>().AsTransient();
+        Bind<MinMaxSliderBuilder>().AsTransient();
+        Bind<LocalizableMinMaxSliderBuilder>().AsTransient();
         
-        containerDefinition.Bind<ToggleBuilder>().AsTransient();
-        containerDefinition.Bind<LocalizableToggleBuilder>().AsTransient();
+        Bind<ToggleBuilder>().AsTransient();
+        Bind<LocalizableToggleBuilder>().AsTransient();
 
-        containerDefinition.Bind<DropDownBuilder>().AsTransient();
+        Bind<DropDownBuilder>().AsTransient();
         
         
-        containerDefinition.Bind<ButtonBuilder>().AsTransient();
-        containerDefinition.Bind<LocalizableButtonBuilder>().AsTransient();
-        containerDefinition.Bind<VisualElementBuilder>().AsTransient();
-        containerDefinition.Bind<ScrollViewBuilder>().AsTransient();
-        containerDefinition.Bind<ListViewBuilder>().AsTransient();
-        containerDefinition.Bind<TextFieldBuilder>().AsTransient();
+        Bind<ButtonBuilder>().AsTransient();
+        Bind<LocalizableButtonBuilder>().AsTransient();
+        Bind<VisualElementBuilder>().AsTransient();
+        Bind<ScrollViewBuilder>().AsTransient();
+        Bind<ListViewBuilder>().AsTransient();
+        Bind<TextFieldBuilder>().AsTransient();
 
-        containerDefinition.Bind<StyleSheetBuilder>().AsTransient();
-        containerDefinition.Bind<UIBuilder>().AsSingleton();
-        containerDefinition.Bind<BuilderStyleSheetCache>().AsSingleton();
+        Bind<UIBuilder>().AsSingleton();
+        Bind<BuilderStyleSheetCache>().AsSingleton();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIPresets/Builders/BoxBuilder.cs b/Src/TimberApi.UIPresets/Builders/BoxBuilder.cs
index 9bc666d9..49e35b21 100644
--- a/Src/TimberApi.UIPresets/Builders/BoxBuilder.cs
+++ b/Src/TimberApi.UIPresets/Builders/BoxBuilder.cs
@@ -26,7 +26,7 @@ public abstract class BoxBuilder<TBuilder> : BaseBuilder<TBuilder, NineSliceVisu
 
     protected DefaultScrollView DefaultScrollView = null!;
 
-    protected string BackgroundClass = "api__box--nontransparant";
+    protected string BackgroundClass = "api__box--transparent";
 
     protected bool HasCloseButton = false;
         
@@ -105,6 +105,12 @@ public TBuilder SetHeight(Length height)
         return BuilderInstance;
     }
     
+    public TBuilder NonTransparent()
+    {
+        BackgroundClass = "api__box--nontransparent";
+        return BuilderInstance;
+    }
+    
     public TBuilder AddComponent<TComponentBuilder>(string name, Func<TComponentBuilder, TComponentBuilder> builder)
         where TComponentBuilder : BaseBuilder
     {
@@ -143,9 +149,21 @@ public TBuilder AddComponent(Type builderType)
         return BuilderInstance;
     }
     
+    public TBuilder AddComponent(BaseBuilder builder)
+    {
+        DefaultScrollView.AddComponent(builder);
+        return BuilderInstance;
+    }
+    
+    public TBuilder ModifyRoot(Action<VisualElementBuilder> visualElementBuilder)
+    {
+        visualElementBuilder.Invoke(VisualElementBuilder);
+        return BuilderInstance;
+    }
+    
     protected override NineSliceVisualElement InitializeRoot()
     {
-        DefaultScrollView = UIBuilder.Create<DefaultScrollView>();
+        DefaultScrollView = UIBuilder.Create<DefaultScrollView>("DefaultScrollView");
         
         VisualElementBuilder = UIBuilder.Create<VisualElementBuilder>()
             .AddComponent(DefaultScrollView.Build())
@@ -165,11 +183,11 @@ protected override void InitializeStyleSheet(StyleSheetBuilder styleSheetBuilder
             .AddClass("api__box--with-header", builder => builder
                 .MinWidth(350)
             )
-            .AddClass("api__box--nontransparant", builder => builder
+            .AddClass("api__box--nontransparent", builder => builder
                 .Add(Property.NineSlicedBackgroundImage, "UI/Images/Core/border_nontransparent",
                     StyleValueType.ResourcePath)
             )
-            .AddClass("api__box--transparant", builder => builder
+            .AddClass("api__box--transparent", builder => builder
                 .Add(Property.NineSlicedBackgroundImage, "UI/Images/Core/border_transparent",
                     StyleValueType.ResourcePath)
             )
diff --git a/Src/TimberApi.UIPresets/Builders/UIBuilderConfigurator.cs b/Src/TimberApi.UIPresets/Builders/UIBuilderConfigurator.cs
index fd9ab2ec..969daedc 100644
--- a/Src/TimberApi.UIPresets/Builders/UIBuilderConfigurator.cs
+++ b/Src/TimberApi.UIPresets/Builders/UIBuilderConfigurator.cs
@@ -5,11 +5,11 @@ namespace TimberApi.UIPresets.Builders;
 [Context("Game")]
 [Context("MainMenu")]
 [Context("MapEditor")]
-public class UIBuilderConfigurator : IConfigurator
+public class UIBuilderConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<FragmentBuilder>().AsTransient();
-        containerDefinition.Bind<BoxBuilder>().AsTransient();
+        Bind<FragmentBuilder>().AsTransient();
+        Bind<BoxBuilder>().AsTransient();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIPresets/Buttons/ButtonPresetConfigurator.cs b/Src/TimberApi.UIPresets/Buttons/ButtonPresetConfigurator.cs
index 7941d4ff..f273ad9b 100644
--- a/Src/TimberApi.UIPresets/Buttons/ButtonPresetConfigurator.cs
+++ b/Src/TimberApi.UIPresets/Buttons/ButtonPresetConfigurator.cs
@@ -5,36 +5,36 @@ namespace TimberApi.UIPresets.Buttons;
 [Context("Game")]
 [Context("MainMenu")]
 [Context("MapEditor")]
-public class ButtonPresetConfigurator : IConfigurator
+public class ButtonPresetConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<ArrowDownButton>().AsTransient();
-        containerDefinition.Bind<ArrowLeftButton>().AsTransient();
-        containerDefinition.Bind<ArrowUpButton>().AsTransient();
-        containerDefinition.Bind<ArrowRightButton>().AsTransient();
-        containerDefinition.Bind<MenuButton>().AsTransient();
-        containerDefinition.Bind<GameButton>().AsTransient();
-        containerDefinition.Bind<EmptyButton>().AsTransient();
-        containerDefinition.Bind<EmptyTextButton>().AsTransient();
-        containerDefinition.Bind<NewGameButton>().AsTransient();
-        containerDefinition.Bind<ClampUpButton>().AsTransient();
-        containerDefinition.Bind<ClampDownButton>().AsTransient();
-        containerDefinition.Bind<PlusButton>().AsTransient();
-        containerDefinition.Bind<PlusBatchButton>().AsTransient();
-        containerDefinition.Bind<PlusBatchMultiButton>().AsTransient();
-        containerDefinition.Bind<MinusButton>().AsTransient();
-        containerDefinition.Bind<MinusBatchButton>().AsTransient();
-        containerDefinition.Bind<MinusBatchMultiButton>().AsTransient();
-        containerDefinition.Bind<CircleButton>().AsTransient();
-        containerDefinition.Bind<CloseButton>().AsTransient();
-        containerDefinition.Bind<CrossButton>().AsTransient();
-        containerDefinition.Bind<WideButton>().AsTransient();
-        containerDefinition.Bind<MigrationArrowLeftButton>().AsTransient();
-        containerDefinition.Bind<MigrationArrowRightButton>().AsTransient();
-        containerDefinition.Bind<CyclerRightButton>().AsTransient();
-        containerDefinition.Bind<CyclerLeftButton>().AsTransient();
-        containerDefinition.Bind<CyclerMainRightButton>().AsTransient();
-        containerDefinition.Bind<CyclerMainLeftButton>().AsTransient();
+        Bind<ArrowDownButton>().AsTransient();
+        Bind<ArrowLeftButton>().AsTransient();
+        Bind<ArrowUpButton>().AsTransient();
+        Bind<ArrowRightButton>().AsTransient();
+        Bind<MenuButton>().AsTransient();
+        Bind<GameButton>().AsTransient();
+        Bind<EmptyButton>().AsTransient();
+        Bind<EmptyTextButton>().AsTransient();
+        Bind<NewGameButton>().AsTransient();
+        Bind<ClampUpButton>().AsTransient();
+        Bind<ClampDownButton>().AsTransient();
+        Bind<PlusButton>().AsTransient();
+        Bind<PlusBatchButton>().AsTransient();
+        Bind<PlusBatchMultiButton>().AsTransient();
+        Bind<MinusButton>().AsTransient();
+        Bind<MinusBatchButton>().AsTransient();
+        Bind<MinusBatchMultiButton>().AsTransient();
+        Bind<CircleButton>().AsTransient();
+        Bind<CloseButton>().AsTransient();
+        Bind<CrossButton>().AsTransient();
+        Bind<WideButton>().AsTransient();
+        Bind<MigrationArrowLeftButton>().AsTransient();
+        Bind<MigrationArrowRightButton>().AsTransient();
+        Bind<CyclerRightButton>().AsTransient();
+        Bind<CyclerLeftButton>().AsTransient();
+        Bind<CyclerMainRightButton>().AsTransient();
+        Bind<CyclerMainLeftButton>().AsTransient();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIPresets/Dropdowns/DropdownPresetConfigurator.cs b/Src/TimberApi.UIPresets/Dropdowns/DropdownPresetConfigurator.cs
index ce8d1bc3..0258cb37 100644
--- a/Src/TimberApi.UIPresets/Dropdowns/DropdownPresetConfigurator.cs
+++ b/Src/TimberApi.UIPresets/Dropdowns/DropdownPresetConfigurator.cs
@@ -5,11 +5,11 @@ namespace TimberApi.UIPresets.Dropdowns;
 [Context("MainMenu")]
 [Context("MapEditor")]
 [Context("Game")]
-public class DropdownPresetConfigurator : IConfigurator
+public class DropdownPresetConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<OptionDropdown>().AsTransient();
-        containerDefinition.Bind<GameDropdown>().AsTransient();
+        Bind<OptionDropdown>().AsTransient();
+        Bind<GameDropdown>().AsTransient();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIPresets/Dropdowns/GameDropdown.cs b/Src/TimberApi.UIPresets/Dropdowns/GameDropdown.cs
index 21a01440..d2ae2f42 100644
--- a/Src/TimberApi.UIPresets/Dropdowns/GameDropdown.cs
+++ b/Src/TimberApi.UIPresets/Dropdowns/GameDropdown.cs
@@ -1,5 +1,6 @@
 using TimberApi.UIBuilderSystem;
 using TimberApi.UIBuilderSystem.ElementBuilders;
+using Timberborn.BlueprintSystem;
 using Timberborn.DropdownSystem;
 using UnityEngine.UIElements;
 
diff --git a/Src/TimberApi.UIPresets/Labels/GameLabel.cs b/Src/TimberApi.UIPresets/Labels/GameLabel.cs
index 57d38b51..31f1351a 100644
--- a/Src/TimberApi.UIPresets/Labels/GameLabel.cs
+++ b/Src/TimberApi.UIPresets/Labels/GameLabel.cs
@@ -51,6 +51,12 @@ public TBuilder Title()
         return BuilderInstance;
     }
     
+    public TBuilder Bold()
+    {
+        LabelBuilder.AddClass("api__game_text-label--bold");
+        return BuilderInstance;
+    }
+    
     public TBuilder SetFontStyle(FontStyle style)
     {
         LabelBuilder.SetFontStyle(style);
diff --git a/Src/TimberApi.UIPresets/Labels/LabelPresetConfigurator.cs b/Src/TimberApi.UIPresets/Labels/LabelPresetConfigurator.cs
index 1c1781b0..6ac67894 100644
--- a/Src/TimberApi.UIPresets/Labels/LabelPresetConfigurator.cs
+++ b/Src/TimberApi.UIPresets/Labels/LabelPresetConfigurator.cs
@@ -5,11 +5,11 @@ namespace TimberApi.UIPresets.Labels;
 [Context("MainMenu")]
 [Context("MapEditor")]
 [Context("Game")]
-public class LabelPresetConfigurator : IConfigurator
+public class LabelPresetConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<GameLabel>().AsTransient();
-        containerDefinition.Bind<GameTextLabel>().AsTransient();
+        Bind<GameLabel>().AsTransient();
+        Bind<GameTextLabel>().AsTransient();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIPresets/ListViews/ListViewPresetConfigurator.cs b/Src/TimberApi.UIPresets/ListViews/ListViewPresetConfigurator.cs
index eb14cfe8..4e260a60 100644
--- a/Src/TimberApi.UIPresets/ListViews/ListViewPresetConfigurator.cs
+++ b/Src/TimberApi.UIPresets/ListViews/ListViewPresetConfigurator.cs
@@ -5,10 +5,10 @@ namespace TimberApi.UIPresets.ListViews;
 [Context("MainMenu")]
 [Context("MapEditor")]
 [Context("Game")]
-public class ListViewPresetConfigurator : IConfigurator
+public class ListViewPresetConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<DefaultListView>().AsTransient();
+        Bind<DefaultListView>().AsTransient();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIPresets/ScrollViews/DefaultScrollView.cs b/Src/TimberApi.UIPresets/ScrollViews/DefaultScrollView.cs
index 7535251d..8efc08e2 100644
--- a/Src/TimberApi.UIPresets/ScrollViews/DefaultScrollView.cs
+++ b/Src/TimberApi.UIPresets/ScrollViews/DefaultScrollView.cs
@@ -69,6 +69,12 @@ public TBuilder AddComponent(Type builderType)
         return BuilderInstance;
     }
     
+    public TBuilder AddComponent(BaseBuilder builder)
+    {
+        ScrollViewBuilder.AddComponent(builder);
+        return BuilderInstance;
+    }
+    
     protected override ScrollView InitializeRoot()
     {
         ScrollViewBuilder = UIBuilder.Create<ScrollViewBuilder>()
diff --git a/Src/TimberApi.UIPresets/ScrollViews/ScrollViewPresetConfigurator.cs b/Src/TimberApi.UIPresets/ScrollViews/ScrollViewPresetConfigurator.cs
index 17d23dff..0bb5b3d0 100644
--- a/Src/TimberApi.UIPresets/ScrollViews/ScrollViewPresetConfigurator.cs
+++ b/Src/TimberApi.UIPresets/ScrollViews/ScrollViewPresetConfigurator.cs
@@ -5,10 +5,10 @@ namespace TimberApi.UIPresets.ScrollViews;
 [Context("MainMenu")]
 [Context("MapEditor")]
 [Context("Game")]
-public class ScrollViewPresetConfigurator : IConfigurator
+public class ScrollViewPresetConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<DefaultScrollView>().AsTransient();
+        Bind<DefaultScrollView>().AsTransient();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIPresets/Sliders/SliderPresetConfigurator.cs b/Src/TimberApi.UIPresets/Sliders/SliderPresetConfigurator.cs
index 9724bd1e..3d87939e 100644
--- a/Src/TimberApi.UIPresets/Sliders/SliderPresetConfigurator.cs
+++ b/Src/TimberApi.UIPresets/Sliders/SliderPresetConfigurator.cs
@@ -5,23 +5,23 @@ namespace TimberApi.UIPresets.Sliders;
 [Context("MainMenu")]
 [Context("MapEditor")]
 [Context("Game")]
-public class SliderPresetConfigurator : IConfigurator
+public class SliderPresetConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<MainMenuSliderInt>().AsTransient();
-        containerDefinition.Bind<MainMenuTextSliderInt>().AsTransient();
+        Bind<MainMenuSliderInt>().AsTransient();
+        Bind<MainMenuTextSliderInt>().AsTransient();
         
-        containerDefinition.Bind<GameSliderInt>().AsTransient();
-        containerDefinition.Bind<GameTextSliderInt>().AsTransient();
+        Bind<GameSliderInt>().AsTransient();
+        Bind<GameTextSliderInt>().AsTransient();
         
-        containerDefinition.Bind<MainMenuSlider>().AsTransient();
-        containerDefinition.Bind<MainMenuTextSlider>().AsTransient();
+        Bind<MainMenuSlider>().AsTransient();
+        Bind<MainMenuTextSlider>().AsTransient();
         
-        containerDefinition.Bind<GameSlider>().AsTransient();
-        containerDefinition.Bind<GameTextSlider>().AsTransient();
+        Bind<GameSlider>().AsTransient();
+        Bind<GameTextSlider>().AsTransient();
         
-        containerDefinition.Bind<GameMinMaxSlider>().AsTransient();
-        containerDefinition.Bind<GameTextMinMaxSlider>().AsTransient();
+        Bind<GameMinMaxSlider>().AsTransient();
+        Bind<GameTextMinMaxSlider>().AsTransient();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIPresets/TextFields/TextFieldPresetConfigurator.cs b/Src/TimberApi.UIPresets/TextFields/TextFieldPresetConfigurator.cs
index 82b508c9..ac44148c 100644
--- a/Src/TimberApi.UIPresets/TextFields/TextFieldPresetConfigurator.cs
+++ b/Src/TimberApi.UIPresets/TextFields/TextFieldPresetConfigurator.cs
@@ -5,10 +5,10 @@ namespace TimberApi.UIPresets.TextFields;
 [Context("MainMenu")]
 [Context("MapEditor")]
 [Context("Game")]
-public class TextFieldPresetConfigurator : IConfigurator
+public class TextFieldPresetConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<DefaultTextField>().AsTransient();
+        Bind<DefaultTextField>().AsTransient();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi.UIPresets/TimberApi.UIPresets.csproj b/Src/TimberApi.UIPresets/TimberApi.UIPresets.csproj
index faddd41f..e30211bc 100644
--- a/Src/TimberApi.UIPresets/TimberApi.UIPresets.csproj
+++ b/Src/TimberApi.UIPresets/TimberApi.UIPresets.csproj
@@ -12,8 +12,8 @@
         <ProjectReference Include="..\TimberApi\TimberApi.csproj"/>
     </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+    <ItemGroup>
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3"/>
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
@@ -21,6 +21,8 @@
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
     </ItemGroup>
 
     <PropertyGroup>
@@ -30,6 +32,6 @@
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
         <Message Text="### Copying files to plugins ###" Importance="high"/>
-        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\core"/>
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\TimberApi.UIBuilder\version-0.7"/>
     </Target>
 </Project>
diff --git a/Src/TimberApi.UIPresets/Toggles/TogglePresetConfigurator.cs b/Src/TimberApi.UIPresets/Toggles/TogglePresetConfigurator.cs
index 12ec6429..26758d36 100644
--- a/Src/TimberApi.UIPresets/Toggles/TogglePresetConfigurator.cs
+++ b/Src/TimberApi.UIPresets/Toggles/TogglePresetConfigurator.cs
@@ -5,14 +5,14 @@ namespace TimberApi.UIPresets.Toggles;
 [Context("MainMenu")]
 [Context("MapEditor")]
 [Context("Game")]
-public class TogglePresetConfigurator : IConfigurator
+public class TogglePresetConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<GameToggle>().AsTransient();
-        containerDefinition.Bind<GameTextToggle>().AsTransient();
+        Bind<GameToggle>().AsTransient();
+        Bind<GameTextToggle>().AsTransient();
         
-        containerDefinition.Bind<SettingToggle>().AsTransient();
-        containerDefinition.Bind<SettingTextToggle>().AsTransient();
+        Bind<SettingToggle>().AsTransient();
+        Bind<SettingTextToggle>().AsTransient();
     }
 }
\ No newline at end of file
diff --git a/Src/TimberApi/ContextManager.cs b/Src/TimberApi/ContextManager.cs
new file mode 100644
index 00000000..38f2af2b
--- /dev/null
+++ b/Src/TimberApi/ContextManager.cs
@@ -0,0 +1,39 @@
+using Bindito.Core.Internal;
+using HarmonyLib;
+using TimberApi.HarmonySystem;
+using Timberborn.SoakedEffects;
+using UnityEngine;
+
+namespace TimberApi;
+
+public class ContextManager
+{
+    public delegate void SceneChangedCallback(string previousScene, string currentScene);
+
+    public static string PreviousContext { get; private set; }
+
+    public static string CurrentContext { get; private set; } = "Unknown";
+
+    public static event SceneChangedCallback ContextChanged = delegate { };
+
+    internal static void Patch(Harmony harmony)
+    {
+        harmony.Patch(
+            harmony.GetMethodInfo<ContainerDefinition>(nameof(ContainerDefinition.InstallAll), [typeof(string)]),
+            harmony.GetHarmonyMethod<ContextManager>(nameof(OnContextChanged))
+        );
+    }
+    
+    private static void OnContextChanged(string contextName)
+    {
+        Debug.Log($"Context changed: {contextName}");
+        ChangeContext(contextName);
+    }
+
+    public static void ChangeContext(string sceneEntrypoint)
+    {
+        PreviousContext = CurrentContext;
+        CurrentContext = sceneEntrypoint;
+        ContextChanged(PreviousContext, CurrentContext);
+    }
+}
\ No newline at end of file
diff --git a/Src/TimberApi/DependencyContainerSystem/DependencyContainerConfigurator.cs b/Src/TimberApi/DependencyContainerSystem/DependencyContainerConfigurator.cs
index b45912a0..fe71003e 100644
--- a/Src/TimberApi/DependencyContainerSystem/DependencyContainerConfigurator.cs
+++ b/Src/TimberApi/DependencyContainerSystem/DependencyContainerConfigurator.cs
@@ -5,10 +5,10 @@ namespace TimberApi.DependencyContainerSystem;
 [Context("MainMenu")]
 [Context("Game")]
 [Context("MapEditor")]
-public class DependencyContainerConfigurator : IConfigurator
+public class DependencyContainerConfigurator : Configurator
 {
-    public void Configure(IContainerDefinition containerDefinition)
+    protected override void Configure()
     {
-        containerDefinition.Bind<DependencyContainer>().AsSingleton();
+        Bind<DependencyContainer>().AsSingleton();
     }
 }
diff --git a/Src/TimberApi/Extensions/IObjectLoaderExtensions.cs b/Src/TimberApi/Extensions/IObjectLoaderExtensions.cs
deleted file mode 100644
index 30d1166d..00000000
--- a/Src/TimberApi/Extensions/IObjectLoaderExtensions.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Timberborn.Persistence;
-using UnityEngine;
-
-namespace TimberApi.Extensions;
-
-// ReSharper disable once InconsistentNaming
-public static class IObjectLoaderExtensions
-{
-    public static T GetValueOrDefault<T>(this IObjectLoader objectLoader, PropertyKey<T> key, T defaultValue)
-        where T : Component
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static int GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<int> key, int defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static float GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<float> key, float defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static bool GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<bool> key, bool defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static string GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<string> key,
-        string defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static char GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<char> key, char defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static Quaternion GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<Quaternion> key,
-        Quaternion defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static Vector3 GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<Vector3> key,
-        Vector3 defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static Vector3Int GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<Vector3Int> key,
-        Vector3Int defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static Vector2 GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<Vector2> key,
-        Vector2 defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static Vector2Int GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<Vector2Int> key,
-        Vector2Int defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static Guid GetValueOrDefault(this IObjectLoader objectLoader, PropertyKey<Guid> key, Guid defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static T GetValueOrDefault<T>(this IObjectLoader objectLoader, PropertyKey<T> key, T defaultValue,
-        IObjectSerializer<T> serializer) where T : class
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key, serializer);
-    }
-    
-    public static List<int> GetValueOrDefault(this IObjectLoader objectLoader, ListKey<int> key, List<int> defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-    
-    public static List<float> GetValueOrDefault(this IObjectLoader objectLoader, ListKey<float> key, List<float> defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-    
-    public static List<bool> GetValueOrDefault(this IObjectLoader objectLoader, ListKey<bool> key, List<bool> defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-    
-    public static List<string> GetValueOrDefault(this IObjectLoader objectLoader, ListKey<string> key, List<string> defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-    
-    public static List<char> GetValueOrDefault(this IObjectLoader objectLoader, ListKey<char> key, List<char> defaultValue)
-    {
-        return !objectLoader.Has(key) ? defaultValue : objectLoader.Get(key);
-    }
-
-    public static List<T> GetValueOrEmpty<T>(this IObjectLoader objectLoader, ListKey<T> key,
-        IObjectSerializer<T> serializer) where T : class
-    {
-        return !objectLoader.Has(key) ? new List<T>() : objectLoader.Get(key, serializer);
-    }
-
-    public static List<int> GetValueOrEmpty(this IObjectLoader objectLoader, ListKey<int> key)
-    {
-        return !objectLoader.Has(key) ? new List<int>() : objectLoader.Get(key);
-    }
-
-    public static List<float> GetValueOrEmpty(this IObjectLoader objectLoader, ListKey<float> key)
-    {
-        return !objectLoader.Has(key) ? new List<float>() : objectLoader.Get(key);
-    }
-
-    public static List<bool> GetValueOrEmpty(this IObjectLoader objectLoader, ListKey<bool> key)
-    {
-        return !objectLoader.Has(key) ? new List<bool>() : objectLoader.Get(key);
-    }
-
-    public static List<string> GetValueOrEmpty(this IObjectLoader objectLoader, ListKey<string> key)
-    {
-        return !objectLoader.Has(key) ? new List<string>() : objectLoader.Get(key);
-    }
-
-    public static List<char> GetValueOrEmpty(this IObjectLoader objectLoader, ListKey<char> key)
-    {
-        return !objectLoader.Has(key) ? new List<char>() : objectLoader.Get(key);
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi/ModStarter.cs b/Src/TimberApi/ModStarter.cs
index bb6bdebc..fcfcbbbc 100644
--- a/Src/TimberApi/ModStarter.cs
+++ b/Src/TimberApi/ModStarter.cs
@@ -10,13 +10,13 @@ namespace TimberApi;
 
 public class ModStarter : IModStarter
 {
-    public void StartMod()
+    public void StartMod(IModEnvironment modEnvironment)
     {
         try
         {
             var harmony = new Harmony("TimberApi");
 
-            SceneManager.Patch(harmony);
+            ContextManager.Patch(harmony);
 
             harmony.Patch(
                 harmony.GetMethodInfo<SingletonLifecycleService>(nameof(SingletonLifecycleService.LoadAll)),
diff --git a/Src/TimberApi/Scene.cs b/Src/TimberApi/Scene.cs
deleted file mode 100644
index 74d989cf..00000000
--- a/Src/TimberApi/Scene.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace TimberApi;
-
-public enum Scene
-{
-    MainMenu,
-    Game,
-    MapEditor,
-    Unknown
-}
\ No newline at end of file
diff --git a/Src/TimberApi/SceneManager.cs b/Src/TimberApi/SceneManager.cs
deleted file mode 100644
index ad528a9b..00000000
--- a/Src/TimberApi/SceneManager.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Bindito.Core;
-using HarmonyLib;
-using TimberApi.HarmonySystem;
-using Timberborn.GameScene;
-using Timberborn.MainMenuScene;
-using Timberborn.MapEditorScene;
-
-namespace TimberApi;
-
-public class SceneManager
-{
-    public delegate void SceneChangedCallback(Scene previousScene, Scene currentScene,
-        IContainerDefinition currentContainerDefinition);
-
-    public static Scene PreviousScene { get; private set; }
-
-    public static Scene CurrentScene { get; private set; } = Scene.Unknown;
-
-    public static event SceneChangedCallback SceneChanged = delegate { };
-
-    internal static void Patch(Harmony harmony)
-    {
-        harmony.Patch(
-            harmony.GetMethodInfo<GameSceneInstaller>(nameof(GameSceneInstaller.Configure)),
-            harmony.GetHarmonyMethod<SceneManager>(nameof(PatchMasterSceneConfigurator))
-        );
-
-        harmony.Patch(
-            harmony.GetMethodInfo<MainMenuSceneConfigurator>(nameof(GameSceneInstaller.Configure)),
-            harmony.GetHarmonyMethod<SceneManager>(nameof(PatchMainMenuSceneConfigurator))
-        );
-
-        harmony.Patch(
-            harmony.GetMethodInfo<MapEditorSceneConfigurator>(nameof(GameSceneInstaller.Configure)),
-            harmony.GetHarmonyMethod<SceneManager>(nameof(PatchMapEditorSceneConfigurator))
-        );
-    }
-
-    private static void PatchMasterSceneConfigurator(IContainerDefinition containerDefinition)
-    {
-        ChangeScene(Scene.Game, containerDefinition);
-    }
-
-    private static void PatchMainMenuSceneConfigurator(IContainerDefinition containerDefinition)
-    {
-        ChangeScene(Scene.MainMenu, containerDefinition);
-    }
-
-    private static void PatchMapEditorSceneConfigurator(IContainerDefinition containerDefinition)
-    {
-        ChangeScene(Scene.MapEditor, containerDefinition);
-    }
-
-    public static void ChangeScene(Scene sceneEntrypoint, IContainerDefinition currentContainerDefinition)
-    {
-        PreviousScene = CurrentScene;
-        CurrentScene = sceneEntrypoint;
-        SceneChanged(PreviousScene, CurrentScene, currentContainerDefinition);
-    }
-}
\ No newline at end of file
diff --git a/Src/TimberApi/SingletonSystem/SingletonLifecycleServicePatcher.cs b/Src/TimberApi/SingletonSystem/SingletonLifecycleServicePatcher.cs
index 4a457bab..fc3ea879 100644
--- a/Src/TimberApi/SingletonSystem/SingletonLifecycleServicePatcher.cs
+++ b/Src/TimberApi/SingletonSystem/SingletonLifecycleServicePatcher.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Timberborn.SingletonSystem;
+using UnityEngine;
 
 // ReSharper disable InconsistentNaming
 
@@ -12,6 +13,7 @@ public static void LoadAllPrefix(ISingletonRepository ____singletonRepository)
     {
         LoadSingleton(____singletonRepository.GetSingletons<ITimberApiLoadableSingleton>(),
             singleton => singleton.Load());
+        
         LoadSingleton(____singletonRepository.GetSingletons<ITimberApiPostLoadableSingleton>(),
             singleton => singleton.PostLoad());
     }
diff --git a/Src/TimberApi/TimberApi.csproj b/Src/TimberApi/TimberApi.csproj
index e1084915..298ffde3 100644
--- a/Src/TimberApi/TimberApi.csproj
+++ b/Src/TimberApi/TimberApi.csproj
@@ -8,7 +8,6 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <UseLocalTimberbornSource>false</UseLocalTimberbornSource>
         <CopyDllToPath>false</CopyDllToPath>
         <ModPath>Documents/Mods</ModPath>
     </PropertyGroup>
@@ -16,22 +15,20 @@
     <ItemGroup>
         <PackageReference Include="Lib.Harmony" Version="2.3.3"/>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-        <PackageReference Include="System.Collections.Immutable" Version="5.0.0"/>
-        <PackageReference Include="UnityEngine.Modules" Version="6000.0.4" IncludeAssets="compile"/>
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.0"/>
         <PackageReference Include="Castle.Core" Version="5.1.1"/>
-        <!--        Needs to be updated-->
-        <PackageReference Include="Timberborn.GameLibs" Version="0.3.4.3-r.0" ExcludeAssets="All" Condition="$(UseLocalTimberbornSource)"/>
-    </ItemGroup>
 
-    <ItemGroup Condition="$(UseLocalTimberbornSource)">
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.2"/>
+        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.3" />
 
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Timberborn.*.dll" Publicize="true">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+
         <Reference Include="$(SolutionDir)Timberborn\Timberborn_Data\Managed\Bindito.*.dll">
             <DestinationSubDirectory>libs/</DestinationSubDirectory>
         </Reference>
+        
+        <Reference Include="$(SolutionDir)Libs\UnityEngine.*.dll" Publicize="true" />
     </ItemGroup>
 
     <Target Name="CopyingFilesToTimberborn" BeforeTargets="AfterBuild" Condition="$(CopyDllToPath)">
@@ -40,7 +37,7 @@
         </ItemGroup>
 
         <Message Text="### Copying files to plugins ###" Importance="high"/>
-        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\core"/>
+        <Copy SourceFiles="$(TargetDir)$(TargetFileName)" DestinationFolder="$(ModPath)\$(SolutionName)\version-0.7\core"/>
         <Copy SourceFiles="@(ModPackagePath)" DestinationFolder="$(ModPath)\$(SolutionName)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
     </Target>
 </Project>
diff --git a/TimberAPI.sln b/TimberAPI.sln
index 7282c47f..3927d8dd 100644
--- a/TimberAPI.sln
+++ b/TimberAPI.sln
@@ -21,8 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{41EF4C9F-9
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug", "Debug", "{DCEA2668-0A15-4986-862A-5A8458574661}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoModStarter", "Debug\AutoModStarter\AutoModStarter.csproj", "{7B795429-D8F9-49B7-B28F-083CF839B738}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{A2296ABE-3AC0-4925-AAAE-5307D9B8BA9B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimberApi.BottomBarSystem", "Src\TimberApi.BottomBarSystem\TimberApi.BottomBarSystem.csproj", "{AB5C2FE8-9552-4E22-AEDE-742CADFED531}"
@@ -47,6 +45,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildingSpecificationSystem
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimberApi.TesterMod", "Debug\TimberApi.TesterMod\TimberApi.TesterMod.csproj", "{D5BE7FAF-1007-4C0E-B551-1BD4FAC89C78}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimberApi.SpecificationPatcherSystem", "Src\TimberApi.SpecificationPatcherSystem\TimberApi.SpecificationPatcherSystem.csproj", "{A5AA5ACE-4AF6-4062-9E42-2C3F4D4541D0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetterBottomBar", "Debug\BetterBottomBar\BetterBottomBar.csproj", "{C13E5AFA-61B0-4FA6-BE9F-AA13A9D5B525}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -61,14 +63,6 @@ Global
 		{050BA3CB-21E1-4EB7-B2E2-31C9C9ED70FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{050BA3CB-21E1-4EB7-B2E2-31C9C9ED70FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{050BA3CB-21E1-4EB7-B2E2-31C9C9ED70FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{375DBE2B-3361-4EBD-939E-8CE04A8482F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{375DBE2B-3361-4EBD-939E-8CE04A8482F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{375DBE2B-3361-4EBD-939E-8CE04A8482F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{375DBE2B-3361-4EBD-939E-8CE04A8482F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B795429-D8F9-49B7-B28F-083CF839B738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B795429-D8F9-49B7-B28F-083CF839B738}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B795429-D8F9-49B7-B28F-083CF839B738}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B795429-D8F9-49B7-B28F-083CF839B738}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB5C2FE8-9552-4E22-AEDE-742CADFED531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB5C2FE8-9552-4E22-AEDE-742CADFED531}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB5C2FE8-9552-4E22-AEDE-742CADFED531}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -97,20 +91,22 @@ Global
 		{3337881E-5899-4621-9A72-1472BC1DD96A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3337881E-5899-4621-9A72-1472BC1DD96A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3337881E-5899-4621-9A72-1472BC1DD96A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{657C6C03-BFE8-4688-B23D-099930AC81C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{657C6C03-BFE8-4688-B23D-099930AC81C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{657C6C03-BFE8-4688-B23D-099930AC81C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{657C6C03-BFE8-4688-B23D-099930AC81C2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5BE7FAF-1007-4C0E-B551-1BD4FAC89C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D5BE7FAF-1007-4C0E-B551-1BD4FAC89C78}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D5BE7FAF-1007-4C0E-B551-1BD4FAC89C78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5BE7FAF-1007-4C0E-B551-1BD4FAC89C78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5AA5ACE-4AF6-4062-9E42-2C3F4D4541D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5AA5ACE-4AF6-4062-9E42-2C3F4D4541D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5AA5ACE-4AF6-4062-9E42-2C3F4D4541D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5AA5ACE-4AF6-4062-9E42-2C3F4D4541D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C13E5AFA-61B0-4FA6-BE9F-AA13A9D5B525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C13E5AFA-61B0-4FA6-BE9F-AA13A9D5B525}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C13E5AFA-61B0-4FA6-BE9F-AA13A9D5B525}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C13E5AFA-61B0-4FA6-BE9F-AA13A9D5B525}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{FCD68CD4-2C29-4D4D-BAD9-4F3557E9184E} = {0DA10803-225A-45AA-9FF7-5136941817FC}
 		{050BA3CB-21E1-4EB7-B2E2-31C9C9ED70FF} = {0DA10803-225A-45AA-9FF7-5136941817FC}
-		{375DBE2B-3361-4EBD-939E-8CE04A8482F5} = {0DA10803-225A-45AA-9FF7-5136941817FC}
-		{7B795429-D8F9-49B7-B28F-083CF839B738} = {DCEA2668-0A15-4986-862A-5A8458574661}
 		{A2296ABE-3AC0-4925-AAAE-5307D9B8BA9B} = {0DA10803-225A-45AA-9FF7-5136941817FC}
 		{AB5C2FE8-9552-4E22-AEDE-742CADFED531} = {A2296ABE-3AC0-4925-AAAE-5307D9B8BA9B}
 		{6D1AE96F-26BD-4870-A397-DCD1AABD9070} = {A2296ABE-3AC0-4925-AAAE-5307D9B8BA9B}
@@ -122,7 +118,8 @@ Global
 		{A6F03DEB-1982-45D0-A561-F9AD9A1CBD84} = {DCEA2668-0A15-4986-862A-5A8458574661}
 		{C8B9BCD7-6FAA-40A7-B230-660B78092C36} = {0DA10803-225A-45AA-9FF7-5136941817FC}
 		{3337881E-5899-4621-9A72-1472BC1DD96A} = {C8B9BCD7-6FAA-40A7-B230-660B78092C36}
-		{657C6C03-BFE8-4688-B23D-099930AC81C2} = {0DA10803-225A-45AA-9FF7-5136941817FC}
 		{D5BE7FAF-1007-4C0E-B551-1BD4FAC89C78} = {DCEA2668-0A15-4986-862A-5A8458574661}
+		{A5AA5ACE-4AF6-4062-9E42-2C3F4D4541D0} = {C8B9BCD7-6FAA-40A7-B230-660B78092C36}
+		{C13E5AFA-61B0-4FA6-BE9F-AA13A9D5B525} = {DCEA2668-0A15-4986-862A-5A8458574661}
 	EndGlobalSection
 EndGlobal
diff --git a/TimberAPI.sln.DotSettings b/TimberAPI.sln.DotSettings
new file mode 100644
index 00000000..06b71d5d
--- /dev/null
+++ b/TimberAPI.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeEditing/SuppressUninitializedWarningFix/Enabled/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file