diff --git a/CMakeLists.txt b/CMakeLists.txt
index 078ae4d9..70f2b8aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -353,7 +353,7 @@ target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources"
 target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
 
 # Link libraries
-target_link_libraries(lego1 PRIVATE tglrl realtime viewmanager mxdirectx roi FLIC::FLIC Vec::Vec dinput dxguid Smacker::Smacker misc 3dmanager omni)
+target_link_libraries(lego1 PRIVATE tglrl viewmanager realtime mxdirectx roi FLIC::FLIC Vec::Vec dinput dxguid Smacker::Smacker misc 3dmanager omni)
 
 if (ISLE_USE_SMARTHEAP)
   foreach(tgt IN LISTS lego1_targets)
diff --git a/LEGO1/LegoOmni.mingw.def b/LEGO1/LegoOmni.mingw.def
index 7857fc93..d5d9e052 100644
--- a/LEGO1/LegoOmni.mingw.def
+++ b/LEGO1/LegoOmni.mingw.def
@@ -1,4 +1,4 @@
-; LegoOmni.def : Declares the module paarameters for the LEGO1DLL.
+; LegoOmni.def : Declares the module paarameters for the LEGO1.DLL.
 
 DESCRIPTION  " Lego OMNI Windows Dynamic Link Library"
 
@@ -6,13 +6,10 @@ EXPORTS
 
 ; EXPORTs really required only.
 
-_ZN19LegoBackgroundColorC1EPKcS1_@8 = _ZN19LegoBackgroundColorC1EPKcS1_
-_ZN19LegoBackgroundColorC2EPKcS1_@8 = _ZN19LegoBackgroundColorC2EPKcS1_
-_ZN13LegoGameState11SetSavePathEPc@4 = _ZN13LegoGameState11SetSavePathEPc
-_ZN13LegoGameState20SerializePlayersInfoEs@4 = _ZN13LegoGameState20SerializePlayersInfoEs
-_ZN13LegoGameState21SerializeScoreHistoryEs@4 = _ZN13LegoGameState21SerializeScoreHistoryEs
-_ZN13LegoGameState4LoadEj@4 = _ZN13LegoGameState4LoadEj
-_ZN13LegoGameState4SaveEj@4 = _ZN13LegoGameState4SaveEj
+_ZN13LegoGameState11SetSavePathEPc
+_ZN13LegoGameState20SerializePlayersInfoEs
+_ZN13LegoGameState21SerializeScoreHistoryEs
+_ZN13LegoGameState4SaveEj
 _ZN13LegoGameStateC1Ev
 _ZN13LegoGameStateC2Ev
 _ZN13LegoGameStateD1Ev
@@ -53,49 +50,50 @@ _ZN10MxDSActionC2Ev
 _ZN10MxDSActionD0Ev
 _ZN10MxDSActionD1Ev
 _ZN10MxDSActionD2Ev
-_ZN10MxDSObject13SetObjectNameEPKc@4 = _ZN10MxDSObject13SetObjectNameEPKc
-_ZN10MxStreamer4OpenEPKct@8 = _ZN10MxStreamer4OpenEPKct
-_ZN10MxStreamer5CloseEPKc@4 = _ZN10MxStreamer5CloseEPKc
+_ZN10MxDSObject13SetObjectNameEPKc
+_ZN10MxStreamer4OpenEPKct
+_ZN10MxStreamer5CloseEPKc
 _ZN11MxPresenter10DoneTickleEv
 _ZN11MxPresenter10ParseExtraEv
-_ZN11MxPresenter11StartActionEP18MxStreamControllerP10MxDSAction@8 = _ZN11MxPresenter11StartActionEP18MxStreamControllerP10MxDSAction
+_ZN11MxPresenter11StartActionEP18MxStreamControllerP10MxDSAction
 _ZN11MxPresenter4InitEv
-_ZN11MxPresenter6EnableEh@4 = _ZN11MxPresenter6EnableEh
+_ZN11MxPresenter6EnableEh
 _ZN11MxPresenter6TickleEv
 _ZN11MxPresenter9EndActionEv
 _ZN11MxPresenterD0Ev
 _ZN11MxPresenterD1Ev
 _ZN11MxPresenterD2Ev
 _ZN11MxScheduler11GetInstanceEv
-_ZN11MxScheduler17StartMultiTaskingEj@4 = _ZN11MxScheduler17StartMultiTaskingEj
-_ZN11ViewManager9RemoveAllEP7ViewROI@4 = _ZN11ViewManager9RemoveAllEP7ViewROI
+_ZN11MxScheduler17StartMultiTaskingEj
+_ZN11ViewManager9RemoveAllEP7ViewROI
 _ZN12MxDirectDraw16FlipToGDISurfaceEv
 _ZN12MxDirectDraw18GetPrimaryBitDepthEv
