diff --git a/src/nitro/room/object/RoomPlaneParser.ts b/src/nitro/room/object/RoomPlaneParser.ts
index cc5464d2..9f3aae4d 100644
--- a/src/nitro/room/object/RoomPlaneParser.ts
+++ b/src/nitro/room/object/RoomPlaneParser.ts
@@ -1,4 +1,4 @@
-import { Point } from 'pixi.js';
+import { Point } from '@pixi/math';
 import { IVector3D } from '../../../room/utils/IVector3D';
 import { Vector3d } from '../../../room/utils/Vector3d';
 import { RoomFloorHole } from './RoomFloorHole';
diff --git a/src/nitro/room/object/RoomWallData.ts b/src/nitro/room/object/RoomWallData.ts
index 89ba207f..44dc5a55 100644
--- a/src/nitro/room/object/RoomWallData.ts
+++ b/src/nitro/room/object/RoomWallData.ts
@@ -1,4 +1,4 @@
-import { Point } from 'pixi.js';
+import { Point } from '@pixi/math';
 import { IVector3D } from '../../../room/utils/IVector3D';
 import { Vector3d } from '../../../room/utils/Vector3d';
 
diff --git a/src/nitro/room/object/logic/room/RoomLogic.ts b/src/nitro/room/object/logic/room/RoomLogic.ts
index b1ed6f05..7a2d0991 100644
--- a/src/nitro/room/object/logic/room/RoomLogic.ts
+++ b/src/nitro/room/object/logic/room/RoomLogic.ts
@@ -1,4 +1,4 @@
-import { Point } from 'pixi.js';
+import { Point } from '@pixi/math';
 import { RoomObjectEvent } from '../../../../../room/events/RoomObjectEvent';
 import { RoomObjectMouseEvent } from '../../../../../room/events/RoomObjectMouseEvent';
 import { RoomSpriteMouseEvent } from '../../../../../room/events/RoomSpriteMouseEvent';
diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts
index 7db073d5..036054a9 100644
--- a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts
+++ b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts
@@ -1,4 +1,5 @@
-import { BLEND_MODES, Resource, Texture } from 'pixi.js';
+import { BLEND_MODES } from '@pixi/constants';
+import { Resource, Texture } from '@pixi/core';
 import { AdvancedMap } from '../../../../../core/utils/AdvancedMap';
 import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance';
 import { RoomObjectSpriteType } from '../../../../../room/object/enum/RoomObjectSpriteType';
diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts
index fc7d77ae..3bdd9ec0 100644
--- a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts
+++ b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 import { IAssetData } from '../../../../../core/asset/interfaces';
 import { Disposable } from '../../../../../core/common/disposable/Disposable';
 import { IObjectVisualizationData } from '../../../../../room/object/visualization/IRoomObjectVisualizationData';
diff --git a/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts b/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts
index d3f00035..78f95d22 100644
--- a/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts
+++ b/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
 import { Nitro } from '../../../../../Nitro';
 import { AvatarVisualization } from '../AvatarVisualization';
diff --git a/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts b/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts
index 4dec65c5..8e4bd0dd 100644
--- a/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts
+++ b/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
 import { Nitro } from '../../../../../Nitro';
 import { AvatarVisualization } from '../AvatarVisualization';
diff --git a/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts
index c4ac6d7f..239643d2 100644
--- a/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts
+++ b/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
 import { AvatarVisualization } from '../AvatarVisualization';
 import { IAvatarAddition } from './IAvatarAddition';
diff --git a/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts
index 1e76a4bd..476d8c34 100644
--- a/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts
+++ b/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
 import { AvatarVisualization } from '../AvatarVisualization';
 import { IAvatarAddition } from './IAvatarAddition';
diff --git a/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts
index 129b9c0c..585e0de7 100644
--- a/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts
+++ b/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 import { IRoomObjectSprite } from '../../../../../../room/object/visualization/IRoomObjectSprite';
 import { AvatarVisualization } from '../AvatarVisualization';
 import { IAvatarAddition } from './IAvatarAddition';
