diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index abe202a..3c5e752 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -208,7 +208,7 @@ if(korman_BUILD_HSPLASMA)
     korman_add_external_project(HSPlasma
         GIT_REPOSITORY "https://github.com/H-uru/libhsplasma.git"
         # Be sure to increase this as the feature set used by Korman increases
-        GIT_TAG 6fa56d979163af8602cd6212449a07400a14b532
+        GIT_TAG 260ccccd464c002d1655c10acdc3335d10e52542
         # We can only do shallow checkouts if the above is a branch or tag.
         GIT_SHALLOW FALSE
         CMAKE_CACHE_ARGS
diff --git a/korman/exporter/convert.py b/korman/exporter/convert.py
index 2574079..f08e4cb 100644
--- a/korman/exporter/convert.py
+++ b/korman/exporter/convert.py
@@ -19,28 +19,47 @@ from collections import defaultdict
 from contextlib import ExitStack
 import functools
 from pathlib import Path
+from typing import *
 
 from ..helpers import TemporaryObject
 from ..korlib import ConsoleToggler
 
 from PyHSPlasma import *
 
-from . import animation
-from . import camera
-from . import decal
+from .animation import AnimationConverter
+from .camera import CameraConverter
+from .decal import DecalConverter
 from . import explosions
-from . import etlight
-from . import image
-from . import locman
+from .etlight import LightBaker
+from .image import ImageCache
+from .locman import LocalizationConverter
 from . import logger
-from . import manager
-from . import mesh
-from . import outfile
-from . import physics
-from . import rtlight
+from .manager import ExportManager
+from .mesh import MeshConverter
+from .outfile import OutputFiles
+from .physics import PhysicsConverter
+from .rtlight import LightConverter
 from . import utils
 
 class Exporter:
+
+    if TYPE_CHECKING:
+        actors: Set[str] = ...
+        want_node_trees: defaultdict[Set[str]] = ...
+        report: logger._ExportLogger = ...
+        exit_stack: ExitStack = ...
+        mgr: ExportManager = ...
+        mesh: MeshConverter = ...
+        physics: PhysicsConverter = ...
+        light: LightConverter = ...
+        animation: AnimationConverter = ...
+        output: OutputFiles = ...
+        camera: CameraConverter = ...
+        image: ImageCache = ...
+        locman: LocalizationConverter = ...
+        decal: DecalConverter = ...
+        oven: LightBaker = ...
+
     def __init__(self, op):
         self._op = op # Blender export operator
         self._objects = []
@@ -52,17 +71,17 @@ class Exporter:
         log = logger.ExportVerboseLogger if self._op.verbose else logger.ExportProgressLogger
         with ConsoleToggler(self._op.show_console), log(self._op.filepath) as self.report, ExitStack() as self.exit_stack:
             # Step 0: Init export resmgr and stuff
-            self.mgr = manager.ExportManager(self)
-            self.mesh = mesh.MeshConverter(self)
-            self.physics = physics.PhysicsConverter(self)
-            self.light = rtlight.LightConverter(self)
-            self.animation = animation.AnimationConverter(self)
-            self.output = outfile.OutputFiles(self, self._op.filepath)
-            self.camera = camera.CameraConverter(self)
-            self.image = image.ImageCache(self)
-            self.locman = locman.LocalizationConverter(self)
-            self.decal = decal.DecalConverter(self)
-            self.oven = etlight.LightBaker(mesh=self.mesh, report=self.report)
+            self.mgr = ExportManager(self)
+            self.mesh = MeshConverter(self)
+            self.physics = PhysicsConverter(self)
+            self.light = LightConverter(self)
+            self.animation = AnimationConverter(self)
+            self.output = OutputFiles(self, self._op.filepath)
+            self.camera = CameraConverter(self)
+            self.image = ImageCache(self)
+            self.locman = LocalizationConverter(self)
+            self.decal = DecalConverter(self)
+            self.oven = LightBaker(mesh=self.mesh, report=self.report)
 
             # Step 0.8: Init the progress mgr
             self.mesh.add_progress_presteps(self.report)
@@ -72,7 +91,7 @@ class Exporter:
             self.report.progress_add_step("Unifying Superstrings")
             self.report.progress_add_step("Harvesting Actors")
             if self._op.lighting_method != "skip":
-                etlight.LightBaker.add_progress_steps(self.report)
+                LightBaker.add_progress_steps(self.report)
             self.report.progress_add_step("Exporting Scene Objects")
             self.report.progress_add_step("Exporting Logic Nodes")
             self.report.progress_add_step("Finalizing Plasma Logic")