diff --git a/.prettierrc.json b/.prettierrc.json
index 1103a9f..09fbd9e 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -4,5 +4,8 @@
   "tabWidth": 2,
   "singleQuote": true,
   "printWidth": 300,
-  "trailingComma": "none"
+  "trailingComma": "none",
+  "plugins": ["@ianvs/prettier-plugin-sort-imports"],
+  "importOrderParserPlugins": ["typescript", "jsx", "decorators-legacy", "classProperties"],
+  "importOrderCaseSensitive": false
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 5278e50..cc6c9da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
         "zod": "^3.22.2"
       },
       "devDependencies": {
+        "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
         "@rushstack/eslint-patch": "^1.10.3",
         "@tsconfig/node20": "^20.1.4",
         "@types/jsdom": "^21.1.7",
@@ -30,7 +31,6 @@
         "@vue/test-utils": "^2.4.6",
         "@vue/tsconfig": "^0.5.1",
         "autoprefixer": "^10.4.19",
-        "easystarjs": "^0.4.4",
         "eslint": "^8.57.0",
         "eslint-plugin-vue": "^9.27.0",
         "jsdom": "^24.1.1",
@@ -571,16 +571,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/types": {
       "version": "7.26.3",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
@@ -1049,6 +1039,22 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -1134,6 +1140,29 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
+    "node_modules/@ianvs/prettier-plugin-sort-imports": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.4.0.tgz",
+      "integrity": "sha512-f4/e+/ANGk3tHuwRW0uh2YuBR50I4h1ZjGQ+5uD8sWfinHTivQsnieR5cz24t8M6Vx4rYvZ5v/IEKZhYpzQm9Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/generator": "^7.26.2",
+        "@babel/parser": "^7.26.2",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.26.0",
+        "semver": "^7.5.2"
+      },
+      "peerDependencies": {
+        "@vue/compiler-sfc": "2.7.x || 3.x",
+        "prettier": "2 || 3"
+      },
+      "peerDependenciesMeta": {
+        "@vue/compiler-sfc": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -3548,16 +3577,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/easystarjs": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/easystarjs/-/easystarjs-0.4.4.tgz",
-      "integrity": "sha512-ZSt0TkB8xuIXRIrKsM3jkmk1/cZUtyvf0DqOXf6wuKq9slx9UA5kkLtiaWhtmOQFJFKdabbvXwk6RO0znghArQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "heap": "0.2.6"
-      }
-    },
     "node_modules/editorconfig": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
@@ -3882,6 +3901,22 @@
         "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0"
       }
     },
+    "node_modules/eslint-plugin-vue/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint-scope": {
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -3923,6 +3958,22 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.24.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
+      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -4392,19 +4443,13 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
     "node_modules/globby": {
@@ -4507,12 +4552,6 @@
         "he": "bin/he"
       }
     },
