diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 7e2c5c1..3a5407a 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -163,6 +163,7 @@ jobs:
           name: BitMagic-TheEmulator
           path: .
 
+# todo: replace these with https://github.com/softprops/action-gh-release
       - name: Create Github Release
         uses: "marvinpinto/action-automatic-releases@latest"
         if: github.ref == 'refs/heads/main'
diff --git a/BitMagic.Libraries b/BitMagic.Libraries
index a16c30e..376e6cf 160000
--- a/BitMagic.Libraries
+++ b/BitMagic.Libraries
@@ -1 +1 @@
-Subproject commit a16c30e531e30e9143581ba32bb47a79c2c5ced3
+Subproject commit 376e6cf8d3dd6962c15454a2d3b9921e4b3ab3cc
diff --git a/BitMagic.TemplateEngine b/BitMagic.TemplateEngine
index 9935285..49d3c80 160000
--- a/BitMagic.TemplateEngine
+++ b/BitMagic.TemplateEngine
@@ -1 +1 @@
-Subproject commit 99352859e136a820adb39f264f001fe684b188e8
+Subproject commit 49d3c80c1e47a3c4a967e89f0b66500d12d4bce9
diff --git a/BitMagic.VSC b/BitMagic.VSC
index 53c491b..65f7f52 160000
--- a/BitMagic.VSC
+++ b/BitMagic.VSC
@@ -1 +1 @@
-Subproject commit 53c491b6e728b14bab8ecfc259f970a20ff4861d
+Subproject commit 65f7f5226a74260075091712bbdf8caedaa873bf
diff --git a/BitMagic.X16Compiler b/BitMagic.X16Compiler
index 249367c..f08905e 160000
--- a/BitMagic.X16Compiler
+++ b/BitMagic.X16Compiler
@@ -1 +1 @@
-Subproject commit 249367cac3f1696aa43cc17edff2107efe188337
+Subproject commit f08905e88dae86bc805fb0412f81098d0a9da92f
diff --git a/BitMagic.X16Debugger b/BitMagic.X16Debugger
index 7a4ace3..922ef46 160000
--- a/BitMagic.X16Debugger
+++ b/BitMagic.X16Debugger
@@ -1 +1 @@
-Subproject commit 7a4ace3545f0711caf058d84d36b9ff72b3b46a5
+Subproject commit 922ef46073b64da20e76a1e46e99683a8f9fb861
diff --git a/BitMagic.X16Emulator b/BitMagic.X16Emulator
index f6e26a8..ceb351e 160000
--- a/BitMagic.X16Emulator
+++ b/BitMagic.X16Emulator
@@ -1 +1 @@
-Subproject commit f6e26a86cc9b16cbcaafefa3805d1dfa931ba645
+Subproject commit ceb351e8ec797360d4a65b5bfa2f40a78689e01f
diff --git a/BitMagic.sln b/BitMagic.sln
index 26ed266..7e4df12 100644
--- a/BitMagic.sln
+++ b/BitMagic.sln
@@ -97,6 +97,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BitMagic.ImageHelper", "Bit
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BitMagic.ImageHelper.Tester", "BitMagic.X16Debugger\BitMagic.ImageHelper.Tester\BitMagic.ImageHelper.Tester.csproj", "{B47D2EDF-10E7-477B-B0FF-C308AC152CE1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X16KernelTokenGenerator", "BitMagic.X16Debugger\X16KernelTokenGenerator\X16KernelTokenGenerator.csproj", "{315F6888-5BEC-4C36-811C-CB162EA85EFE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -467,6 +469,18 @@ Global
 		{B47D2EDF-10E7-477B-B0FF-C308AC152CE1}.Release|x64.Build.0 = Release|Any CPU
 		{B47D2EDF-10E7-477B-B0FF-C308AC152CE1}.Release|x86.ActiveCfg = Release|Any CPU
 		{B47D2EDF-10E7-477B-B0FF-C308AC152CE1}.Release|x86.Build.0 = Release|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Debug|x64.Build.0 = Debug|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Debug|x86.Build.0 = Debug|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Release|x64.ActiveCfg = Release|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Release|x64.Build.0 = Release|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Release|x86.ActiveCfg = Release|Any CPU
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -500,6 +514,7 @@ Global
 		{433CBB5C-1DAF-4CDA-877B-B59E51D85163} = {2AC26269-B752-46BF-8C4A-C5F18B733821}
 		{CF8BC7BD-5BBA-48D2-A334-747D0D11FFB3} = {25ADB53E-2320-490D-BA5D-A919AF7B42E5}
 		{B47D2EDF-10E7-477B-B0FF-C308AC152CE1} = {25ADB53E-2320-490D-BA5D-A919AF7B42E5}
+		{315F6888-5BEC-4C36-811C-CB162EA85EFE} = {A8C28097-0281-4E86-BEA0-8864A21B72B9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DFCB7DF5-52B3-4B9B-9814-3EC16549A76F}