diff --git a/.gitmodules b/.gitmodules
index f74de2d..7ac2102 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,7 +14,7 @@
 	path = submodules/Penumbra.String
 	url = https://github.com/Ottermandias/Penumbra.String.git
 	branch = main
-[submodule "submodules/ECommons"]
-	path = submodules/ECommons
-	url = https://github.com/NightmareXIV/ECommons.git
-	branch = master
+[submodule "submodules/ECommonsLite"]
+	path = submodules/ECommonsLite
+	url = https://github.com/Aether-Tools/ECommonsLite.git
+	branch = main
diff --git a/CustomizePlus.sln b/CustomizePlus.sln
index ec07346..1d09a6c 100644
--- a/CustomizePlus.sln
+++ b/CustomizePlus.sln
@@ -22,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.Api", "submodules\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Penumbra.String", "submodules\Penumbra.String\Penumbra.String.csproj", "{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ECommons", "submodules\ECommons\ECommons\ECommons.csproj", "{0234819A-193E-4B75-A528-23E71C9FB1C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ECommonsLite", "submodules\ECommonsLite\ECommonsLite\ECommonsLite.csproj", "{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -80,14 +80,14 @@ Global
 		{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}.Release|x64.ActiveCfg = Release|Any CPU
 		{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823}.Release|x64.Build.0 = Release|Any CPU
-		{0234819A-193E-4B75-A528-23E71C9FB1C8}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{0234819A-193E-4B75-A528-23E71C9FB1C8}.Debug|Any CPU.Build.0 = Debug|x64
-		{0234819A-193E-4B75-A528-23E71C9FB1C8}.Debug|x64.ActiveCfg = Debug|x64
-		{0234819A-193E-4B75-A528-23E71C9FB1C8}.Debug|x64.Build.0 = Debug|x64
-		{0234819A-193E-4B75-A528-23E71C9FB1C8}.Release|Any CPU.ActiveCfg = Release|x64
-		{0234819A-193E-4B75-A528-23E71C9FB1C8}.Release|Any CPU.Build.0 = Release|x64
-		{0234819A-193E-4B75-A528-23E71C9FB1C8}.Release|x64.ActiveCfg = Release|x64
-		{0234819A-193E-4B75-A528-23E71C9FB1C8}.Release|x64.Build.0 = Release|x64
+		{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Debug|Any CPU.Build.0 = Debug|x64
+		{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Debug|x64.ActiveCfg = Debug|x64
+		{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Debug|x64.Build.0 = Debug|x64
+		{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Release|Any CPU.ActiveCfg = Release|x64
+		{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Release|Any CPU.Build.0 = Release|x64
+		{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Release|x64.ActiveCfg = Release|x64
+		{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -97,7 +97,7 @@ Global
 		{D79C8833-D241-4867-BF6F-8097E0ED8067} = {121C2200-A844-44FD-85C4-22D6C7E35553}
 		{CC460943-1E07-4FA0-8B8C-67F0EF385290} = {121C2200-A844-44FD-85C4-22D6C7E35553}
 		{CB1DFB63-22D9-4E90-A8C1-A4F7CFEF7823} = {121C2200-A844-44FD-85C4-22D6C7E35553}
-		{0234819A-193E-4B75-A528-23E71C9FB1C8} = {121C2200-A844-44FD-85C4-22D6C7E35553}
+		{41F4BB08-FCFD-420F-AD18-ED9D7FB3251C} = {121C2200-A844-44FD-85C4-22D6C7E35553}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B17E85B1-5F60-4440-9F9A-3DDE877E8CDF}
diff --git a/CustomizePlus/Api/CustomizePlusIpc.GameState.cs b/CustomizePlus/Api/CustomizePlusIpc.GameState.cs
index 511b9e5..f994965 100644
--- a/CustomizePlus/Api/CustomizePlusIpc.GameState.cs
+++ b/CustomizePlus/Api/CustomizePlusIpc.GameState.cs
@@ -1,5 +1,5 @@
 using CustomizePlus.Api.Enums;
-using ECommons.EzIpcManager;
+using ECommonsLite.EzIpcManager;
 
 namespace CustomizePlus.Api;
 
diff --git a/CustomizePlus/Api/CustomizePlusIpc.General.cs b/CustomizePlus/Api/CustomizePlusIpc.General.cs
index 6025623..146a25b 100644
--- a/CustomizePlus/Api/CustomizePlusIpc.General.cs
+++ b/CustomizePlus/Api/CustomizePlusIpc.General.cs
@@ -1,4 +1,4 @@
-using ECommons.EzIpcManager;
+using ECommonsLite.EzIpcManager;
 
 namespace CustomizePlus.Api;
 
diff --git a/CustomizePlus/Api/CustomizePlusIpc.Profile.cs b/CustomizePlus/Api/CustomizePlusIpc.Profile.cs
index 8bac17c..bd25c64 100644
--- a/CustomizePlus/Api/CustomizePlusIpc.Profile.cs
+++ b/CustomizePlus/Api/CustomizePlusIpc.Profile.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using ECommons.EzIpcManager;
+using ECommonsLite.EzIpcManager;
 using Newtonsoft.Json;
 using CustomizePlus.Api.Data;
 using CustomizePlus.Api.Enums;
diff --git a/CustomizePlus/Api/CustomizePlusIpc.cs b/CustomizePlus/Api/CustomizePlusIpc.cs
index 6c60887..fab13a0 100644
--- a/CustomizePlus/Api/CustomizePlusIpc.cs
+++ b/CustomizePlus/Api/CustomizePlusIpc.cs
@@ -5,7 +5,7 @@ using CustomizePlus.GameData.Services;
 using CustomizePlus.Profiles;
 using CustomizePlus.Profiles.Events;
 using Dalamud.Plugin;
-using ECommons.EzIpcManager;
+using ECommonsLite.EzIpcManager;
 using OtterGui.Log;
 using System;
 
diff --git a/CustomizePlus/Core/Services/CommandService.cs b/CustomizePlus/Core/Services/CommandService.cs
index 1043279..95e4e0e 100644
--- a/CustomizePlus/Core/Services/CommandService.cs
+++ b/CustomizePlus/Core/Services/CommandService.cs
@@ -15,7 +15,7 @@ using CustomizePlus.Configuration.Data;
 using Dalamud.Interface.ImGuiNotification;
 using CustomizePlus.GameData.Extensions;
 using System.Collections.Generic;
-using ECommons;
+using ECommonsLite;
 using CustomizePlus.Core.Helpers;
 
 namespace CustomizePlus.Core.Services;
diff --git a/CustomizePlus/CustomizePlus.csproj b/CustomizePlus/CustomizePlus.csproj
index 25c95b3..d712c6b 100644
--- a/CustomizePlus/CustomizePlus.csproj
+++ b/CustomizePlus/CustomizePlus.csproj
@@ -48,7 +48,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <ProjectReference Include="..\CustomizePlus.GameData\CustomizePlus.GameData.csproj" />
-    <ProjectReference Include="..\submodules\ECommons\ECommons\ECommons.csproj" />
+    <ProjectReference Include="..\submodules\ECommonsLite\ECommonsLite\ECommonsLite.csproj" />
     <ProjectReference Include="..\submodules\OtterGui\OtterGui.csproj" />
     <Reference Include="Newtonsoft.Json">
       <HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
diff --git a/CustomizePlus/Plugin.cs b/CustomizePlus/Plugin.cs
index 8620e7a..3ea8407 100644
--- a/CustomizePlus/Plugin.cs
+++ b/CustomizePlus/Plugin.cs
@@ -5,7 +5,7 @@ using CustomizePlus.Core.Helpers;
 using CustomizePlus.Core.Services;
 using CustomizePlus.UI;
 using Dalamud.Plugin;
-using ECommons;
+using ECommonsLite;
 using OtterGui.Log;
 using OtterGui.Services;
 using Penumbra.GameData.Actors;
@@ -22,7 +22,7 @@ public sealed class Plugin : IDalamudPlugin
     {
         try
         {
-            ECommonsMain.Init(pluginInterface, this);
+            ECommonsLiteMain.Init(pluginInterface, this);
 
             _services = ServiceManagerBuilder.CreateProvider(pluginInterface, Logger);
 
@@ -48,6 +48,6 @@ public sealed class Plugin : IDalamudPlugin
     {
         _services?.Dispose();
 
-        ECommonsMain.Dispose();
+        ECommonsLiteMain.Dispose();
     }
 }
\ No newline at end of file
diff --git a/CustomizePlus/UI/Windows/MainWindow/MainWindow.cs b/CustomizePlus/UI/Windows/MainWindow/MainWindow.cs
index ab04c18..f9964e1 100644
--- a/CustomizePlus/UI/Windows/MainWindow/MainWindow.cs
+++ b/CustomizePlus/UI/Windows/MainWindow/MainWindow.cs
@@ -13,12 +13,12 @@ using CustomizePlus.UI.Windows.Controls;
 using CustomizePlus.UI.Windows.MainWindow.Tabs.Profiles;
 using CustomizePlus.UI.Windows.MainWindow.Tabs;
 using CustomizePlus.Templates;
-using ECommons.ImGuiMethods;
+using ECommonsLite.ImGuiMethods;
 using static System.Windows.Forms.AxHost;
 using Dalamud.Interface.Colors;
 using CustomizePlus.Templates.Events;
 using CustomizePlus.Templates.Data;
-using ECommons.Schedulers;
+using ECommonsLite.Schedulers;
 using CustomizePlus.Core.Helpers;
 
 namespace CustomizePlus.UI.Windows.MainWindow;
diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs
index 4e04219..05c8b47 100644
--- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs
+++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/IPCTestTab.cs
@@ -11,7 +11,7 @@ using CustomizePlus.Configuration.Helpers;
 using CustomizePlus.Game.Services;
 using CustomizePlus.GameData.Services;
 using Penumbra.GameData.Actors;
-using ECommons.EzIpcManager;
+using ECommonsLite.EzIpcManager;
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs
index b5a9ad6..af8bffb 100644
--- a/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs
+++ b/CustomizePlus/UI/Windows/MainWindow/Tabs/Templates/TemplatePanel.cs
@@ -8,14 +8,12 @@ using System.Linq;
 using System.Numerics;
 using System.Windows.Forms;
 using CustomizePlus.Core.Data;
-using CustomizePlus.Game.Services;
 using CustomizePlus.Templates;
 using CustomizePlus.Configuration.Data;
 using CustomizePlus.Core.Helpers;
 using CustomizePlus.Templates.Data;
 using OtterGui.Log;
 using CustomizePlus.Templates.Events;
-using ECommons.Schedulers;
 
 namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Templates;
 
diff --git a/submodules/ECommons b/submodules/ECommons
deleted file mode 160000
index b7282bc..0000000
--- a/submodules/ECommons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b7282bc11ca11c9c8f4ac4fd231857ba97517c17
diff --git a/submodules/ECommonsLite b/submodules/ECommonsLite
new file mode 160000
index 0000000..b6f1f3d
--- /dev/null
+++ b/submodules/ECommonsLite
@@ -0,0 +1 @@
+Subproject commit b6f1f3d60a918e2895340f7accafc5de15296ce7