-    "node_modules/heap": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.6.tgz",
-      "integrity": "sha512-MzzWcnfB1e4EG2vHi3dXHoBupmuXNZzx6pY6HldVS55JKKBoq3xOyzfSaZRkJp37HIhEYC78knabHff3zc4dQQ==",
-      "dev": true
-    },
     "node_modules/hookable": {
       "version": "5.5.3",
       "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
diff --git a/package.json b/package.json
index 3e721ae..e0a8b7b 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "zod": "^3.22.2"
   },
   "devDependencies": {
+    "@ianvs/prettier-plugin-sort-imports": "^4.4.0",
     "@rushstack/eslint-patch": "^1.10.3",
     "@tsconfig/node20": "^20.1.4",
     "@types/jsdom": "^21.1.7",
@@ -37,7 +38,6 @@
     "@vue/test-utils": "^2.4.6",
     "@vue/tsconfig": "^0.5.1",
     "autoprefixer": "^10.4.19",
-    "easystarjs": "^0.4.4",
     "eslint": "^8.57.0",
     "eslint-plugin-vue": "^9.27.0",
     "jsdom": "^24.1.1",
diff --git a/src/App.vue b/src/App.vue
index bce1165..8b3dd1c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,15 +6,15 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/gameStore'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import Notifications from '@/components/utilities/Notifications.vue'
-import BackgroundImageLoader from '@/components/utilities/BackgroundImageLoader.vue'
 import GmPanel from '@/components/gameMaster/GmPanel.vue'
-import Login from '@/components/screens/Login.vue'
 import Characters from '@/components/screens/Characters.vue'
 import Game from '@/components/screens/Game.vue'
+import Login from '@/components/screens/Login.vue'
 import ZoneEditor from '@/components/screens/ZoneEditor.vue'
+import BackgroundImageLoader from '@/components/utilities/BackgroundImageLoader.vue'
+import Notifications from '@/components/utilities/Notifications.vue'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { computed, watch } from 'vue'
 
 const gameStore = useGameStore()
diff --git a/src/application/assets.ts b/src/application/assets.ts
index 3d98a69..c743e18 100644
--- a/src/application/assets.ts
+++ b/src/application/assets.ts
@@ -1,6 +1,6 @@
 import config from '@/application/config'
-import Dexie from 'dexie'
 import type { AssetDataT } from '@/application/types'
+import Dexie from 'dexie'
 
 export class Assets {
   private db: Dexie
diff --git a/src/components/Effects.vue b/src/components/Effects.vue
index f2d735a..2ef8d2f 100644
--- a/src/components/Effects.vue
+++ b/src/components/Effects.vue
@@ -3,11 +3,11 @@
 </template>
 
 <script setup lang="ts">
-import { Scene } from 'phavuer'
-import { useZoneStore } from '@/stores/zoneStore'
-import { useGameStore } from '@/stores/gameStore'
-import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import type { WeatherState } from '@/application/types'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneStore } from '@/stores/zoneStore'
+import { Scene } from 'phavuer'
+import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 // Constants
 const LIGHT_CONFIG = {
diff --git a/src/components/game/character/Character.vue b/src/components/game/character/Character.vue
index b0cd69b..f9bb117 100644
--- a/src/components/game/character/Character.vue
+++ b/src/components/game/character/Character.vue
@@ -11,15 +11,16 @@
 <script lang="ts" setup>
 import config from '@/application/config'
 import { type Sprite as SpriteT, type ZoneCharacter } from '@/application/types'
-import { useGameStore } from '@/stores/gameStore'
-import { useZoneStore } from '@/stores/zoneStore'
-import { watch, computed, ref, onMounted, onUnmounted } from 'vue'
-import { Container, refObj, Sprite, useScene } from 'phavuer'
-import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
-import { loadSpriteTextures } from '@/composables/gameComposable'
+import CharacterHair from '@/components/game/character/partials/CharacterHair.vue'
 import ChatBubble from '@/components/game/character/partials/ChatBubble.vue'
 import Healthbar from '@/components/game/character/partials/Healthbar.vue'
-import CharacterHair from '@/components/game/character/partials/CharacterHair.vue'
+import { loadSpriteTextures } from '@/composables/gameComposable'
+import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneStore } from '@/stores/zoneStore'
+import { Container, refObj, Sprite, useScene } from 'phavuer'
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+
 // import CharacterChest from '@/components/game/character/partials/CharacterChest.vue'
 
 enum Direction {
@@ -137,11 +138,14 @@ watch(
     if (!newValues) return
 
     if (!oldValues || newValues.x !== oldValues.x || newValues.y !== oldValues.y) {
-      const direction = !oldValues
-        ? Direction.POSITIVE
-        : calcDirection(oldValues.x, oldValues.y, newValues.x, newValues.y)
+      const direction = !oldValues ? Direction.POSITIVE : calcDirection(oldValues.x, oldValues.y, newValues.x, newValues.y)
       updatePosition(newValues.x, newValues.y, direction)
     }
+
+    // Handle animation updates
+    if (newValues.isMoving !== oldValues?.isMoving || newValues.rotation !== oldValues?.rotation) {
+      updateSprite()
+    }
   },
   { deep: true }
 )
diff --git a/src/components/game/character/partials/CharacterChest.vue b/src/components/game/character/partials/CharacterChest.vue
index 238b6e4..3a2126a 100644
--- a/src/components/game/character/partials/CharacterChest.vue
+++ b/src/components/game/character/partials/CharacterChest.vue
@@ -3,11 +3,11 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue'
-import { Image, useScene } from 'phavuer'
 import type { Sprite as SpriteT, ZoneCharacter } from '@/application/types'
 import { loadSpriteTextures } from '@/composables/gameComposable'
 import { useGameStore } from '@/stores/gameStore'
+import { Image, useScene } from 'phavuer'
+import { computed } from 'vue'
 
 const props = defineProps<{
   zoneCharacter: ZoneCharacter
diff --git a/src/components/game/character/partials/CharacterHair.vue b/src/components/game/character/partials/CharacterHair.vue
index 0036ba8..7ae9208 100644
--- a/src/components/game/character/partials/CharacterHair.vue
+++ b/src/components/game/character/partials/CharacterHair.vue
@@ -3,11 +3,11 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue'
-import { Image, useScene } from 'phavuer'
 import type { Sprite as SpriteT, ZoneCharacter } from '@/application/types'
 import { loadSpriteTextures } from '@/composables/gameComposable'
 import { useGameStore } from '@/stores/gameStore'
+import { Image, useScene } from 'phavuer'
+import { computed } from 'vue'
 
 const props = defineProps<{
   zoneCharacter: ZoneCharacter
diff --git a/src/components/game/character/partials/ChatBubble.vue b/src/components/game/character/partials/ChatBubble.vue
index 2063037..60b7638 100644
--- a/src/components/game/character/partials/ChatBubble.vue
+++ b/src/components/game/character/partials/ChatBubble.vue
@@ -6,8 +6,8 @@
 </template>
 
 <script setup lang="ts">
-import { Container, refObj, RoundRectangle, Text, useGame } from 'phavuer'
 import type { ZoneCharacter } from '@/application/types'
+import { Container, refObj, RoundRectangle, Text, useGame } from 'phavuer'
 import { onMounted } from 'vue'
 
 const props = defineProps<{
diff --git a/src/components/game/character/partials/Healthbar.vue b/src/components/game/character/partials/Healthbar.vue
index 353b307..6e563bf 100644
--- a/src/components/game/character/partials/Healthbar.vue
+++ b/src/components/game/character/partials/Healthbar.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script setup lang="ts">
-import { Container, RoundRectangle, Text, useGame } from 'phavuer'
 import type { ZoneCharacter } from '@/application/types'
+import { Container, RoundRectangle, Text, useGame } from 'phavuer'
 
 const props = defineProps<{
   zoneCharacter: ZoneCharacter
diff --git a/src/components/game/zone/Zone.vue b/src/components/game/zone/Zone.vue
index be65111..256c93c 100644
--- a/src/components/game/zone/Zone.vue
+++ b/src/components/game/zone/Zone.vue
@@ -5,15 +5,15 @@
 </template>
 
 <script setup lang="ts">
-import { ref, onUnmounted } from 'vue'
-import { useScene } from 'phavuer'
+import type { ZoneCharacter, zoneLoadData } from '@/application/types'
+import Characters from '@/components/game/zone/Characters.vue'
+import ZoneObjects from '@/components/game/zone/ZoneObjects.vue'
+import ZoneTiles from '@/components/game/zone/ZoneTiles.vue'
+import { loadZoneTilesIntoScene } from '@/composables/zoneComposable'
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneStore } from '@/stores/zoneStore'
-import { loadZoneTilesIntoScene } from '@/composables/zoneComposable'
-import type { ZoneCharacter, zoneLoadData } from '@/application/types'
-import ZoneTiles from '@/components/game/zone/ZoneTiles.vue'
-import ZoneObjects from '@/components/game/zone/ZoneObjects.vue'
-import Characters from '@/components/game/zone/Characters.vue'
+import { useScene } from 'phavuer'
+import { onUnmounted, ref } from 'vue'
 
 const scene = useScene()
 const gameStore = useGameStore()
diff --git a/src/components/game/zone/ZoneObjects.vue b/src/components/game/zone/ZoneObjects.vue
index 319c66e..c61f98d 100644
--- a/src/components/game/zone/ZoneObjects.vue
+++ b/src/components/game/zone/ZoneObjects.vue
@@ -3,8 +3,8 @@
 </template>
 
 <script setup lang="ts">
-import { useZoneStore } from '@/stores/zoneStore'
 import ZoneObject from '@/components/game/zone/partials/ZoneObject.vue'
+import { useZoneStore } from '@/stores/zoneStore'
 
 const zoneStore = useZoneStore()
 
diff --git a/src/components/game/zone/ZoneTiles.vue b/src/components/game/zone/ZoneTiles.vue
index cfcfd89..2c5c28f 100644
--- a/src/components/game/zone/ZoneTiles.vue
+++ b/src/components/game/zone/ZoneTiles.vue
@@ -4,12 +4,12 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { useScene } from 'phavuer'
-import { useZoneStore } from '@/stores/zoneStore'
-import { onBeforeUnmount } from 'vue'
-import { FlattenZoneArray, setLayerTiles } from '@/composables/zoneComposable'
-import Controls from '@/components/utilities/Controls.vue'
 import { unduplicateArray } from '@/application/utilities'
+import Controls from '@/components/utilities/Controls.vue'
+import { FlattenZoneArray, setLayerTiles } from '@/composables/zoneComposable'
+import { useZoneStore } from '@/stores/zoneStore'
+import { useScene } from 'phavuer'
+import { onBeforeUnmount } from 'vue'
 
 const emit = defineEmits(['tileMap:create'])
 
diff --git a/src/components/game/zone/partials/ZoneObject.vue b/src/components/game/zone/partials/ZoneObject.vue
index 443c412..446be1b 100644
--- a/src/components/game/zone/partials/ZoneObject.vue
+++ b/src/components/game/zone/partials/ZoneObject.vue
@@ -3,12 +3,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
-import { Image, useScene } from 'phavuer'
-import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
-import { loadTexture } from '@/composables/gameComposable'
 import type { AssetDataT, ZoneObject } from '@/application/types'
+import { loadTexture } from '@/composables/gameComposable'
+import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 import { useGameStore } from '@/stores/gameStore'
+import { Image, useScene } from 'phavuer'
+import { computed } from 'vue'
 
 const props = defineProps<{
   tilemap: Phaser.Tilemaps.Tilemap
diff --git a/src/components/gameMaster/GmPanel.vue b/src/components/gameMaster/GmPanel.vue
index 09daf26..0dab0d4 100644
--- a/src/components/gameMaster/GmPanel.vue
+++ b/src/components/gameMaster/GmPanel.vue
@@ -18,11 +18,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
-import Modal from '@/components/utilities/Modal.vue'
 import AssetManager from '@/components/gameMaster/assetManager/AssetManager.vue'
+import Modal from '@/components/utilities/Modal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { ref } from 'vue'
 
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/assetManager/AssetManager.vue b/src/components/gameMaster/assetManager/AssetManager.vue
index afe1bc7..ab08a13 100644
--- a/src/components/gameMaster/assetManager/AssetManager.vue
+++ b/src/components/gameMaster/assetManager/AssetManager.vue
@@ -60,20 +60,20 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import TileList from '@/components/gameMaster/assetManager/partials/tile/TileList.vue'
-import TileDetails from '@/components/gameMaster/assetManager/partials/tile/TileDetails.vue'
-import ObjectList from '@/components/gameMaster/assetManager/partials/object/ObjectList.vue'
-import ObjectDetails from '@/components/gameMaster/assetManager/partials/object/ObjectDetails.vue'
-import SpriteList from '@/components/gameMaster/assetManager/partials/sprite/SpriteList.vue'
-import SpriteDetails from '@/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue'
-import CharacterTypeList from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue'
-import CharacterTypeDetails from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue'
-import CharacterHairList from '@/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue'
 import CharacterHairDetails from '@/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue'
-import ItemList from '@/components/gameMaster/assetManager/partials/item/itemList.vue'
+import CharacterHairList from '@/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue'
+import CharacterTypeDetails from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue'
+import CharacterTypeList from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue'
 import ItemDetails from '@/components/gameMaster/assetManager/partials/item/itemDetails.vue'
+import ItemList from '@/components/gameMaster/assetManager/partials/item/itemList.vue'
+import ObjectDetails from '@/components/gameMaster/assetManager/partials/object/ObjectDetails.vue'
+import ObjectList from '@/components/gameMaster/assetManager/partials/object/ObjectList.vue'
+import SpriteDetails from '@/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue'
+import SpriteList from '@/components/gameMaster/assetManager/partials/sprite/SpriteList.vue'
+import TileDetails from '@/components/gameMaster/assetManager/partials/tile/TileDetails.vue'
+import TileList from '@/components/gameMaster/assetManager/partials/tile/TileList.vue'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { ref } from 'vue'
 
 const assetManagerStore = useAssetManagerStore()
 const selectedCategory = ref('tiles')
diff --git a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
index e2d0318..0d6de91 100644
--- a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairDetails.vue
@@ -34,10 +34,10 @@
 </template>
 
 <script setup lang="ts">
-import type { CharacterHair, CharacterGender, Sprite } from '@/application/types'
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import type { CharacterGender, CharacterHair, Sprite } from '@/application/types'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
index a7c4394..701f179 100644
--- a/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
+++ b/src/components/gameMaster/assetManager/partials/characterHair/CharacterHairList.vue
@@ -32,11 +32,11 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/gameStore'
-import { onMounted, ref, computed } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import type { CharacterHair } from '@/application/types'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
index 5fc511f..ed02aef 100644
--- a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
@@ -40,10 +40,10 @@
 </template>
 
 <script setup lang="ts">
-import type { CharacterType, CharacterGender, CharacterRace, Sprite } from '@/application/types'
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import type { CharacterGender, CharacterRace, CharacterType, Sprite } from '@/application/types'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
index 9cfc713..3c38f13 100644
--- a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
+++ b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
@@ -32,11 +32,11 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/gameStore'
-import { onMounted, ref, computed } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import type { CharacterType } from '@/application/types'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/item/itemDetails.vue b/src/components/gameMaster/assetManager/partials/item/itemDetails.vue
index e1ca767..f8b0408 100644
--- a/src/components/gameMaster/assetManager/partials/item/itemDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/item/itemDetails.vue
@@ -44,10 +44,10 @@
 </template>
 
 <script setup lang="ts">
-import type { Item, ItemType, ItemRarity } from '@/application/types'
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import type { Item, ItemRarity, ItemType } from '@/application/types'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/item/itemList.vue b/src/components/gameMaster/assetManager/partials/item/itemList.vue
index cfb788e..3742a89 100644
--- a/src/components/gameMaster/assetManager/partials/item/itemList.vue
+++ b/src/components/gameMaster/assetManager/partials/item/itemList.vue
@@ -29,11 +29,11 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/gameStore'
-import { onMounted, ref, computed } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import type { Item } from '@/application/types'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue b/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue
index 906fc0d..675a73b 100644
--- a/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/object/ObjectDetails.vue
@@ -50,13 +50,13 @@
 </template>
 
 <script setup lang="ts">
-import type { Object } from '@/application/types'
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import { useGameStore } from '@/stores/gameStore'
 import config from '@/application/config'
+import type { Object } from '@/application/types'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/object/ObjectList.vue b/src/components/gameMaster/assetManager/partials/object/ObjectList.vue
index e74c190..6acc40a 100644
--- a/src/components/gameMaster/assetManager/partials/object/ObjectList.vue
+++ b/src/components/gameMaster/assetManager/partials/object/ObjectList.vue
@@ -29,11 +29,11 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { useGameStore } from '@/stores/gameStore'
-import { onMounted, ref, computed } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import type { Object } from '@/application/types'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 const objectUploadField = ref(null)
diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
index 708b55a..f0cea3f 100644
--- a/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue
@@ -70,12 +70,12 @@
 
 <script setup lang="ts">
 import type { Sprite, SpriteAction } from '@/application/types'
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import { uuidv4 } from '@/application/utilities'
+import SpriteActionsInput from '@/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
+import Accordion from '@/components/utilities/Accordion.vue'
 import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import { useGameStore } from '@/stores/gameStore'
-import Accordion from '@/components/utilities/Accordion.vue'
-import SpriteActionsInput from '@/components/gameMaster/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
-import { uuidv4 } from '@/application/utilities'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue b/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
index 6cf6c04..e147734 100644
--- a/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
+++ b/src/components/gameMaster/assetManager/partials/sprite/SpriteList.vue
@@ -25,11 +25,11 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { useGameStore } from '@/stores/gameStore'
-import { onMounted, ref, computed } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import { useVirtualList } from '@vueuse/core'
 import type { Sprite } from '@/application/types'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
+import { useVirtualList } from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue b/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
index 0a4ca55..16f51ec 100644
--- a/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
+++ b/src/components/gameMaster/assetManager/partials/tile/TileDetails.vue
@@ -23,13 +23,13 @@
 </template>
 
 <script setup lang="ts">
-import type { Tile } from '@/application/types'
-import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManagerStore'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import { useGameStore } from '@/stores/gameStore'
 import config from '@/application/config'
+import type { Tile } from '@/application/types'
 import ChipsInput from '@/components/forms/ChipsInput.vue'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue'
 
 const gameStore = useGameStore()
 const assetManagerStore = useAssetManagerStore()
diff --git a/src/components/gameMaster/assetManager/partials/tile/TileList.vue b/src/components/gameMaster/assetManager/partials/tile/TileList.vue
index 44ac101..b53c90a 100644
--- a/src/components/gameMaster/assetManager/partials/tile/TileList.vue
+++ b/src/components/gameMaster/assetManager/partials/tile/TileList.vue
@@ -29,11 +29,11 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { useGameStore } from '@/stores/gameStore'
-import { onMounted, ref, computed } from 'vue'
-import { useAssetManagerStore } from '@/stores/assetManagerStore'
 import type { Tile } from '@/application/types'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
 import { useVirtualList } from '@vueuse/core'
+import { computed, onMounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 const tileUploadField = ref(null)
diff --git a/src/components/gameMaster/zoneEditor/ZoneEditor.vue b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
index ccaa53a..f9205cf 100644
--- a/src/components/gameMaster/zoneEditor/ZoneEditor.vue
+++ b/src/components/gameMaster/zoneEditor/ZoneEditor.vue
@@ -14,20 +14,20 @@
 </template>
 
 <script setup lang="ts">
-import { onUnmounted, ref } from 'vue'
-import { useGameStore } from '@/stores/gameStore'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { type Zone } from '@/application/types'
+import ObjectList from '@/components/gameMaster/zoneEditor/partials/ObjectList.vue'
+import TeleportModal from '@/components/gameMaster/zoneEditor/partials/TeleportModal.vue'
+import TileList from '@/components/gameMaster/zoneEditor/partials/TileList.vue'
 // Components
 import Toolbar from '@/components/gameMaster/zoneEditor/partials/Toolbar.vue'
-import TileList from '@/components/gameMaster/zoneEditor/partials/TileList.vue'
-import ObjectList from '@/components/gameMaster/zoneEditor/partials/ObjectList.vue'
-import ZoneSettings from '@/components/gameMaster/zoneEditor/partials/ZoneSettings.vue'
 import ZoneList from '@/components/gameMaster/zoneEditor/partials/ZoneList.vue'
-import TeleportModal from '@/components/gameMaster/zoneEditor/partials/TeleportModal.vue'
-import ZoneTiles from '@/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue'
-import ZoneObjects from '@/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue'
+import ZoneSettings from '@/components/gameMaster/zoneEditor/partials/ZoneSettings.vue'
 import ZoneEventTiles from '@/components/gameMaster/zoneEditor/zonePartials/ZoneEventTiles.vue'
+import ZoneObjects from '@/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue'
+import ZoneTiles from '@/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { onUnmounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/zoneEditor/partials/CreateZone.vue b/src/components/gameMaster/zoneEditor/partials/CreateZone.vue
index 5cfdfa1..068f31d 100644
--- a/src/components/gameMaster/zoneEditor/partials/CreateZone.vue
+++ b/src/components/gameMaster/zoneEditor/partials/CreateZone.vue
@@ -36,11 +36,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import type { Zone } from '@/application/types'
 import Modal from '@/components/utilities/Modal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import type { Zone } from '@/application/types'
+import { ref } from 'vue'
 
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/zoneEditor/partials/ObjectList.vue b/src/components/gameMaster/zoneEditor/partials/ObjectList.vue
index 379f94f..2a8277f 100644
--- a/src/components/gameMaster/zoneEditor/partials/ObjectList.vue
+++ b/src/components/gameMaster/zoneEditor/partials/ObjectList.vue
@@ -42,11 +42,11 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { ref, onMounted, computed } from 'vue'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import { useGameStore } from '@/stores/gameStore'
-import Modal from '@/components/utilities/Modal.vue'
 import type { Object, ZoneObject } from '@/application/types'
+import Modal from '@/components/utilities/Modal.vue'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { computed, onMounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 const isModalOpen = ref(false)
diff --git a/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue b/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue
index 61ff5bb..a226370 100644
--- a/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue
+++ b/src/components/gameMaster/zoneEditor/partials/TeleportModal.vue
@@ -39,11 +39,11 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue'
-import Modal from '@/components/utilities/Modal.vue'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import { useGameStore } from '@/stores/gameStore'
 import type { Zone } from '@/application/types'
+import Modal from '@/components/utilities/Modal.vue'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { computed, onMounted, ref, watch } from 'vue'
 
 const showTeleportModal = computed(() => zoneEditorStore.tool === 'pencil' && zoneEditorStore.drawMode === 'teleport')
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/zoneEditor/partials/TileList.vue b/src/components/gameMaster/zoneEditor/partials/TileList.vue
index 6eab395..cd46aa6 100644
--- a/src/components/gameMaster/zoneEditor/partials/TileList.vue
+++ b/src/components/gameMaster/zoneEditor/partials/TileList.vue
@@ -82,11 +82,11 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { ref, onMounted, computed } from 'vue'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import { useGameStore } from '@/stores/gameStore'
-import Modal from '@/components/utilities/Modal.vue'
 import type { Tile } from '@/application/types'
+import Modal from '@/components/utilities/Modal.vue'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { computed, onMounted, ref } from 'vue'
 
 const gameStore = useGameStore()
 const isModalOpen = ref(false)
diff --git a/src/components/gameMaster/zoneEditor/partials/Toolbar.vue b/src/components/gameMaster/zoneEditor/partials/Toolbar.vue
index 2b52149..aa369e9 100644
--- a/src/components/gameMaster/zoneEditor/partials/Toolbar.vue
+++ b/src/components/gameMaster/zoneEditor/partials/Toolbar.vue
@@ -82,9 +82,9 @@
 </template>
 
 <script setup lang="ts">
-import { onBeforeUnmount, onMounted, ref } from 'vue'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { onClickOutside } from '@vueuse/core'
+import { onBeforeUnmount, onMounted, ref } from 'vue'
 
 const zoneEditorStore = useZoneEditorStore()
 
diff --git a/src/components/gameMaster/zoneEditor/partials/ZoneList.vue b/src/components/gameMaster/zoneEditor/partials/ZoneList.vue
index 2bc2577..a63fa02 100644
--- a/src/components/gameMaster/zoneEditor/partials/ZoneList.vue
+++ b/src/components/gameMaster/zoneEditor/partials/ZoneList.vue
@@ -26,12 +26,12 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted } from 'vue'
-import { useGameStore } from '@/stores/gameStore'
-import Modal from '@/components/utilities/Modal.vue'
 import type { Zone } from '@/application/types'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import CreateZone from '@/components/gameMaster/zoneEditor/partials/CreateZone.vue'
+import Modal from '@/components/utilities/Modal.vue'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { onMounted } from 'vue'
 
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue b/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue
index 8dae8d5..7da1246 100644
--- a/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue
+++ b/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue
@@ -47,9 +47,9 @@
 </template>
 
 <script setup>
-import { ref, watch } from 'vue'
 import Modal from '@/components/utilities/Modal.vue'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { ref, watch } from 'vue'
 
 const zoneEditorStore = useZoneEditorStore()
 const screen = ref('settings')
diff --git a/src/components/gameMaster/zoneEditor/zonePartials/ZoneEventTiles.vue b/src/components/gameMaster/zoneEditor/zonePartials/ZoneEventTiles.vue
index fe130f0..fbd47cd 100644
--- a/src/components/gameMaster/zoneEditor/zonePartials/ZoneEventTiles.vue
+++ b/src/components/gameMaster/zoneEditor/zonePartials/ZoneEventTiles.vue
@@ -3,11 +3,11 @@
 </template>
 
 <script setup lang="ts">
-import { type ZoneEventTile, ZoneEventTileType } from '@/application/types'
+import { ZoneEventTileType, type ZoneEventTile } from '@/application/types'
+import { uuidv4 } from '@/application/utilities'
+import { getTile, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
 import { Image, useScene } from 'phavuer'
-import { getTile, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
-import { uuidv4 } from '@/application/utilities'
 import { onMounted, onUnmounted } from 'vue'
 
 const scene = useScene()
diff --git a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue
index eca55e6..c5defd5 100644
--- a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue
+++ b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue
@@ -3,12 +3,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
-import { Image, useScene } from 'phavuer'
-import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
-import { loadTexture } from '@/composables/gameComposable'
 import type { AssetDataT, ZoneObject } from '@/application/types'
+import { loadTexture } from '@/composables/gameComposable'
+import { calculateIsometricDepth, tileToWorldX, tileToWorldY } from '@/composables/zoneComposable'
 import { useGameStore } from '@/stores/gameStore'
+import { Image, useScene } from 'phavuer'
+import { computed } from 'vue'
 
 const props = defineProps<{
   tilemap: Phaser.Tilemaps.Tilemap
diff --git a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue
index f3afd30..6436a11 100644
--- a/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue
+++ b/src/components/gameMaster/zoneEditor/zonePartials/ZoneObjects.vue
@@ -4,14 +4,14 @@
 </template>
 
 <script setup lang="ts">
-import { uuidv4 } from '@/application/utilities'
-import { getTile } from '@/composables/zoneComposable'
-import { useScene } from 'phavuer'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import SelectedZoneObject from '@/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue'
-import { onMounted, onUnmounted, ref, watch } from 'vue'
-import ZoneObject from '@/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue'
 import type { ZoneObject as ZoneObjectT } from '@/application/types'
+import { uuidv4 } from '@/application/utilities'
+import SelectedZoneObject from '@/components/gameMaster/zoneEditor/partials/SelectedZoneObject.vue'
+import ZoneObject from '@/components/gameMaster/zoneEditor/zonePartials/ZoneObject.vue'
+import { getTile } from '@/composables/zoneComposable'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { useScene } from 'phavuer'
+import { onMounted, onUnmounted, ref, watch } from 'vue'
 
 const scene = useScene()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue b/src/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue
index 9ae49de..751a7bc 100644
--- a/src/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue
+++ b/src/components/gameMaster/zoneEditor/zonePartials/ZoneTiles.vue
@@ -4,13 +4,13 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
-import { useScene } from 'phavuer'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import { onMounted, onUnmounted, watch } from 'vue'
-import { createTileArray, getTile, placeTile, setLayerTiles } from '@/composables/zoneComposable'
-import Controls from '@/components/utilities/Controls.vue'
-import { useGameStore } from '@/stores/gameStore'
 import type { AssetDataT } from '@/application/types'
+import Controls from '@/components/utilities/Controls.vue'
+import { createTileArray, getTile, placeTile, setLayerTiles } from '@/composables/zoneComposable'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { useScene } from 'phavuer'
+import { onMounted, onUnmounted, watch } from 'vue'
 
 const emit = defineEmits(['tileMap:create'])
 
diff --git a/src/components/gui/CharacterProfile.vue b/src/components/gui/CharacterProfile.vue
index c901507..f41f746 100644
--- a/src/components/gui/CharacterProfile.vue
+++ b/src/components/gui/CharacterProfile.vue
@@ -118,8 +118,8 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted, ref, watch, computed } from 'vue'
 import { useGameStore } from '@/stores/gameStore'
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 
 const gameStore = useGameStore()
 
diff --git a/src/components/gui/Chat.vue b/src/components/gui/Chat.vue
index e134030..23c206b 100644
--- a/src/components/gui/Chat.vue
+++ b/src/components/gui/Chat.vue
@@ -21,12 +21,12 @@
 </template>
 
 <script setup lang="ts">
-import { onBeforeUnmount, ref, nextTick, onMounted } from 'vue'
-import { onClickOutside, useFocus } from '@vueuse/core'
-import { useGameStore } from '@/stores/gameStore'
 import type { Chat } from '@/application/types'
+import { useGameStore } from '@/stores/gameStore'
 import { useZoneStore } from '@/stores/zoneStore'
+import { onClickOutside, useFocus } from '@vueuse/core'
 import { useScene } from 'phavuer'
+import { nextTick, onBeforeUnmount, onMounted, ref } from 'vue'
 
 const scene = useScene()
 const gameStore = useGameStore()
diff --git a/src/components/gui/UserPanel.vue b/src/components/gui/UserPanel.vue
index 03739d0..5ec08cb 100644
--- a/src/components/gui/UserPanel.vue
+++ b/src/components/gui/UserPanel.vue
@@ -30,12 +30,12 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
-import { useGameStore } from '@/stores/gameStore'
-import Inventory from '@/components/gui/partials/Inventory.vue'
-import Equipment from '@/components/gui/partials/Equipment.vue'
 import CharacterScreen from '@/components/gui/partials/CharacterScreen.vue'
+import Equipment from '@/components/gui/partials/Equipment.vue'
+import Inventory from '@/components/gui/partials/Inventory.vue'
 import Settings from '@/components/gui/partials/Settings.vue'
+import { useGameStore } from '@/stores/gameStore'
+import { ref } from 'vue'
 
 const gameStore = useGameStore()
 let userPanelScreen = ref('inventory')
diff --git a/src/components/gui/partials/Settings.vue b/src/components/gui/partials/Settings.vue
index 6462610..56df8db 100644
--- a/src/components/gui/partials/Settings.vue
+++ b/src/components/gui/partials/Settings.vue
@@ -33,8 +33,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
 import CharacterSettings from '@/components/gui/partials/settings/CharacterSettings.vue'
+import { ref } from 'vue'
 
 let settingCategory = ref('character')
 </script>
diff --git a/src/components/login/LoginForm.vue b/src/components/login/LoginForm.vue
index 15aed31..982fd55 100644
--- a/src/components/login/LoginForm.vue
+++ b/src/components/login/LoginForm.vue
@@ -26,10 +26,10 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
 import { login } from '@/services/authentication'
 import { useGameStore } from '@/stores/gameStore'
 import { useCookies } from '@vueuse/integrations/useCookies'
+import { onMounted, ref } from 'vue'
 
 const emit = defineEmits(['openResetPasswordModal', 'switchToRegister'])
 
diff --git a/src/components/login/NewPasswordForm.vue b/src/components/login/NewPasswordForm.vue
index 3d7c62c..d34c779 100644
--- a/src/components/login/NewPasswordForm.vue
+++ b/src/components/login/NewPasswordForm.vue
@@ -22,10 +22,10 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
 import { newPassword } from '@/services/authentication'
 import { useGameStore } from '@/stores/gameStore'
 import { useCookies } from '@vueuse/integrations/useCookies'
+import { onMounted, ref } from 'vue'
 
 const emit = defineEmits(['switchToLogin'])
 
diff --git a/src/components/login/RegisterForm.vue b/src/components/login/RegisterForm.vue
index 41f48e8..0ec9101 100644
--- a/src/components/login/RegisterForm.vue
+++ b/src/components/login/RegisterForm.vue
@@ -26,10 +26,10 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
 import { login, register } from '@/services/authentication'
 import { useGameStore } from '@/stores/gameStore'
 import { useCookies } from '@vueuse/integrations/useCookies'
+import { onMounted, ref } from 'vue'
 
 const emit = defineEmits(['switchToLogin'])
 
diff --git a/src/components/login/ResetPasswordModal.vue b/src/components/login/ResetPasswordModal.vue
index 1a0a650..37e738d 100644
--- a/src/components/login/ResetPasswordModal.vue
+++ b/src/components/login/ResetPasswordModal.vue
@@ -29,10 +29,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
-import { resetPassword } from '@/services/authentication'
 import Modal from '@/components/utilities/Modal.vue'
+import { resetPassword } from '@/services/authentication'
 import { useGameStore } from '@/stores/gameStore'
+import { ref } from 'vue'
 
 const emit = defineEmits(['close'])
 
diff --git a/src/components/screens/Characters.vue b/src/components/screens/Characters.vue
index cc7026f..39831b1 100644
--- a/src/components/screens/Characters.vue
+++ b/src/components/screens/Characters.vue
@@ -126,10 +126,10 @@
 
 <script setup lang="ts">
 import config from '@/application/config'
+import { type CharacterHair, type Character as CharacterT, type Zone } from '@/application/types'
+import Modal from '@/components/utilities/Modal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { onBeforeUnmount, ref, watch } from 'vue'
-import Modal from '@/components/utilities/Modal.vue'
-import { type Character as CharacterT, type CharacterHair, type Zone } from '@/application/types'
 
 const gameStore = useGameStore()
 const isLoading = ref<boolean>(true)
diff --git a/src/components/screens/Game.vue b/src/components/screens/Game.vue
index 2b44290..eb5cd59 100644
--- a/src/components/screens/Game.vue
+++ b/src/components/screens/Game.vue
@@ -20,19 +20,19 @@
 <script setup lang="ts">
 import config from '@/application/config'
 import 'phaser'
-import { Game, Scene } from 'phavuer'
-import { useGameStore } from '@/stores/gameStore'
-import Menu from '@/components/gui/Menu.vue'
-import ExpBar from '@/components/gui/ExpBar.vue'
-import Hud from '@/components/gui/Hud.vue'
-import Zone from '@/components/game/zone/Zone.vue'
-import Hotkeys from '@/components/gui/Hotkeys.vue'
-import Chat from '@/components/gui/Chat.vue'
-import CharacterProfile from '@/components/gui/CharacterProfile.vue'
 import Effects from '@/components/Effects.vue'
+import Zone from '@/components/game/zone/Zone.vue'
+import CharacterProfile from '@/components/gui/CharacterProfile.vue'
+import Chat from '@/components/gui/Chat.vue'
 // import Minimap from '@/components/gui/Minimap.vue'
 import Clock from '@/components/gui/Clock.vue'
+import ExpBar from '@/components/gui/ExpBar.vue'
+import Hotkeys from '@/components/gui/Hotkeys.vue'
+import Hud from '@/components/gui/Hud.vue'
+import Menu from '@/components/gui/Menu.vue'
+import { useGameStore } from '@/stores/gameStore'
 import AwaitLoaderPlugin from 'phaser3-rex-plugins/plugins/awaitloader-plugin'
+import { Game, Scene } from 'phavuer'
 
 const gameStore = useGameStore()
 
diff --git a/src/components/screens/Login.vue b/src/components/screens/Login.vue
index 9391586..6457bc0 100644
--- a/src/components/screens/Login.vue
+++ b/src/components/screens/Login.vue
@@ -26,13 +26,13 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
+import LoginForm from '@/components/login/LoginForm.vue'
+import NewPasswordForm from '@/components/login/NewPasswordForm.vue'
+import RegisterForm from '@/components/login/RegisterForm.vue'
+import ResetPassword from '@/components/login/ResetPasswordModal.vue'
 import { useGameStore } from '@/stores/gameStore'
 import { useCookies } from '@vueuse/integrations/useCookies'
-import LoginForm from '@/components/login/LoginForm.vue'
-import RegisterForm from '@/components/login/RegisterForm.vue'
-import NewPasswordForm from '@/components/login/NewPasswordForm.vue'
-import ResetPassword from '@/components/login/ResetPasswordModal.vue'
+import { onMounted, ref } from 'vue'
 
 const isPasswordResetFormShown = ref(false)
 const doesUrlHaveToken = ref(window.location.hash !== '')
diff --git a/src/components/screens/ZoneEditor.vue b/src/components/screens/ZoneEditor.vue
index 7641bb4..43b8922 100644
--- a/src/components/screens/ZoneEditor.vue
+++ b/src/components/screens/ZoneEditor.vue
@@ -11,13 +11,13 @@
 <script setup lang="ts">
 import config from '@/application/config'
 import 'phaser'
-import { Game, Scene } from 'phavuer'
+import type { AssetDataT } from '@/application/types'
+import ZoneEditor from '@/components/gameMaster/zoneEditor/ZoneEditor.vue'
+import { loadTexture } from '@/composables/gameComposable'
 import { useGameStore } from '@/stores/gameStore'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import ZoneEditor from '@/components/gameMaster/zoneEditor/ZoneEditor.vue'
 import AwaitLoaderPlugin from 'phaser3-rex-plugins/plugins/awaitloader-plugin'
-import { loadTexture } from '@/composables/gameComposable'
-import type { AssetDataT } from '@/application/types'
+import { Game, Scene } from 'phavuer'
 
 const gameStore = useGameStore()
 const zoneEditorStore = useZoneEditorStore()
diff --git a/src/components/utilities/Controls.vue b/src/components/utilities/Controls.vue
index b924bfc..c39b97d 100644
--- a/src/components/utilities/Controls.vue
+++ b/src/components/utilities/Controls.vue
@@ -3,10 +3,10 @@
 </template>
 
 <script setup lang="ts">
+import { useCameraControls } from '@/composables/useCameraControls'
+import { usePointerHandlers } from '@/composables/usePointerHandlers'
 import { Image, useScene } from 'phavuer'
 import { onBeforeUnmount, ref } from 'vue'
-import { usePointerHandlers } from '@/composables/usePointerHandlers'
-import { useCameraControls } from '@/composables/useCameraControls'
 
 // Types
 type WayPoint = { visible: boolean; x: number; y: number }
diff --git a/src/components/utilities/Notifications.vue b/src/components/utilities/Notifications.vue
index f188299..9041c63 100644
--- a/src/components/utilities/Notifications.vue
+++ b/src/components/utilities/Notifications.vue
@@ -10,8 +10,8 @@
 </template>
 
 <script setup lang="ts">
-import { useGameStore } from '@/stores/gameStore'
 import Modal from '@/components/utilities/Modal.vue'
+import { useGameStore } from '@/stores/gameStore'
 import { onBeforeMount, onBeforeUnmount, onMounted, onUnmounted, watch } from 'vue'
 
 const gameStore = useGameStore()
diff --git a/src/composables/gameComposable.ts b/src/composables/gameComposable.ts
index b521737..ede23a4 100644
--- a/src/composables/gameComposable.ts
+++ b/src/composables/gameComposable.ts
@@ -1,7 +1,7 @@
-import type { AssetDataT, HttpResponse, Sprite, SpriteAction } from '@/application/types'
-import { useGameStore } from '@/stores/gameStore'
 import { Assets } from '@/application/assets'
 import config from '@/application/config'
+import type { AssetDataT, HttpResponse, Sprite, SpriteAction } from '@/application/types'
+import { useGameStore } from '@/stores/gameStore'
 
 const textureLoadingPromises = new Map<string, Promise<boolean>>()
 
diff --git a/src/composables/pointerHandlers/useGamePointerHandlers.ts b/src/composables/pointerHandlers/useGamePointerHandlers.ts
index 6883633..d739a94 100644
--- a/src/composables/pointerHandlers/useGamePointerHandlers.ts
+++ b/src/composables/pointerHandlers/useGamePointerHandlers.ts
@@ -1,7 +1,7 @@
-import { type Ref, ref } from 'vue'
+import config from '@/application/config'
 import { getTile, tileToWorldXY } from '@/composables/zoneComposable'
 import { useGameStore } from '@/stores/gameStore'
-import config from '@/application/config'
+import { ref, type Ref } from 'vue'
 
 export function useGamePointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
   const gameStore = useGameStore()
diff --git a/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts b/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
index c621259..e649952 100644
--- a/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
+++ b/src/composables/pointerHandlers/useZoneEditorPointerHandlers.ts
@@ -1,8 +1,8 @@
-import { computed, type Ref } from 'vue'
-import { getTile, tileToWorldXY } from '@/composables/zoneComposable'
-import { useZoneEditorStore } from '@/stores/zoneEditorStore'
-import { useGameStore } from '@/stores/gameStore'
 import config from '@/application/config'
+import { getTile, tileToWorldXY } from '@/composables/zoneComposable'
+import { useGameStore } from '@/stores/gameStore'
+import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { computed, type Ref } from 'vue'
 
 export function useZoneEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.Tilemaps.TilemapLayer, waypoint: Ref<{ visible: boolean; x: number; y: number }>, camera: Phaser.Cameras.Scene2D.Camera) {
   const gameStore = useGameStore()
@@ -43,7 +43,7 @@ export function useZoneEditorPointerHandlers(scene: Phaser.Scene, layer: Phaser.
   function handleZoom(pointer: Phaser.Input.Pointer) {
     if (pointer.event instanceof WheelEvent && pointer.event.shiftKey) {
       const deltaY = pointer.event.deltaY
-      let zoomLevel = camera.zoom - deltaY * 0.005
+      const zoomLevel = camera.zoom - deltaY * 0.005
       if (zoomLevel > 0 && zoomLevel < 3) {
         camera.setZoom(zoomLevel)
       }
diff --git a/src/composables/usePointerHandlers.ts b/src/composables/usePointerHandlers.ts
index f28c80b..398591f 100644
--- a/src/composables/usePointerHandlers.ts
+++ b/src/composables/usePointerHandlers.ts
@@ -1,5 +1,5 @@
-import { computed, type Ref, watch } from 'vue'
 import { useZoneEditorStore } from '@/stores/zoneEditorStore'
+import { computed, watch, type Ref } from 'vue'
 import { useGamePointerHandlers } from './pointerHandlers/useGamePointerHandlers'
 import { useZoneEditorPointerHandlers } from './pointerHandlers/useZoneEditorPointerHandlers'
 
diff --git a/src/composables/zoneComposable.ts b/src/composables/zoneComposable.ts
index afc7671..32bc027 100644
--- a/src/composables/zoneComposable.ts
+++ b/src/composables/zoneComposable.ts
@@ -1,10 +1,11 @@
 import config from '@/application/config'
+import type { AssetDataT, HttpResponse, Zone as ZoneT } from '@/application/types'
+import { loadTexture } from '@/composables/gameComposable'
+
 import Tilemap = Phaser.Tilemaps.Tilemap
 import TilemapLayer = Phaser.Tilemaps.TilemapLayer
 import Tileset = Phaser.Tilemaps.Tileset
 import Tile = Phaser.Tilemaps.Tile
-import type { AssetDataT, HttpResponse, Zone as ZoneT } from '@/application/types'
-import { loadTexture } from '@/composables/gameComposable'
 
 export function getTile(layer: TilemapLayer | Tilemap, x: number, y: number): Tile | undefined {
   const tile = layer.getTileAtWorldXY(x, y)
diff --git a/src/main.ts b/src/main.ts
index 4993577..b02cb34 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,7 +1,6 @@
 import './assets/scss/main.scss'
-
-import { createApp } from 'vue'
 import { createPinia } from 'pinia'
+import { createApp } from 'vue'
 import App from './App.vue'
 
 const app = createApp(App)
diff --git a/src/services/authentication.ts b/src/services/authentication.ts
index 035d761..2f68e2f 100644
--- a/src/services/authentication.ts
+++ b/src/services/authentication.ts
@@ -1,7 +1,7 @@
-import axios from 'axios'
 import config from '@/application/config'
-import { useCookies } from '@vueuse/integrations/useCookies'
 import { getDomain } from '@/application/utilities'
+import { useCookies } from '@vueuse/integrations/useCookies'
+import axios from 'axios'
 
 export async function register(username: string, email: string, password: string) {
   try {
diff --git a/src/stores/assetManagerStore.ts b/src/stores/assetManagerStore.ts
index b665f13..eda0180 100644
--- a/src/stores/assetManagerStore.ts
+++ b/src/stores/assetManagerStore.ts
@@ -1,6 +1,6 @@
-import { ref } from 'vue'
+import type { CharacterHair, CharacterType, Item, Object, Sprite, Tile } from '@/application/types'
 import { defineStore } from 'pinia'
-import type { Tile, Object, Sprite, CharacterType, CharacterHair, Item } from '@/application/types'
+import { ref } from 'vue'
 
 export const useAssetManagerStore = defineStore('assetManager', () => {
   const tileList = ref<Tile[]>([])
diff --git a/src/stores/gameStore.ts b/src/stores/gameStore.ts
index 9da2354..4b46461 100644
--- a/src/stores/gameStore.ts
+++ b/src/stores/gameStore.ts
@@ -1,9 +1,9 @@
+import config from '@/application/config'
+import type { AssetDataT, Character, Notification, User, WorldSettings } from '@/application/types'
+import { getDomain } from '@/application/utilities'
+import { useCookies } from '@vueuse/integrations/useCookies'
 import { defineStore } from 'pinia'
 import { io, Socket } from 'socket.io-client'
-import type { AssetDataT, Character, Notification, User, WorldSettings } from '@/application/types'
-import config from '@/application/config'
-import { useCookies } from '@vueuse/integrations/useCookies'
-import { getDomain } from '@/application/utilities'
 
 export const useGameStore = defineStore('game', {
   state: () => {
diff --git a/src/stores/zoneEditorStore.ts b/src/stores/zoneEditorStore.ts
index 133497a..607911a 100644
--- a/src/stores/zoneEditorStore.ts
+++ b/src/stores/zoneEditorStore.ts
@@ -1,6 +1,6 @@
-import { defineStore } from 'pinia'
+import type { Object, Tile, Zone, ZoneEffect, ZoneObject } from '@/application/types'
 import { useGameStore } from '@/stores/gameStore'
-import type { Zone, Object, Tile, ZoneEffect, ZoneObject } from '@/application/types'
+import { defineStore } from 'pinia'
 
 export type TeleportSettings = {
   toZoneId: number
diff --git a/src/stores/zoneStore.ts b/src/stores/zoneStore.ts
index 19d8802..0ecc554 100644
--- a/src/stores/zoneStore.ts
+++ b/src/stores/zoneStore.ts
@@ -1,5 +1,5 @@
+import type { Zone, ZoneCharacter } from '@/application/types'
 import { defineStore } from 'pinia'
-import type { ZoneCharacter, Zone } from '@/application/types'
 
 export const useZoneStore = defineStore('zone', {
   state: () => {