-_ZN12MxDirectDraw5PauseEi@4 = _ZN12MxDirectDraw5PauseEi
-_ZN12MxVideoParam13SetDeviceNameEPc@4 = _ZN12MxVideoParam13SetDeviceNameEPc
-_ZN12MxVideoParamC1ERS_@4 = _ZN12MxVideoParamC1ERS_
+_ZN12MxDirectDraw5PauseEi
+_ZN12MxVideoParam13SetDeviceNameEPc
+_ZN12MxVideoParamC1ERS_
 _ZN12MxVideoParamC1Ev
-_ZN12MxVideoParamC2ERS_@4 = _ZN12MxVideoParamC2ERS_
+_ZN12MxVideoParamC2ERS_
 _ZN12MxVideoParamC2Ev
 _ZN12MxVideoParamD1Ev
 _ZN12MxVideoParamD2Ev
-_ZN12MxVideoParamaSERKS_@4 = _ZN12MxVideoParamaSERKS_
+_ZN12MxVideoParamaSERKS_
 _ZN12RealtimeView13GetUserMaxLODEv
 _ZN12RealtimeView13SetUserMaxLODEf
 _ZN12RealtimeView17GetPartsThresholdEv
 _ZN12RealtimeView17SetPartsThresholdEf
-_ZN14MxVideoManager14InvalidateRectER8MxRect32@4 = _ZN14MxVideoManager14InvalidateRectER8MxRect32
-_ZN14MxVideoManager14RealizePaletteEP9MxPalette@4 = _ZN14MxVideoManager14RealizePaletteEP9MxPalette
-_ZN15MxVariableTable11GetVariableEPKc@4 = _ZN15MxVariableTable11GetVariableEPKc
-_ZN15MxVariableTable11SetVariableEP10MxVariable@4 = _ZN15MxVariableTable11SetVariableEP10MxVariable
-_ZN15MxVariableTable11SetVariableEPKcS1_@8 = _ZN15MxVariableTable11SetVariableEPKcS1_
-_ZN16LegoInputManager10QueueEventE14NotificationIdhiih@20 = _ZN16LegoInputManager10QueueEventE14NotificationIdhiih
-_ZN16LegoInputManager10UnRegisterEP6MxCore@4 = _ZN16LegoInputManager10UnRegisterEP6MxCore
-_ZN16LegoInputManager8RegisterEP6MxCore@4 = _ZN16LegoInputManager8RegisterEP6MxCore
-_ZN16LegoVideoManager10MoveCursorEii@8 = _ZN16LegoVideoManager10MoveCursorEii
+_ZN14MxVideoManager14InvalidateRectER8MxRect32
+_ZN14MxVideoManager14RealizePaletteEP9MxPalette
+_ZN15MxVariableTable11GetVariableEPKc
+_ZN15MxVariableTable11SetVariableEP10MxVariable
+_ZN15MxVariableTable11SetVariableEPKcS1_ = _ZN15MxVariableTable11SetVariableEPKcS1_
+;_ZN16LegoInputManager10QueueEventE14NotificationIdhiih
+_ZN16LegoInputManager10QueueEventE14NotificationIdhiih
+_ZN16LegoInputManager10UnRegisterEP6MxCore
+_ZN16LegoInputManager8RegisterEP6MxCore
+_ZN16LegoVideoManager10MoveCursorEii
 _ZN16LegoVideoManager14EnableRMDeviceEv
 _ZN16LegoVideoManager15DisableRMDeviceEv
-_ZN16LegoVideoManager21EnableFullScreenMovieEhh@8 = _ZN16LegoVideoManager21EnableFullScreenMovieEhh
+_ZN16LegoVideoManager21EnableFullScreenMovieEhh
 _ZN17LegoNavController11GetDefaultsEPiPfS1_S1_S1_S1_S1_S1_S1_S1_Ph
 _ZN17LegoNavController11SetDefaultsEifffffffffh
 _ZN17LegoPartPresenter26configureLegoPartPresenterEii
@@ -106,16 +104,16 @@ _ZN17MxCriticalSectionD1Ev
 _ZN17MxCriticalSectionD2Ev
 _ZN17MxOmniCreateFlagsC1Ev
 _ZN17MxOmniCreateFlagsC2Ev
-_ZN17MxOmniCreateParamC2EPKcP6HWND__R12MxVideoParam17MxOmniCreateFlags@16 = _ZN17MxOmniCreateParamC2EPKcP6HWND__R12MxVideoParam17MxOmniCreateFlags
+_ZN17MxOmniCreateParamC1EPKcP6HWND__R12MxVideoParam17MxOmniCreateFlags
 _ZN17MxVideoParamFlagsC1Ev
 _ZN17MxVideoParamFlagsC2Ev
 _ZN18LegoModelPresenter27configureLegoModelPresenterEi
 _ZN18LegoWorldPresenter27configureLegoWorldPresenterEi
 _ZN19LegoBuildingManager28configureLegoBuildingManagerEi