diff --git a/src/nitro/room/object/visualization/data/LayerData.ts b/src/nitro/room/object/visualization/data/LayerData.ts
index e4b77a42..76a2eff7 100644
--- a/src/nitro/room/object/visualization/data/LayerData.ts
+++ b/src/nitro/room/object/visualization/data/LayerData.ts
@@ -1,4 +1,4 @@
-import { BLEND_MODES } from 'pixi.js';
+import { BLEND_MODES } from '@pixi/constants';
 
 export class LayerData
 {
@@ -117,4 +117,4 @@ export class LayerData
     {
         this._zOffset = offset;
     }
-}
\ No newline at end of file
+}
diff --git a/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts
index 22ed6d09..b95543a3 100644
--- a/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts
+++ b/src/nitro/room/object/visualization/furniture/FurnitureBrandedImageVisualization.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 import { Nitro } from '../../../../Nitro';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { FurnitureVisualization } from './FurnitureVisualization';
diff --git a/src/nitro/room/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts
index 9d431547..a4d3ff31 100644
--- a/src/nitro/room/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts
+++ b/src/nitro/room/object/visualization/furniture/FurnitureDynamicThumbnailVisualization.ts
@@ -1,4 +1,5 @@
-import { SCALE_MODES, Texture } from 'pixi.js';
+import { SCALE_MODES } from '@pixi/constants';
+import { Texture } from '@pixi/core';
 import { FurnitureThumbnailVisualization } from './FurnitureThumbnailVisualization';
 
 export class FurnitureDynamicThumbnailVisualization extends FurnitureThumbnailVisualization
diff --git a/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts
index e21c9d92..35669c8a 100644
--- a/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts
+++ b/src/nitro/room/object/visualization/furniture/FurnitureRoomBackgroundVisualization.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 import { DirectionalOffsetData } from '../data/DirectionalOffsetData';
 import { FurnitureBrandedImageVisualization } from './FurnitureBrandedImageVisualization';
 
diff --git a/src/nitro/room/object/visualization/furniture/FurnitureThumbnailVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureThumbnailVisualization.ts
index 9d5842f5..319bd5e6 100644
--- a/src/nitro/room/object/visualization/furniture/FurnitureThumbnailVisualization.ts
+++ b/src/nitro/room/object/visualization/furniture/FurnitureThumbnailVisualization.ts
@@ -1,4 +1,6 @@
-import { Matrix, Rectangle, Resource, Sprite, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
+import { Matrix, Rectangle } from '@pixi/math';
+import { NitroSprite } from '../../../../../core';
 import { IGraphicAsset } from '../../../../../room/object/visualization/utils/IGraphicAsset';
 import { TextureUtils } from '../../../../../room/utils/TextureUtils';
 import { FurnitureAnimatedVisualization } from './FurnitureAnimatedVisualization';
@@ -122,7 +124,7 @@ export class FurnitureThumbnailVisualization extends FurnitureAnimatedVisualizat
                 matrix.ty = 0;
         }
 
-        const sprite = Sprite.from(texture);
+        const sprite = new NitroSprite(texture);
 
         sprite.transform.setFromMatrix(matrix);
 
diff --git a/src/nitro/room/object/visualization/pet/ExperienceData.ts b/src/nitro/room/object/visualization/pet/ExperienceData.ts
index c424adfd..b8ad5673 100644
--- a/src/nitro/room/object/visualization/pet/ExperienceData.ts
+++ b/src/nitro/room/object/visualization/pet/ExperienceData.ts
@@ -1,7 +1,7 @@
 import { RenderTexture, Resource, Texture } from '@pixi/core';
-import { Container } from '@pixi/display';
 import { Sprite } from '@pixi/sprite';
 import { Text } from '@pixi/text';
+import { NitroContainer, NitroSprite } from '../../../../../core';
 import { TextureUtils } from '../../../../../room';
 import { Nitro } from '../../../../Nitro';
 
@@ -14,7 +14,7 @@ export class ExperienceData
 
     constructor(texture: Texture<Resource>)
     {
-        this._sprite    = new Sprite(texture);
+        this._sprite    = new NitroSprite(texture);
         this._texture   = null;
         this._amount    = -1;
         this._alpha     = 0;
@@ -24,7 +24,7 @@ export class ExperienceData
     {
         if(!this._sprite || (this._amount === amount)) return null;
 
-        const container = new Container();
+        const container = new NitroContainer();
 
         container.addChild(this._sprite);
 
diff --git a/src/nitro/room/object/visualization/room/PlaneDrawingData.ts b/src/nitro/room/object/visualization/room/PlaneDrawingData.ts
index 244e7005..e8d6a7ba 100644
--- a/src/nitro/room/object/visualization/room/PlaneDrawingData.ts
+++ b/src/nitro/room/object/visualization/room/PlaneDrawingData.ts
@@ -1,4 +1,4 @@
-import { Point } from 'pixi.js';
+import { Point } from '@pixi/math';
 import { IPlaneDrawingData } from '../../../../../room/object/visualization/IPlaneDrawingData';
 
 export class PlaneDrawingData implements IPlaneDrawingData
diff --git a/src/nitro/room/object/visualization/room/RoomPlane.ts b/src/nitro/room/object/visualization/room/RoomPlane.ts
index 8b58fa20..844bd841 100644
--- a/src/nitro/room/object/visualization/room/RoomPlane.ts
+++ b/src/nitro/room/object/visualization/room/RoomPlane.ts
@@ -1,4 +1,6 @@
-import { Graphics, Matrix, Point, Rectangle, RenderTexture, Resource, Texture } from 'pixi.js';
+import { RenderTexture, Resource, Texture } from '@pixi/core';
+import { Graphics } from '@pixi/graphics';
+import { Matrix, Point, Rectangle } from '@pixi/math';
 import { IRoomPlane } from '../../../../../room/object/visualization/IRoomPlane';
 import { IRoomGeometry } from '../../../../../room/utils/IRoomGeometry';
 import { IVector3D } from '../../../../../room/utils/IVector3D';
diff --git a/src/nitro/room/object/visualization/room/RoomVisualization.ts b/src/nitro/room/object/visualization/room/RoomVisualization.ts
index 8d99a452..6ac00fe4 100644
--- a/src/nitro/room/object/visualization/room/RoomVisualization.ts
+++ b/src/nitro/room/object/visualization/room/RoomVisualization.ts
@@ -1,4 +1,5 @@
-import { Rectangle, RenderTexture, Resource, Texture } from 'pixi.js';
+import { RenderTexture, Resource, Texture } from '@pixi/core';
+import { Rectangle } from '@pixi/math';
 import { AdvancedMap } from '../../../../../core/utils/AdvancedMap';
 import { AlphaTolerance } from '../../../../../room/object/enum/AlphaTolerance';
 import { RoomObjectSpriteType } from '../../../../../room/object/enum/RoomObjectSpriteType';
diff --git a/src/nitro/room/object/visualization/room/mask/PlaneMaskManager.ts b/src/nitro/room/object/visualization/room/mask/PlaneMaskManager.ts
index 431f7de9..61f9e551 100644
--- a/src/nitro/room/object/visualization/room/mask/PlaneMaskManager.ts
+++ b/src/nitro/room/object/visualization/room/mask/PlaneMaskManager.ts
@@ -1,4 +1,5 @@
-import { Graphics, Matrix, Point } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
+import { Matrix, Point } from '@pixi/math';
 import { IGraphicAssetCollection } from '../../../../../../room/object/visualization/utils/IGraphicAssetCollection';
 import { IVector3D } from '../../../../../../room/utils/IVector3D';
 import { PlaneMask } from './PlaneMask';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/IPlaneRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/IPlaneRasterizer.ts
index fd3b4cde..227fbe97 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/IPlaneRasterizer.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/IPlaneRasterizer.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 import { IVector3D } from '../../../../../../room/utils/IVector3D';
 import { PlaneBitmapData } from '../utils/PlaneBitmapData';
 import { PlaneVisualizationLayer } from './basic/PlaneVisualizationLayer';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts
index 57c128b8..862e6071 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts
@@ -1,4 +1,4 @@
-import { Point } from 'pixi.js';
+import { Point } from '@pixi/math';
 import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset';
 
 export class AnimationItem
diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts
index 80beaa2b..7075555b 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapePlane.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { Vector3d } from '../../../../../../../room/utils/Vector3d';
 import { Plane } from '../basic/Plane';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts
index 7945794f..5a9e6cdd 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { Nitro } from '../../../../../../Nitro';
 import { PlaneBitmapData } from '../../utils/PlaneBitmapData';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts
index 62b2e598..0557724b 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts
@@ -1,4 +1,5 @@
-import { Graphics, Matrix } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
+import { Matrix } from '@pixi/math';
 import { IDisposable } from '../../../../../../../core/common/disposable/IDisposable';
 import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/FloorPlane.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/FloorPlane.ts
index d6a5f63e..dda20144 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/FloorPlane.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/FloorPlane.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { Vector3d } from '../../../../../../../room/utils/Vector3d';
 import { Plane } from './Plane';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts
index 541de89a..d064b265 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/FloorRasterizer.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { PlaneBitmapData } from '../../utils/PlaneBitmapData';
 import { FloorPlane } from './FloorPlane';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterial.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterial.ts
index 70a02762..09c2f743 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterial.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterial.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { PlaneMaterialCellMatrix } from './PlaneMaterialCellMatrix';
 
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCell.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCell.ts
index 943ba74a..9289f332 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCell.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCell.ts
@@ -1,4 +1,8 @@
-import { Graphics, Point, Sprite, TilingSprite } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
+import { Point } from '@pixi/math';
+import { Sprite } from '@pixi/sprite';
+import { TilingSprite } from '@pixi/sprite-tiling';
+import { NitroSprite } from '../../../../../../../core';
 import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { PlaneTexture } from './PlaneTexture';
@@ -140,7 +144,7 @@ export class PlaneMaterialCell
         }
         else
         {
-            bitmap = new Sprite(texture);
+            bitmap = new NitroSprite(texture);
         }
 
         if(bitmap)
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellColumn.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellColumn.ts
index 6c747435..0d6ad65a 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellColumn.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellColumn.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { Vector3d } from '../../../../../../../room/utils/Vector3d';
 import { PlaneMaterialCell } from './PlaneMaterialCell';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts
index 65bbf131..0d38300f 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterialCellMatrix.ts
@@ -1,4 +1,5 @@
-import { Graphics, Point, Rectangle } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
+import { Point, Rectangle } from '@pixi/math';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { TextureUtils } from '../../../../../../../room/utils/TextureUtils';
 import { Vector3d } from '../../../../../../../room/utils/Vector3d';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts
index bf2ea63e..a1efb007 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts
@@ -1,4 +1,6 @@
-import { Graphics, Point, Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
+import { Graphics } from '@pixi/graphics';
+import { Point } from '@pixi/math';
 import { IGraphicAsset } from '../../../../../../../room/object/visualization/utils/IGraphicAsset';
 import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection';
 import { IRoomGeometry } from '../../../../../../../room/utils/IRoomGeometry';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneTexture.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneTexture.ts
index f0cee232..8328bb0e 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneTexture.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneTexture.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { PlaneTextureBitmap } from './PlaneTextureBitmap';
 
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneTextureBitmap.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneTextureBitmap.ts
index a2d10ba3..65b73f5a 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneTextureBitmap.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneTextureBitmap.ts
@@ -1,4 +1,4 @@
-import { Resource, Texture } from 'pixi.js';
+import { Resource, Texture } from '@pixi/core';
 
 export class PlaneTextureBitmap
 {
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts
index b85b0377..191e03ac 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualization.ts
@@ -1,4 +1,5 @@
-import { Graphics, Rectangle } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
+import { Rectangle } from '@pixi/math';
 import { IDisposable } from '../../../../../../../core/common/disposable/IDisposable';
 import { IGraphicAssetCollection } from '../../../../../../../room/object/visualization/utils/IGraphicAssetCollection';
 import { IRoomGeometry } from '../../../../../../../room/utils/IRoomGeometry';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualizationLayer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualizationLayer.ts
index 0ca795ae..c3ba98e5 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualizationLayer.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneVisualizationLayer.ts
@@ -1,4 +1,5 @@
-import { Graphics, Rectangle } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
+import { Rectangle } from '@pixi/math';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { TextureUtils } from '../../../../../../../room/utils/TextureUtils';
 import { RoomVisualization } from '../../RoomVisualization';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/WallPlane.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/WallPlane.ts
index 620ba281..6aa5d226 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/WallPlane.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/WallPlane.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { Vector3d } from '../../../../../../../room/utils/Vector3d';
 import { Plane } from './Plane';
diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts
index 284347c8..a63f7550 100644
--- a/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts
+++ b/src/nitro/room/object/visualization/room/rasterizer/basic/WallRasterizer.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 import { IVector3D } from '../../../../../../../room/utils/IVector3D';
 import { PlaneBitmapData } from '../../utils/PlaneBitmapData';
 import { PlaneRasterizer } from './PlaneRasterizer';
diff --git a/src/nitro/room/object/visualization/room/utils/PlaneBitmapData.ts b/src/nitro/room/object/visualization/room/utils/PlaneBitmapData.ts
index c9af1ab3..d9811b96 100644
--- a/src/nitro/room/object/visualization/room/utils/PlaneBitmapData.ts
+++ b/src/nitro/room/object/visualization/room/utils/PlaneBitmapData.ts
@@ -1,4 +1,4 @@
-import { Graphics } from 'pixi.js';
+import { Graphics } from '@pixi/graphics';
 
 export class PlaneBitmapData
 {
@@ -25,4 +25,4 @@ export class PlaneBitmapData
     {
         return this._timeStamp;
     }
-}
\ No newline at end of file
+}