-_ZN19MxTransitionManager16SetWaitIndicatorEP16MxVideoPresenter@4 = _ZN19MxTransitionManager16SetWaitIndicatorEP16MxVideoPresenter
+_ZN19MxTransitionManager16SetWaitIndicatorEP16MxVideoPresenter
 _ZN20LegoAnimationManager29configureLegoAnimationManagerEi
-_ZN24MxBackgroundAudioManager6EnableEh@4 = _ZN24MxBackgroundAudioManager6EnableEh
-_ZN6MxCore6NotifyER7MxParam@4 = _ZN6MxCore6NotifyER7MxParam
+_ZN24MxBackgroundAudioManager6EnableEh
+_ZN6MxCore6NotifyER7MxParam
 _ZN6MxCoreC1Ev
 _ZN6MxCoreC2Ev
 _ZN6MxCoreD0Ev
@@ -129,23 +127,23 @@ _ZN6MxOmni5GetHDEv
 _ZN6MxOmni5SetCDEPKc
 _ZN6MxOmni5SetHDEPKc
 _ZN6MxOmni9IsSound3DEv
-_ZN7LegoROI12SetDisplayBBEi@4 = _ZN7LegoROI12SetDisplayBBEi
+_ZN7LegoROI12SetDisplayBBEi
 _ZN7LegoROI16configureLegoROIEi
 _ZN7MxTimer11GetRealTimeEv
 _ZN8LegoOmni11GetInstanceEv
-_ZN8LegoOmni11RemoveWorldERK8MxAtomIdi@8 = _ZN8LegoOmni11RemoveWorldERK8MxAtomIdi
+_ZN8LegoOmni11RemoveWorldERK8MxAtomIdi
 _ZN8LegoOmni14CreateInstanceEv
 _ZN8LegoOmni15GetCurrPathInfoEPP16LegoPathBoundaryRi
 _ZN8LegoOmni21CreateBackgroundAudioEv
 _ZN8MXIOINFOD1Ev
 _ZN8MXIOINFOD2Ev
-_ZN8MxAtomIdC1EPKc10LookupMode@8 = _ZN8MxAtomIdC1EPKc10LookupMode
-_ZN8MxAtomIdC2EPKc10LookupMode@8 = _ZN8MxAtomIdC2EPKc10LookupMode
+_ZN8MxAtomIdC1EPKc10LookupMode
+_ZN8MxAtomIdC2EPKc10LookupMode
 _ZN8MxAtomIdD1Ev
 _ZN8MxAtomIdD2Ev
-_ZN8MxAtomIdaSERKS_@4 = _ZN8MxAtomIdaSERKS_
+_ZN8MxAtomIdaSERKS_
 _ZN8MxBitmap13CreatePaletteEv
-_ZN8MxBitmap4ReadEPKc@4 = _ZN8MxBitmap4ReadEPKc
+_ZN8MxBitmap4ReadEPKc
 _ZN8MxBitmapC1Ev
 _ZN8MxBitmapC2Ev
 _ZN8MxBitmapD0Ev
@@ -153,20 +151,20 @@ _ZN8MxBitmapD1Ev
 _ZN8MxBitmapD2Ev
 _ZN8MxDSFile13GetBufferSizeEv
 _ZN8MxDSFile19GetStreamBuffersNumEv
-_ZN8MxDSFile4OpenEj@4 = _ZN8MxDSFile4OpenEj
-_ZN8MxDSFile4ReadEPhj@8 = _ZN8MxDSFile4ReadEPhj
-_ZN8MxDSFile4SeekEii@8 = _ZN8MxDSFile4SeekEii
+_ZN8MxDSFile4OpenEj
+_ZN8MxDSFile4ReadEPhj
+_ZN8MxDSFile4SeekEii
 _ZN8MxDSFile5CloseEv
-_ZN8MxDSFileC1EPKcj@8 = _ZN8MxDSFileC1EPKcj
-_ZN8MxDSFileC2EPKcj@8 = _ZN8MxDSFileC2EPKcj
+_ZN8MxDSFileC1EPKcj
+_ZN8MxDSFileC2EPKcj
 _ZN8MxDSFileD0Ev
 _ZN8MxDSFileD1Ev
 _ZN8MxDSFileD2Ev
-_ZN8MxStringC1ERKS_@4 = _ZN8MxStringC1ERKS_
-_ZN8MxStringC2ERKS_@4 = _ZN8MxStringC2ERKS_
+_ZN8MxStringC1ERKS_
+_ZN8MxStringC2ERKS_
 _ZN8MxStringD0Ev
 _ZN8MxStringD1Ev
 _ZN8MxStringD2Ev
-_ZN8MxStringaSEPKc@4 = _ZN8MxStringaSEPKc
+_ZN8MxStringaSEPKc
 _ZN9MxPalette6DetachEv
-_ZN9MxPaletteeqERS_@4 = _ZN9MxPaletteeqERS_
+_ZN9MxPaletteeqERS_