chore: release version v1.13.7

refactor(Map): Map event handling refactoring
2025-11-13 12:46:14 +00:00 · 2024-10-31 22:56:59 +01:00 · 2024-10-31 19:19:23 +01:00 · 2024-10-31 19:19:07 +01:00
96 changed files with 1397 additions and 3807 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,7 +1,12 @@
-FROM elixir:1.17-otp-27
+FROM elixir:1.16-otp-25

-RUN apt install -yq curl gnupg
+RUN apt update -yq
+RUN apt install -yq curl gnupg mc inotify-tools
 RUN apt --fix-broken install
+RUN apt remove -y nodejs nodejs-doc
+RUN curl -sL https://deb.nodesource.com/setup_18.x  | bash -
+RUN apt install -y nodejs
+RUN npm install --global yarn

 RUN mix local.hex --force

--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,7 +2,7 @@ version: "0.1"

 services:
  db:
-    image: postgres:13-alpine
+    image: postgres:14.3
    restart: always
    environment:
      POSTGRES_USER: postgres
@@ -10,13 +10,13 @@ services:
    ports:
      - "5432:5432"
    volumes:
-      - db-new:/var/lib/postgresql/data
+      - db:/var/lib/postgresql/data

  wanderer:
    environment:
      PORT: 8000
      DB_HOST: db
-      WEB_APP_URL: "http://localhost:8000"
+      WEB_APP_URL: "http://localhost:4444"
      ERL_AFLAGS: "-kernel shell_history enabled"
    build:
      context: .
@@ -33,4 +33,4 @@ services:

 volumes:
  elixir-artifacts: {}
-  db-new: {}
+  db: {}
--- a/.github/workflows/release_actions.yml
+++ b/.github/workflows/release_actions.yml
@@ -18,4 +18,4 @@ jobs:
          key: ${{ secrets.SSH_KEY }}
          port: ${{ secrets.PORT }}
          script: |
-            /home/wanderer/app/deploy.sh ${{ github.event.release.tag_name }}
+            /app/release/linux/deploy.sh ${{ github.event.release.tag_name }}
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-erlang 26.2.5.5
-elixir 1.17.3-otp-26
+erlang 25.3
+elixir 1.16-otp-25
 nodejs 18.0.0
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,188 +1,6 @@
 # Change Log

 <!-- changelog -->
-
-## [v1.20.1](https://github.com/wanderer-industries/wanderer/compare/v1.20.0...v1.20.1) (2024-11-22)
-
-
-
-
-## [v1.20.0](https://github.com/wanderer-industries/wanderer/compare/v1.19.3...v1.20.0) (2024-11-22)
-
-
-
-
-### Features:
-
-* Core: Add connection type for Gates, add new Update logic
-
-## [v1.19.3](https://github.com/wanderer-industries/wanderer/compare/v1.19.2...v1.19.3) (2024-11-20)
-
-
-
-
-### Bug Fixes:
-
-* Core: Fix adding systems on splash (#71)
-
-* Core: Fix adding systems on splash
-
-## [v1.19.2](https://github.com/wanderer-industries/wanderer/compare/v1.19.1...v1.19.2) (2024-11-19)
-
-
-
-
-## [v1.19.1](https://github.com/wanderer-industries/wanderer/compare/v1.19.0...v1.19.1) (2024-11-19)
-
-
-
-
-## [v1.19.0](https://github.com/wanderer-industries/wanderer/compare/v1.18.1...v1.19.0) (2024-11-19)
-
-
-
-
-### Features:
-
-* Signatures: Add user setting to show Inserted time in a separate column
-
-## [v1.18.1](https://github.com/wanderer-industries/wanderer/compare/v1.18.0...v1.18.1) (2024-11-17)
-
-
-
-
-## [v1.18.0](https://github.com/wanderer-industries/wanderer/compare/v1.17.0...v1.18.0) (2024-11-16)
-
-
-
-
-### Features:
-
-* Map: a lot of design issues
-
-## [v1.17.0](https://github.com/wanderer-industries/wanderer/compare/v1.16.1...v1.17.0) (2024-11-15)
-
-
-
-
-### Features:
-
-* Signatures: Add user setting to show Description in a separate column
-
-## [v1.16.1](https://github.com/wanderer-industries/wanderer/compare/v1.16.0...v1.16.1) (2024-11-15)
-
-
-
-
-### Bug Fixes:
-
-* Signatures: Fix signature stored filters
-
-## [v1.16.0](https://github.com/wanderer-industries/wanderer/compare/v1.15.5...v1.16.0) (2024-11-15)
-
-
-
-
-### Features:
-
-* Signatures: Add additional filters support to signature list, show description icon
-
-## [v1.15.5](https://github.com/wanderer-industries/wanderer/compare/v1.15.4...v1.15.5) (2024-11-14)
-
-
-
-
-## [v1.15.4](https://github.com/wanderer-industries/wanderer/compare/v1.15.3...v1.15.4) (2024-11-14)
-
-
-
-
-### Bug Fixes:
-
-* Core: Untracked characters still tracked on map (#63)
-
-## [v1.15.3](https://github.com/wanderer-industries/wanderer/compare/v1.15.2...v1.15.3) (2024-11-13)
-
-
-
-
-## [v1.15.2](https://github.com/wanderer-industries/wanderer/compare/v1.15.1...v1.15.2) (2024-11-07)
-
-
-
-
-## [v1.15.1](https://github.com/wanderer-industries/wanderer/compare/v1.15.0...v1.15.1) (2024-11-07)
-
-
-
-
-### Bug Fixes:
-
-* Dev: Update .devcontainer instructions
-
-## [v1.15.0](https://github.com/wanderer-industries/wanderer/compare/v1.14.1...v1.15.0) (2024-11-07)
-
-
-
-
-### Features:
-
-* Connections: Add connection mark EOL time (#56)
-
-## [v1.14.1](https://github.com/wanderer-industries/wanderer/compare/v1.14.0...v1.14.1) (2024-11-06)
-
-
-
-
-### Bug Fixes:
-
-* Core: Fix character tracking permissions
-
-## [v1.14.0](https://github.com/wanderer-industries/wanderer/compare/v1.13.12...v1.14.0) (2024-11-05)
-
-
-
-
-### Features:
-
-* ACL: Add an ability to assign member role without DnD
-
-## [v1.13.12](https://github.com/wanderer-industries/wanderer/compare/v1.13.11...v1.13.12) (2024-11-04)
-
-
-
-
-### Bug Fixes:
-
-* Map: Fix system revert issues
-
-## [v1.13.11](https://github.com/wanderer-industries/wanderer/compare/v1.13.10...v1.13.11) (2024-11-02)
-
-
-
-
-### Bug Fixes:
-
-* Map: Fix system revert issues
-
-## [v1.13.10](https://github.com/wanderer-industries/wanderer/compare/v1.13.9...v1.13.10) (2024-11-01)
-
-
-
-
-### Bug Fixes:
-
-* Map: Fix system revert issues
-
-## [v1.13.9](https://github.com/wanderer-industries/wanderer/compare/v1.13.8...v1.13.9) (2024-11-01)
-
-
-
-
-## [v1.13.8](https://github.com/wanderer-industries/wanderer/compare/v1.13.7...v1.13.8) (2024-10-28)
-
-
-
 ## [v1.13.0](https://github.com/wanderer-industries/wanderer/compare/v1.12.11...v1.13.0) (2024-10-28)


--- a/README.md
+++ b/README.md
@@ -20,11 +20,11 @@ Interested to learn more? [Check more on our website](https://wanderer.ltd/news)

 Wanderer is open source project and we have a free as in beer and self-hosted solution called [Wanderer Community Edition (CE)](https://wanderer.ltd/news/community-edition). Here are the differences between Wanderer and Wanderer CE:

-|                               | Wanderer Cloud                                                                                                                                                                                                                                                                                                                              | Wanderer Community Edition                                                                                                                                                                                                                           |
-| ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Infrastructure management** | Easy and convenient. It takes 2 minutes to register your character and create a map. We manage everything so you don’t have to worry about anything and can focus on gameplay.                                                                                                                                                              | You do it all yourself. You need to get a server and you need to manage your infrastructure. You are responsible for installation, maintenance, upgrades, server capacity, uptime, backup, security, stability, consistency, loading time and so on. |
-| **Release schedule**          | Continuously developed and improved with new features and updates multiple times per week.                                                                                                                                                                                                                                                  | Latest features and improvements won't be immediately available.                                                                                                                                                                                     |
-| **Server location**           | All visitor data is exclusively processed on EU-owned cloud infrastructure. We keep your site data on a secure, encrypted and green energy powered server in Germany. This ensures that your site data is protected by the strict European Union data privacy laws and ensures compliance with GDPR. Your website data never leaves the EU. | You have full control and can host your instance on any server in any country that you wish. Host it on a server in your basement or host it with any cloud provider wherever you want, even those that are not GDPR compliant.                      |
+|  | Wanderer Cloud  | Wanderer Community Edition |
+| ------------- | ------------- | ------------- |
+| **Infrastructure management** | Easy and convenient. It takes 2 minutes to register your character and create a map. We manage everything so you don’t have to worry about anything and can focus on gameplay. | You do it all yourself. You need to get a server and you need to manage your infrastructure. You are responsible for installation, maintenance, upgrades, server capacity, uptime, backup, security, stability, consistency, loading time and so on.|
+| **Release schedule** | Continuously developed and improved with new features and updates multiple times per week. | Latest features and improvements won't be immediately available.|
+| **Server location** | All visitor data is exclusively processed on EU-owned cloud infrastructure. We keep your site data on a secure, encrypted and green energy powered server in Germany. This ensures that your site data is protected by the strict European Union data privacy laws and ensures compliance with GDPR. Your website data never leaves the EU. | You have full control and can host your instance on any server in any country that you wish. Host it on a server in your basement or host it with any cloud provider wherever you want, even those that are not GDPR compliant.|

 Interested in self-hosting Wanderer CE on your server? Take a look at our [Wanderer CE installation instructions](https://github.com/wanderer-industries/community-edition/).

@@ -54,13 +54,7 @@ Now you can visit [`localhost:8000`](http://localhost:8000) from your browser.
 #### Using .devcontainer

 - Run devcontainer
- Install additional dependencies inside Dev container
- `root@0d0a785313b6:/app# apt update`
- `root@0d0a785313b6:/app# curl -sL https://deb.nodesource.com/setup_18.x  | bash -`
- `root@0d0a785313b6:/app# apt-get install nodejs inotify-tools -y`
- `root@0d0a785313b6:/app# mix setup`
-
- See how to run server in #Run section
+- See how to start server in #setup section

 #### Using nix flakes

--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -466,407 +466,3 @@ body {
    transform: rotate(-360deg);
  }
 }
-
-/* Map refresh */
-.socket {
-  scale: 0.5;
-  width: 150px;
-  height: 150px;
-  left: 50%;
-  /* margin-left: -75px; */
-  top: 50%;
-  /* margin-top: -50px; */
-}
-
-.hex-brick {
-  background: #000;
-  width: 30px;
-  height: 17px;
-  position: absolute;
-  top: 5px;
-  animation-name: fade;
-  animation-duration: 2s;
-  animation-iteration-count: infinite;
-  -webkit-animation-name: fade;
-  -webkit-animation-duration: 2s;
-  -webkit-animation-iteration-count: infinite;
-}
-
-.hex-brick--active {
-  animation-name: fade-active;
-  -webkit-animation-name: fade-active;
-}
-
-.h2 {
-  transform: rotate(60deg);
-  -webkit-transform: rotate(60deg);
-}
-
-.h3 {
-  transform: rotate(-60deg);
-  -webkit-transform: rotate(-60deg);
-}
-
-.gel {
-  height: 30px;
-  width: 30px;
-  transition: all 0.3s;
-  -webkit-transition: all 0.3s;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-}
-
-.center-gel {
-  margin-left: -15px;
-  margin-top: -15px;
-
-  animation-name: pulse-version;
-  animation-duration: 2s;
-  animation-iteration-count: infinite;
-  -webkit-animation-name: pulse-version;
-  -webkit-animation-duration: 2s;
-  -webkit-animation-iteration-count: infinite;
-}
-
-.c1 {
-  margin-left: -47px;
-  margin-top: -15px;
-}
-
-.c2 {
-  margin-left: -31px;
-  margin-top: -43px;
-}
-
-.c3 {
-  margin-left: 1px;
-  margin-top: -43px;
-}
-
-.c4 {
-  margin-left: 17px;
-  margin-top: -15px;
-}
-.c5 {
-  margin-left: -31px;
-  margin-top: 13px;
-}
-
-.c6 {
-  margin-left: 1px;
-  margin-top: 13px;
-}
-
-.c7 {
-  margin-left: -63px;
-  margin-top: -43px;
-}
-
-.c8 {
-  margin-left: 33px;
-  margin-top: -43px;
-}
-
-.c9 {
-  margin-left: -15px;
-  margin-top: 41px;
-}
-
-.c10 {
-  margin-left: -63px;
-  margin-top: 13px;
-}
-
-.c11 {
-  margin-left: 33px;
-  margin-top: 13px;
-}
-
-.c12 {
-  margin-left: -15px;
-  margin-top: -71px;
-}
-
-.c13 {
-  margin-left: -47px;
-  margin-top: -71px;
-}
-
-.c14 {
-  margin-left: 17px;
-  margin-top: -71px;
-}
-
-.c15 {
-  margin-left: -47px;
-  margin-top: 41px;
-}
-
-.c16 {
-  margin-left: 17px;
-  margin-top: 41px;
-}
-
-.c17 {
-  margin-left: -79px;
-  margin-top: -15px;
-}
-
-.c18 {
-  margin-left: 49px;
-  margin-top: -15px;
-}
-
-.c19 {
-  margin-left: -63px;
-  margin-top: -99px;
-}
-
-.c20 {
-  margin-left: 33px;
-  margin-top: -99px;
-}
-
-.c21 {
-  margin-left: 1px;
-  margin-top: -99px;
-}
-
-.c22 {
-  margin-left: -31px;
-  margin-top: -99px;
-}
-
-.c23 {
-  margin-left: -63px;
-  margin-top: 69px;
-}
-
-.c24 {
-  margin-left: 33px;
-  margin-top: 69px;
-}
-
-.c25 {
-  margin-left: 1px;
-  margin-top: 69px;
-}
-
-.c26 {
-  margin-left: -31px;
-  margin-top: 69px;
-}
-
-.c27 {
-  margin-left: -79px;
-  margin-top: -15px;
-}
-
-.c28 {
-  margin-left: -95px;
-  margin-top: -43px;
-}
-
-.c29 {
-  margin-left: -95px;
-  margin-top: 13px;
-}
-
-.c30 {
-  margin-left: 49px;
-  margin-top: 41px;
-}
-
-.c31 {
-  margin-left: -79px;
-  margin-top: -71px;
-}
-
-.c32 {
-  margin-left: -111px;
-  margin-top: -15px;
-}
-
-.c33 {
-  margin-left: 65px;
-  margin-top: -43px;
-}
-
-.c34 {
-  margin-left: 65px;
-  margin-top: 13px;
-}
-
-.c35 {
-  margin-left: -79px;
-  margin-top: 41px;
-}
-
-.c36 {
-  margin-left: 49px;
-  margin-top: -71px;
-}
-
-.c37 {
-  margin-left: 81px;
-  margin-top: -15px;
-}
-
-.r1 {
-  animation-name: pulse-version;
-  animation-duration: 2s;
-  animation-iteration-count: infinite;
-  animation-delay: 0.2s;
-  -webkit-animation-name: pulse-version;
-  -webkit-animation-duration: 2s;
-  -webkit-animation-iteration-count: infinite;
-  -webkit-animation-delay: 0.2s;
-}
-
-.r2 {
-  animation-name: pulse-version;
-  animation-duration: 2s;
-  animation-iteration-count: infinite;
-  animation-delay: 0.4s;
-  -webkit-animation-name: pulse-version;
-  -webkit-animation-duration: 2s;
-  -webkit-animation-iteration-count: infinite;
-  -webkit-animation-delay: 0.4s;
-}
-
-.r3 {
-  animation-name: pulse-version;
-  animation-duration: 2s;
-  animation-iteration-count: infinite;
-  animation-delay: 0.6s;
-  -webkit-animation-name: pulse-version;
-  -webkit-animation-duration: 2s;
-  -webkit-animation-iteration-count: infinite;
-  -webkit-animation-delay: 0.6s;
-}
-
-.r1 > .hex-brick {
-  animation-name: fade;
-  animation-duration: 2s;
-  animation-iteration-count: infinite;
-  animation-delay: 0.2s;
-  -webkit-animation-name: fade;
-  -webkit-animation-duration: 2s;
-  -webkit-animation-iteration-count: infinite;
-  -webkit-animation-delay: 0.2s;
-}
-
-.r1 > .hex-brick--active {
-  animation-name: fade-active;
-  -webkit-animation-name: fade-active;
-}
-
-.r2 > .hex-brick {
-  animation-name: fade;
-  animation-duration: 2s;
-  animation-iteration-count: infinite;
-  animation-delay: 0.4s;
-  -webkit-animation-name: fade;
-  -webkit-animation-duration: 2s;
-  -webkit-animation-iteration-count: infinite;
-  -webkit-animation-delay: 0.4s;
-}
-
-.r2 > .hex-brick--active {
-  animation-name: fade-active;
-  -webkit-animation-name: fade-active;
-}
-
-.r3 > .hex-brick {
-  animation-name: fade;
-  animation-duration: 2s;
-  animation-iteration-count: infinite;
-  animation-delay: 0.6s;
-  -webkit-animation-name: fade;
-  -webkit-animation-duration: 2s;
-  -webkit-animation-iteration-count: infinite;
-  -webkit-animation-delay: 0.6s;
-}
-
-.r3 > .hex-brick--active {
-  animation-name: fade-active;
-  -webkit-animation-name: fade-active;
-}
-
-@keyframes pulse-version {
-  0% {
-    -webkit-transform: scale(1);
-    transform: scale(1);
-  }
-
-  50% {
-    -webkit-transform: scale(0.01);
-    transform: scale(0.01);
-  }
-
-  100% {
-    -webkit-transform: scale(1);
-    transform: scale(1);
-  }
-}
-
-@keyframes fade {
-  0% {
-    background: #09d0e2;
-  }
-
-  50% {
-    background: #8ae6ee;
-  }
-
-  100% {
-    background: #09d0e2;
-  }
-}
-
-@keyframes fade-active {
-  0% {
-    background: #ff52d9;
-  }
-
-  50% {
-    background: #ff52d9;
-  }
-
-  100% {
-    background: #ff52d9;
-  }
-}
-
-@-webkit-keyframes pulse {
-  0% {
-    -webkit-transform: scale(1);
-    transform: scale(1);
-  }
-
-  50% {
-    -webkit-transform: scale(0.01);
-    transform: scale(0.01);
-  }
-
-  100% {
-    -webkit-transform: scale(1);
-    transform: scale(1);
-  }
-}
-
-@-webkit-keyframes fade {
-  0% {
-    background: #abf8ff;
-  }
-
-  50% {
-    background: #389ca6;
-  }
-
-  100% {
-    background: #abf8ff;
-  }
-}
-/* Map refresh END */
--- a/assets/js/hooks/Mapper/MapRoot.tsx
+++ b/assets/js/hooks/Mapper/MapRoot.tsx
@@ -15,10 +15,11 @@ const ErrorFallback = () => {
 };

 export default function MapRoot({ hooks }) {
+  const mapRef = useRef<MapHandlers>(null);
  const providerRef = useRef<MapHandlers>(null);
  const hooksRef = useRef<any>(hooks);

-  const mapperHandlerRefs = useRef([providerRef]);
+  const mapperHandlerRefs = useRef([mapRef, providerRef]);

  const { handleCommand, handleMapEvent, handleMapEvents } = useMapperHandlers(mapperHandlerRefs.current, hooksRef);

@@ -40,7 +41,7 @@ export default function MapRoot({ hooks }) {

  return (
    <PrimeReactProvider>
-      <MapRootProvider fwdRef={providerRef} outCommand={handleCommand}>
+      <MapRootProvider fwdRef={providerRef} outCommand={handleCommand} mapRef={mapRef}>
        <ErrorBoundary FallbackComponent={ErrorFallback} onError={logError}>
          <ReactFlowProvider>
            <MapRootContent />
--- a/assets/js/hooks/Mapper/components/characters/Characters.tsx
+++ b/assets/js/hooks/Mapper/components/characters/Characters.tsx
@@ -1,19 +1,20 @@
 import { useCallback } from 'react';
 import clsx from 'clsx';
 import { useAutoAnimate } from '@formkit/auto-animate/react';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { Commands } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { CharacterTypeRaw } from '@/hooks/Mapper/types';
-import { emitMapEvent } from '@/hooks/Mapper/events';

 const Characters = ({ data }: { data: CharacterTypeRaw[] }) => {
  const [parent] = useAutoAnimate();
+  const { mapRef } = useMapRootState();

-  const handleSelect = useCallback((character: CharacterTypeRaw) => {
-    emitMapEvent({
-      name: Commands.centerSystem,
-      data: character?.location?.solar_system_id?.toString(),
-    });
-  }, []);
+  const handleSelect = useCallback(
+    (character: CharacterTypeRaw) => {
+      mapRef.current?.command(Commands.centerSystem, character?.location?.solar_system_id?.toString());
+    },
+    [mapRef],
+  );

  const items = data.map(character => (
    <li
--- a/assets/js/hooks/Mapper/components/contexts/ContextMenuSystemInfo/useContextMenuSystemInfoHandlers.ts
+++ b/assets/js/hooks/Mapper/components/contexts/ContextMenuSystemInfo/useContextMenuSystemInfoHandlers.ts
@@ -1,25 +1,25 @@
-import * as React from 'react';
-import { useCallback, useRef, useState } from 'react';
+import { RefObject, useCallback, useRef, useState } from 'react';
 import { ContextMenu } from 'primereact/contextmenu';
-import { Commands, OutCommand, OutCommandHandler } from '@/hooks/Mapper/types/mapHandlers.ts';
+import { Commands, MapHandlers, OutCommand, OutCommandHandler } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { WaypointSetContextHandler } from '@/hooks/Mapper/components/contexts/types.ts';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';
+import * as React from 'react';
 import { SolarSystemStaticInfoRaw } from '@/hooks/Mapper/types';
-import { emitMapEvent } from '@/hooks/Mapper/events';

 interface UseContextMenuSystemHandlersProps {
  hubs: string[];
  outCommand: OutCommandHandler;
+  mapRef: RefObject<MapHandlers>;
 }

-export const useContextMenuSystemInfoHandlers = ({ hubs, outCommand }: UseContextMenuSystemHandlersProps) => {
+export const useContextMenuSystemInfoHandlers = ({ hubs, outCommand, mapRef }: UseContextMenuSystemHandlersProps) => {
  const contextMenuRef = useRef<ContextMenu | null>(null);

  const [system, setSystem] = useState<string>();
  const routeRef = useRef<(SolarSystemStaticInfoRaw | undefined)[]>([]);

-  const ref = useRef({ hubs, system, outCommand });
-  ref.current = { hubs, system, outCommand };
+  const ref = useRef({ hubs, system, outCommand, mapRef });
+  ref.current = { hubs, system, outCommand, mapRef };

  const open = useCallback(
    (ev: React.SyntheticEvent, systemId: string, route: (SolarSystemStaticInfoRaw | undefined)[]) => {
@@ -48,7 +48,7 @@ export const useContextMenuSystemInfoHandlers = ({ hubs, outCommand }: UseContex
  }, []);

  const onAddSystem = useCallback(() => {
-    const { system: solarSystemId, outCommand } = ref.current;
+    const { system: solarSystemId, outCommand, mapRef } = ref.current;
    if (!solarSystemId) {
      return;
    }
@@ -60,11 +60,7 @@ export const useContextMenuSystemInfoHandlers = ({ hubs, outCommand }: UseContex
      },
    });
    setTimeout(() => {
-      emitMapEvent({
-        name: Commands.centerSystem,
-        data: solarSystemId,
-      });
-
+      mapRef.current?.command(Commands.centerSystem, solarSystemId);
      setSystem(undefined);
    }, 200);
  }, []);
--- a/assets/js/hooks/Mapper/components/map/Map.tsx
+++ b/assets/js/hooks/Mapper/components/map/Map.tsx
@@ -1,17 +1,19 @@
-import { ForwardedRef, forwardRef, MouseEvent, useCallback, useEffect } from 'react';
+import { ForwardedRef, forwardRef, MouseEvent, useCallback, useEffect, useRef } from 'react';
 import ReactFlow, {
  Background,
  ConnectionMode,
  Edge,
  MiniMap,
  Node,
-  NodeChange,
  NodeDragHandler,
  OnConnect,
  OnMoveEnd,
  OnSelectionChangeFunc,
  SelectionDragHandler,
  SelectionMode,
+  useEdgesState,
+  useNodesState,
+  NodeChange,
  useReactFlow,
 } from 'reactflow';
 import 'reactflow/dist/style.css';
@@ -19,7 +21,8 @@ import classes from './Map.module.scss';
 import './styles/neon-theme.scss';
 import './styles/eve-common.scss';
 import { MapProvider, useMapState } from './MapProvider';
-import { useNodesState, useEdgesState, useMapHandlers, useUpdateNodes } from './hooks';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useMapHandlers, useUpdateNodes } from './hooks';
 import { MapHandlers, OutCommand, OutCommandHandler } from '@/hooks/Mapper/types/mapHandlers.ts';
 import {
  ContextMenuConnection,
@@ -34,6 +37,7 @@ import { SESSION_KEY } from '@/hooks/Mapper/constants.ts';
 import { SolarSystemConnection, SolarSystemRawType } from '@/hooks/Mapper/types';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';
 import { NodeSelectionMouseHandler } from '@/hooks/Mapper/components/contexts/types.ts';
+import { useDeleteSystems } from '@/hooks/Mapper/components/contexts/hooks';

 const DEFAULT_VIEW_PORT = { zoom: 1, x: 0, y: 0 };

@@ -89,14 +93,12 @@ interface MapCompProps {
  refn: ForwardedRef<MapHandlers>;
  onCommand: OutCommandHandler;
  onSelectionChange: OnMapSelectionChange;
-  onManualDelete(systems: string[]): void;
  onConnectionInfoClick?(e: SolarSystemConnection): void;
  onSelectionContextMenu?: NodeSelectionMouseHandler;
  minimapClasses?: string;
  isShowMinimap?: boolean;
  onSystemContextMenu: (event: MouseEvent<Element>, systemId: string) => void;
  showKSpaceBG?: boolean;
-  isThickConnections?: boolean;
 }

 const MapComp = ({
@@ -107,20 +109,26 @@ const MapComp = ({
  onSystemContextMenu,
  onConnectionInfoClick,
  onSelectionContextMenu,
-  onManualDelete,
  isShowMinimap,
  showKSpaceBG,
-  isThickConnections,
 }: MapCompProps) => {
  const { getNode } = useReactFlow();
-  const [nodes, , onNodesChange] = useNodesState<Node<SolarSystemRawType>>(initialNodes);
-  const [edges, , onEdgesChange] = useEdgesState<Edge<SolarSystemConnection>>(initialEdges);
+  const [nodes, , onNodesChange] = useNodesState<SolarSystemRawType>(initialNodes);
+  const [edges, , onEdgesChange] = useEdgesState<Edge<SolarSystemConnection>[]>(initialEdges);

  useMapHandlers(refn, onSelectionChange);
  useUpdateNodes(nodes);
  const { handleRootContext, ...rootCtxProps } = useContextMenuRootHandlers();
  const { handleConnectionContext, ...connectionCtxProps } = useContextMenuConnectionHandlers();
  const { update } = useMapState();
+  const {
+    data: { systems },
+  } = useMapRootState();
+
+  const { deleteSystems } = useDeleteSystems();
+
+  const systemsRef = useRef({ systems });
+  systemsRef.current = { systems };

  const onConnect: OnConnect = useCallback(
    params => {
@@ -178,41 +186,35 @@ const MapComp = ({
  const handleNodesChange = useCallback(
    (changes: NodeChange[]) => {
      const systemsIdsToRemove: string[] = [];
-
      const nextChanges = changes.reduce((acc, change) => {
-        if (change.type !== 'remove') {
-          return [...acc, change];
-        }
-
-        const node = getNode(change.id);
-        if (!node) {
-          return [...acc, change];
-        }
-
-        if (node.data.locked) {
+        if (change.type === 'remove') {
+          const node = getNode(change.id);
+          const { systems = [] } = systemsRef.current;
+          if (node?.data?.id && !systems.map(s => s.id).includes(node?.data?.id)) {
+            return [...acc, change];
+          } else if (!node?.data?.locked) {
+            systemsIdsToRemove.push(node?.data?.id);
+          }
          return acc;
        }
-
-        systemsIdsToRemove.push(node.data.id);
        return [...acc, change];
      }, [] as NodeChange[]);

-      if (systemsIdsToRemove.length > 0) {
-        onManualDelete(systemsIdsToRemove);
+      if (systemsIdsToRemove.length) {
+        deleteSystems(systemsIdsToRemove);
      }

      onNodesChange(nextChanges);
    },
-    [getNode, onManualDelete, onNodesChange],
+    [deleteSystems, getNode, onNodesChange],
  );

  useEffect(() => {
    update(x => ({
      ...x,
      showKSpaceBG: showKSpaceBG,
-      isThickConnections: isThickConnections,
    }));
-  }, [showKSpaceBG, isThickConnections, update]);
+  }, [showKSpaceBG, update]);

  return (
    <>
@@ -236,7 +238,6 @@ const MapComp = ({
          onConnectStart={() => update({ isConnecting: true })}
          onConnectEnd={() => update({ isConnecting: false })}
          onNodeMouseEnter={(_, node) => update({ hoverNodeId: node.id })}
-          // onKeyUp=
          onNodeMouseLeave={() => update({ hoverNodeId: null })}
          onEdgeClick={(_, t) => {
            onConnectionInfoClick?.(t.data);
--- a/assets/js/hooks/Mapper/components/map/MapProvider.tsx
+++ b/assets/js/hooks/Mapper/components/map/MapProvider.tsx
@@ -8,7 +8,6 @@ export type MapData = MapUnionTypes & {
  hoverNodeId: string | null;
  visibleNodes: Set<string>;
  showKSpaceBG: boolean;
-  isThickConnections: boolean;
 };

 interface MapProviderProps {
@@ -18,7 +17,6 @@ interface MapProviderProps {

 const INITIAL_DATA: MapData = {
  wormholesData: {},
-  wormholes: [],
  effects: {},
  characters: [],
  userCharacters: [],
@@ -31,7 +29,6 @@ const INITIAL_DATA: MapData = {
  hoverNodeId: null,
  visibleNodes: new Set(),
  showKSpaceBG: false,
-  isThickConnections: false,
 };

 export interface MapContextProps {
--- a/assets/js/hooks/Mapper/components/map/components/ContextMenuConnection/ContextMenuConnection.tsx
+++ b/assets/js/hooks/Mapper/components/map/components/ContextMenuConnection/ContextMenuConnection.tsx
@@ -3,7 +3,7 @@ import { ContextMenu } from 'primereact/contextmenu';
 import { PrimeIcons } from 'primereact/api';
 import { MenuItem } from 'primereact/menuitem';
 import { Edge } from '@reactflow/core/dist/esm/types/edges';
-import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
+import { MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
 import clsx from 'clsx';
 import classes from './ContextMenuConnection.module.scss';
 import { MASS_STATE_NAMES, MASS_STATE_NAMES_ORDER } from '@/hooks/Mapper/components/map/constants.ts';
@@ -35,49 +35,36 @@ export const ContextMenuConnection: React.FC<ContextMenuConnectionProps> = ({
    }

    const isFrigateSize = edge.data?.ship_size_type === ShipSizeStatus.small;
-    const isWormhole = edge.data?.type !== ConnectionType.gate;

    return [
-      ...(isWormhole
-        ? [
-            {
-              label: `EOL`,
-              className: clsx({
-                [classes.ConnectionTimeEOL]: edge.data?.time_status === TimeStatus.eol,
-              }),
-              icon: PrimeIcons.CLOCK,
-              command: onChangeTimeState,
-            },
-          ]
-        : []),
-      ...(isWormhole
-        ? [
-            {
-              label: `Frigate`,
-              className: clsx({
-                [classes.ConnectionFrigate]: isFrigateSize,
-              }),
-              icon: PrimeIcons.CLOUD,
-              command: () =>
-                onChangeShipSizeStatus(
-                  edge.data?.ship_size_type === ShipSizeStatus.small ? ShipSizeStatus.normal : ShipSizeStatus.small,
-                ),
-            },
-          ]
-        : []),
-      ...(isWormhole
-        ? [
-            {
-              label: `Save mass`,
-              className: clsx({
-                [classes.ConnectionSave]: edge.data?.locked,
-              }),
-              icon: PrimeIcons.LOCK,
-              command: () => onToggleMassSave(!edge.data?.locked),
-            },
-          ]
-        : []),
-      ...(isWormhole && !isFrigateSize
+      {
+        label: `EOL`,
+        className: clsx({
+          [classes.ConnectionTimeEOL]: edge.data?.time_status === TimeStatus.eol,
+        }),
+        icon: PrimeIcons.CLOCK,
+        command: onChangeTimeState,
+      },
+      {
+        label: `Frigate`,
+        className: clsx({
+          [classes.ConnectionFrigate]: isFrigateSize,
+        }),
+        icon: PrimeIcons.CLOUD,
+        command: () =>
+          onChangeShipSizeStatus(
+            edge.data?.ship_size_type === ShipSizeStatus.small ? ShipSizeStatus.normal : ShipSizeStatus.small,
+          ),
+      },
+      {
+        label: `Save mass`,
+        className: clsx({
+          [classes.ConnectionSave]: edge.data?.locked,
+        }),
+        icon: PrimeIcons.LOCK,
+        command: () => onToggleMassSave(!edge.data?.locked),
+      },
+      ...(!isFrigateSize
        ? [
            {
              label: `Mass status`,
--- a/assets/js/hooks/Mapper/components/map/components/ContextMenuConnection/useContextMenuConnectionHandlers.ts
+++ b/assets/js/hooks/Mapper/components/map/components/ContextMenuConnection/useContextMenuConnectionHandlers.ts
@@ -4,7 +4,7 @@ import { ContextMenu } from 'primereact/contextmenu';
 import { useMapState } from '../../MapProvider.tsx';
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { Edge } from '@reactflow/core/dist/esm/types/edges';
-import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
+import { MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';

 export const useContextMenuConnectionHandlers = () => {
@@ -47,23 +47,6 @@ export const useContextMenuConnectionHandlers = () => {
    setEdge(undefined);
  };

-  const onChangeType = useCallback((type: ConnectionType) => {
-    const { edge, outCommand } = ref.current;
-
-    if (!edge) {
-      return;
-    }
-
-    outCommand({
-      type: OutCommand.updateConnectionType,
-      data: {
-        source: edge.source,
-        target: edge.target,
-        value: type,
-      },
-    });
-  }, []);
-
  const onChangeMassState = useCallback((status: MassState) => {
    const { edge, outCommand } = ref.current;

@@ -135,7 +118,6 @@ export const useContextMenuConnectionHandlers = () => {
    contextMenuRef,
    onDeleteConnection,
    onChangeTimeState,
-    onChangeType,
    onChangeMassState,
    onChangeShipSizeStatus,
    onToggleMassSave,
--- a/assets/js/hooks/Mapper/components/map/components/SolarSystemEdge/SolarSystemEdge.module.scss
+++ b/assets/js/hooks/Mapper/components/map/components/SolarSystemEdge/SolarSystemEdge.module.scss
@@ -21,7 +21,7 @@
  }

  &.Frigate {
-    stroke: #d4f0ff;
+    stroke: #4e62c9;
  }

  &.Hovered {
@@ -37,16 +37,9 @@
    }

    &.Frigate {
-      stroke: #d4f0ff;
+      stroke: #41acd7;
    }
-  }

-  &.Tick {
-    stroke-width: 3px;
-
-    &.Hovered {
-      stroke-width: 3px;
-    }
  }
 }

@@ -68,14 +61,6 @@
      stroke: #ef7dce;
    }
  }
-
-  &.Tick {
-    stroke-width: 5px;
-
-    &.TimeCrit {
-      stroke-width: 6px;
-    }
-  }
 }

 .ClickPath {
@@ -108,14 +93,5 @@
  width: 5px;
  height: 5px;
  z-index: 1001;
-
-  &.Tick {
-    width: 7px;
-    height: 7px;
-
-    &.Right {
-      margin-left: 0px;
-    }
-  }
 }

--- a/assets/js/hooks/Mapper/components/map/components/SolarSystemEdge/SolarSystemEdge.tsx
+++ b/assets/js/hooks/Mapper/components/map/components/SolarSystemEdge/SolarSystemEdge.tsx
@@ -4,58 +4,36 @@ import classes from './SolarSystemEdge.module.scss';
 import { EdgeLabelRenderer, EdgeProps, getBezierPath, Position, useStore } from 'reactflow';
 import { getEdgeParams } from '@/hooks/Mapper/components/map/utils.ts';
 import clsx from 'clsx';
-import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
+import { MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
 import { PrimeIcons } from 'primereact/api';
 import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
-import { useMapState } from '@/hooks/Mapper/components/map/MapProvider.tsx';

 const MAP_TRANSLATES: Record<string, string> = {
-  [Position.Top]: 'translate(-48%, 0%)',
+  [Position.Top]: 'translate(-50%, 0%)',
  [Position.Bottom]: 'translate(-50%, -100%)',
  [Position.Left]: 'translate(0%, -50%)',
  [Position.Right]: 'translate(-100%, -50%)',
 };

-const MAP_OFFSETS_TICK: Record<string, { x: number; y: number }> = {
-  [Position.Top]: { x: 0, y: 3 },
-  [Position.Bottom]: { x: 0, y: -3 },
-  [Position.Left]: { x: 3, y: 0 },
-  [Position.Right]: { x: -3, y: 0 },
-};
-
-const MAP_OFFSETS: Record<string, { x: number; y: number }> = {
-  [Position.Top]: { x: 0, y: 0 },
-  [Position.Bottom]: { x: 0, y: 0 },
-  [Position.Left]: { x: 0, y: 0 },
-  [Position.Right]: { x: 0, y: 0 },
-};
-
 export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }: EdgeProps<SolarSystemConnection>) => {
  const sourceNode = useStore(useCallback(store => store.nodeInternals.get(source), [source]));
  const targetNode = useStore(useCallback(store => store.nodeInternals.get(target), [target]));
-  const isWormhole = data?.type !== ConnectionType.gate;
-
-  const {
-    data: { isThickConnections },
-  } = useMapState();

  const [hovered, setHovered] = useState(false);

  const [path, labelX, labelY, sx, sy, tx, ty, sourcePos, targetPos] = useMemo(() => {
    const { sx, sy, tx, ty, sourcePos, targetPos } = getEdgeParams(sourceNode, targetNode);

-    const offset = isThickConnections ? MAP_OFFSETS_TICK[targetPos] : MAP_OFFSETS[targetPos];
-
    const [edgePath, labelX, labelY] = getBezierPath({
-      sourceX: sx - offset.x,
-      sourceY: sy - offset.y,
+      sourceX: sx,
+      sourceY: sy,
      sourcePosition: sourcePos,
      targetPosition: targetPos,
-      targetX: tx + offset.x,
-      targetY: ty + offset.y,
+      targetX: tx,
+      targetY: ty,
    });
    return [edgePath, labelX, labelY, sx, sy, tx, ty, sourcePos, targetPos];
-  }, [isThickConnections, sourceNode, targetNode]);
+  }, [sourceNode, targetNode]);

  if (!sourceNode || !targetNode || !data) {
    return null;
@@ -66,8 +44,7 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:
      <path
        id={`back_${id}`}
        className={clsx(classes.EdgePathBack, {
-          [classes.Tick]: isThickConnections,
-          [classes.TimeCrit]: isWormhole && data.time_status === TimeStatus.eol,
+          [classes.TimeCrit]: data.time_status === TimeStatus.eol,
          [classes.Hovered]: hovered,
        })}
        d={path}
@@ -77,11 +54,10 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:
      <path
        id={`front_${id}`}
        className={clsx(classes.EdgePathFront, {
-          [classes.Tick]: isThickConnections,
          [classes.Hovered]: hovered,
-          [classes.MassVerge]: isWormhole && data.mass_status === MassState.verge,
-          [classes.MassHalf]: isWormhole && data.mass_status === MassState.half,
-          [classes.Frigate]: isWormhole && data.ship_size_type === ShipSizeStatus.small,
+          [classes.MassVerge]: data.mass_status === MassState.verge,
+          [classes.MassHalf]: data.mass_status === MassState.half,
+          [classes.Frigate]: data.ship_size_type === ShipSizeStatus.small,
        })}
        d={path}
        markerEnd={markerEnd}
@@ -99,19 +75,11 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:

      <EdgeLabelRenderer>
        <div
-          className={clsx(
-            classes.Handle,
-            { [classes.Tick]: isThickConnections, [classes.Right]: Position.Right === sourcePos },
-            'react-flow__handle absolute nodrag pointer-events-none',
-          )}
+          className={clsx(classes.Handle, 'react-flow__handle absolute nodrag pointer-events-none')}
          style={{ transform: `${MAP_TRANSLATES[sourcePos]} translate(${sx}px,${sy}px)` }}
        />
        <div
-          className={clsx(
-            classes.Handle,
-            { [classes.Tick]: isThickConnections },
-            'react-flow__handle absolute nodrag pointer-events-none',
-          )}
+          className={clsx(classes.Handle, 'react-flow__handle absolute nodrag pointer-events-none')}
          style={{ transform: `${MAP_TRANSLATES[targetPos]} translate(${tx}px,${ty}px)` }}
        />

@@ -121,7 +89,7 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:
            transform: `translate(-50%, -50%) translate(${labelX}px,${labelY}px)`,
          }}
        >
-          {isWormhole && data.locked && (
+          {data.locked && (
            <WdTooltipWrapper
              content="Save mass"
              className={clsx(
--- a/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.module.scss
+++ b/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.module.scss
@@ -212,14 +212,6 @@ $tooltip-bg: #202020; // Темный фон для подсказок
    color: #ffb01d;
  }

-  /* Firefox kostyl */
-  @-moz-document url-prefix() {
-    .classSystemName {
-      font-family: inherit !important;
-      font-weight: bold;
-    }
-  }
-
  .classSystemName {
    //font-weight: bold;
  }
@@ -270,13 +262,6 @@ $tooltip-bg: #202020; // Темный фон для подсказок
  & > * {
    line-height: 10px;
  }
-
-  /* Firefox kostyl */
-  @-moz-document url-prefix() {
-    position: relative;
-    top: -1px;
-  }
-
 }

 .Handlers {
@@ -314,25 +299,4 @@ $tooltip-bg: #202020; // Темный фон для подсказок
  &.HandleLeft {
    left: -2px;
  }
-
-  &.Tick {
-    width: 7px;
-    height: 7px;
-
-    &.HandleTop {
-      top: -3px;
-    }
-
-    &.HandleRight {
-      right: -3px;
-    }
-
-    &.HandleBottom {
-      bottom: -3px;
-    }
-
-    &.HandleLeft {
-      left: -3px;
-    }
-  }
 }
--- a/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.tsx
+++ b/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.tsx
@@ -79,7 +79,6 @@ export const SolarSystemNode = memo(({ data, selected }: WrapNodeProps<MapSolarS
      hoverNodeId,
      visibleNodes,
      showKSpaceBG,
-      isThickConnections,
    },
    outCommand,
  } = useMapState();
@@ -240,40 +239,28 @@ export const SolarSystemNode = memo(({ data, selected }: WrapNodeProps<MapSolarS
      <div onMouseDownCapture={dbClick} className={classes.Handlers}>
        <Handle
          type="source"
-          className={clsx(classes.Handle, classes.HandleTop, {
-            [classes.selected]: selected,
-            [classes.Tick]: isThickConnections,
-          })}
+          className={clsx(classes.Handle, classes.HandleTop, { [classes.selected]: selected })}
          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
          position={Position.Top}
          id="a"
        />
        <Handle
          type="source"
-          className={clsx(classes.Handle, classes.HandleRight, {
-            [classes.selected]: selected,
-            [classes.Tick]: isThickConnections,
-          })}
+          className={clsx(classes.Handle, classes.HandleRight, { [classes.selected]: selected })}
          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
          position={Position.Right}
          id="b"
        />
        <Handle
          type="source"
-          className={clsx(classes.Handle, classes.HandleBottom, {
-            [classes.selected]: selected,
-            [classes.Tick]: isThickConnections,
-          })}
+          className={clsx(classes.Handle, classes.HandleBottom, { [classes.selected]: selected })}
          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
          position={Position.Bottom}
          id="c"
        />
        <Handle
          type="source"
-          className={clsx(classes.Handle, classes.HandleLeft, {
-            [classes.selected]: selected,
-            [classes.Tick]: isThickConnections,
-          })}
+          className={clsx(classes.Handle, classes.HandleLeft, { [classes.selected]: selected })}
          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
          position={Position.Left}
          id="d"
--- a/assets/js/hooks/Mapper/components/map/constants.ts
+++ b/assets/js/hooks/Mapper/components/map/constants.ts
@@ -1,4 +1,4 @@
-import { ConnectionType, MassState } from '@/hooks/Mapper/types';
+import { MassState } from '@/hooks/Mapper/types';

 export enum SOLAR_SYSTEM_CLASS_IDS {
  ccp1 = -1,
@@ -712,13 +712,6 @@ export const STATUS_CLASSES: Record<number, string> = {
  [STATUSES.dangerous]: 'eve-system-status-dangerous',
 };

-export const TYPE_NAMES_ORDER = [ConnectionType.wormhole, ConnectionType.gate];
-
-export const TYPE_NAMES = {
-  [ConnectionType.wormhole]: 'Wormhole',
-  [ConnectionType.gate]: 'Gate',
-};
-
 export const MASS_STATE_NAMES_ORDER = [MassState.verge, MassState.half, MassState.normal];

 export const MASS_STATE_NAMES = {
--- a/assets/js/hooks/Mapper/components/map/hooks/api/useMapAddSystems.ts
+++ b/assets/js/hooks/Mapper/components/map/hooks/api/useMapAddSystems.ts
@@ -12,7 +12,6 @@ export const useMapAddSystems = () => {
  return useCallback((systems: CommandAddSystems) => {
    const { rf } = ref.current;
    const nodes = rf.getNodes();
-
    const prepared: Node[] = systems.filter(x => !nodes.some(y => x.id === y.id)).map(convertSystem2Node);
    rf.addNodes(prepared);
  }, []);
--- a/assets/js/hooks/Mapper/components/map/hooks/api/useMapRemoveSystems.ts
+++ b/assets/js/hooks/Mapper/components/map/hooks/api/useMapRemoveSystems.ts
@@ -5,21 +5,24 @@ import { OnMapSelectionChange } from '@/hooks/Mapper/components/map/map.types.ts

 export const useMapRemoveSystems = (onSelectionChange: OnMapSelectionChange) => {
  const rf = useReactFlow();
-  const ref = useRef({ onSelectionChange, rf });
-  ref.current = { onSelectionChange, rf };
+  const ref = useRef({ onSelectionChange });
+  ref.current = { onSelectionChange };

-  return useCallback((systems: CommandRemoveSystems) => {
-    ref.current.rf.deleteElements({ nodes: systems.map(x => ({ id: `${x}` })) });
+  return useCallback(
+    (systems: CommandRemoveSystems) => {
+      rf.deleteElements({ nodes: systems.map(x => ({ id: `${x}` })) });

-    const newSelection = ref.current.rf
-      .getNodes()
-      .filter(x => !systems.includes(parseInt(x.id)))
-      .filter(x => x.selected)
-      .map(x => x.id);
+      const newSelection = rf
+        .getNodes()
+        .filter(x => !systems.includes(parseInt(x.id)))
+        .filter(x => x.selected)
+        .map(x => x.id);

-    ref.current.onSelectionChange({
-      systems: newSelection,
-      connections: [],
-    });
-  }, []);
+      ref.current.onSelectionChange({
+        systems: newSelection,
+        connections: [],
+      });
+    },
+    [rf],
+  );
 };
--- a/assets/js/hooks/Mapper/components/map/hooks/index.ts
+++ b/assets/js/hooks/Mapper/components/map/hooks/index.ts
@@ -1,3 +1,2 @@
 export * from './useMapHandlers';
 export * from './useUpdateNodes';
-export * from './useNodesEdgesState';
--- a/assets/js/hooks/Mapper/components/map/hooks/useMapHandlers.ts
+++ b/assets/js/hooks/Mapper/components/map/hooks/useMapHandlers.ts
@@ -19,6 +19,8 @@ import {
  MapHandlers,
 } from '@/hooks/Mapper/types/mapHandlers.ts';

+import { useMapEventListener } from '@/hooks/Mapper/events';
+
 import {
  useCommandsCharacters,
  useCommandsConnections,
@@ -58,16 +60,13 @@ export const useMapHandlers = (ref: ForwardedRef<MapHandlers>, onSelectionChange
              mapInit(data as CommandInit);
              break;
            case Commands.addSystems:
-              setTimeout(() => mapAddSystems(data as CommandAddSystems), 100);
              break;
            case Commands.updateSystems:
              mapUpdateSystems(data as CommandUpdateSystems);
              break;
            case Commands.removeSystems:
-              setTimeout(() => removeSystems(data as CommandRemoveSystems), 100);
              break;
            case Commands.addConnections:
-              setTimeout(() => addConnections(data as CommandAddConnections), 100);
              break;
            case Commands.removeConnections:
              removeConnections(data as CommandRemoveConnections);
@@ -112,17 +111,13 @@ export const useMapHandlers = (ref: ForwardedRef<MapHandlers>, onSelectionChange
                  connections: [],
                });
                selectSystem(systemId as CommandSelectSystem);
-              }, 500);
+              }, 100);
              break;

            case Commands.routes:
              // do nothing here
              break;

-            case Commands.signaturesUpdated:
-              // do nothing here
-              break;
-
            case Commands.linkSignatureToSystem:
              // do nothing here
              break;
@@ -136,4 +131,20 @@ export const useMapHandlers = (ref: ForwardedRef<MapHandlers>, onSelectionChange
    },
    [],
  );
+
+  useMapEventListener(event => {
+    switch (event.name) {
+      case Commands.addConnections:
+        addConnections(event.data as CommandAddConnections);
+        break;
+      case Commands.addSystems:
+        mapAddSystems(event.data as CommandAddSystems);
+        break;
+      case Commands.removeSystems:
+        removeSystems(event.data as CommandRemoveSystems);
+        break;
+      default:
+        break;
+    }
+  });
 };
--- a/assets/js/hooks/Mapper/components/map/hooks/useNodesEdgesState.ts
+++ b/assets/js/hooks/Mapper/components/map/hooks/useNodesEdgesState.ts
@@ -1,36 +0,0 @@
-import { useState, useCallback, type Dispatch, type SetStateAction } from 'react';
-
-import { applyNodeChanges, applyEdgeChanges } from '../utils/changes';
-import { OnNodesChange, Edge, OnEdgesChange, Node } from 'reactflow';
-
-/**
- * Hook for managing the state of nodes - should only be used for prototyping / simple use cases.
- *
- * @public
- * @param initialNodes
- * @returns an array [nodes, setNodes, onNodesChange]
- */
-export function useNodesState<NodeType extends Node>(
-  initialNodes: NodeType[],
-): [NodeType[], Dispatch<SetStateAction<NodeType[]>>, OnNodesChange] {
-  const [nodes, setNodes] = useState(initialNodes);
-  const onNodesChange: OnNodesChange = useCallback(changes => setNodes(nds => applyNodeChanges(changes, nds)), []);
-
-  return [nodes, setNodes, onNodesChange];
-}
-
-/**
- * Hook for managing the state of edges - should only be used for prototyping / simple use cases.
- *
- * @public
- * @param initialEdges
- * @returns an array [edges, setEdges, onEdgesChange]
- */
-export function useEdgesState<EdgeType extends Edge = Edge>(
-  initialEdges: EdgeType[],
-): [EdgeType[], Dispatch<SetStateAction<EdgeType[]>>, OnEdgesChange] {
-  const [edges, setEdges] = useState(initialEdges);
-  const onEdgesChange: OnEdgesChange = useCallback(changes => setEdges(eds => applyEdgeChanges(changes, eds)), []);
-
-  return [edges, setEdges, onEdgesChange];
-}
--- a/assets/js/hooks/Mapper/components/map/utils/changes.ts
+++ b/assets/js/hooks/Mapper/components/map/utils/changes.ts
@@ -1,174 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { EdgeChange, NodeChange, Node, Edge } from 'reactflow';
-
-// This function applies changes to nodes or edges that are triggered by React Flow internally.
-// When you drag a node for example, React Flow will send a position change update.
-// This function then applies the changes and returns the updated elements.
-function applyChanges(changes: any[], elements: any[]): any[] {
-  // we need this hack to handle the setNodes and setEdges function of the useReactFlow hook for controlled flows
-  if (changes.some(c => c.type === 'reset')) {
-    return changes.filter(c => c.type === 'reset').map(c => c.item);
-  }
-
-  const updatedElements: any[] = [];
-  // By storing a map of changes for each element, we can a quick lookup as we
-  // iterate over the elements array!
-  const changesMap = new Map<any, any[]>();
-  const addItemChanges: any[] = [];
-
-  for (const change of changes) {
-    if (change.type === 'add') {
-      addItemChanges.push(change);
-      continue;
-    } else if (change.type === 'remove' || change.type === 'replace') {
-      // For a 'remove' change we can safely ignore any other changes queued for
-      // the same element, it's going to be removed anyway!
-      changesMap.set(change.id, [change]);
-    } else {
-      const elementChanges = changesMap.get(change.id);
-
-      if (elementChanges) {
-        // If we have some changes queued already, we can do a mutable update of
-        // that array and save ourselves some copying.
-        elementChanges.push(change);
-      } else {
-        changesMap.set(change.id, [change]);
-      }
-    }
-  }
-
-  for (const element of elements) {
-    const changes = changesMap.get(element.id);
-
-    // When there are no changes for an element we can just push it unmodified,
-    // no need to copy it.
-    if (!changes) {
-      updatedElements.push(element);
-      continue;
-    }
-
-    // If we have a 'remove' change queued, it'll be the only change in the array
-    if (changes[0].type === 'remove') {
-      continue;
-    }
-
-    if (changes[0].type === 'replace') {
-      updatedElements.push({ ...changes[0].item });
-      continue;
-    }
-
-    // For other types of changes, we want to start with a shallow copy of the
-    // object so React knows this element has changed. Sequential changes will
-    /// each _mutate_ this object, so there's only ever one copy.
-    const updatedElement = { ...element };
-
-    for (const change of changes) {
-      applyChange(change, updatedElement);
-    }
-
-    updatedElements.push(updatedElement);
-  }
-
-  // we need to wait for all changes to be applied before adding new items
-  // to be able to add them at the correct index
-  if (addItemChanges.length) {
-    addItemChanges.forEach(change => {
-      if (change.index !== undefined) {
-        updatedElements.splice(change.index, 0, { ...change.item });
-      } else {
-        updatedElements.push({ ...change.item });
-      }
-    });
-  }
-
-  return updatedElements;
-}
-
-// Applies a single change to an element. This is a *mutable* update.
-function applyChange(change: any, element: any): any {
-  switch (change.type) {
-    case 'select': {
-      element.selected = change.selected;
-      break;
-    }
-
-    case 'position': {
-      if (typeof change.position !== 'undefined') {
-        element.position = change.position;
-      }
-
-      if (typeof change.dragging !== 'undefined') {
-        element.dragging = change.dragging;
-      }
-
-      break;
-    }
-
-    case 'dimensions': {
-      if (typeof change.dimensions !== 'undefined') {
-        element.measured ??= {};
-        element.measured.width = change.dimensions.width;
-        element.measured.height = change.dimensions.height;
-
-        if (change.setAttributes) {
-          element.width = change.dimensions.width;
-          element.height = change.dimensions.height;
-        }
-      }
-
-      if (typeof change.resizing === 'boolean') {
-        element.resizing = change.resizing;
-      }
-
-      break;
-    }
-  }
-}
-
-/**
- * Drop in function that applies node changes to an array of nodes.
- * @public
- * @remarks Various events on the <ReactFlow /> component can produce an {@link NodeChange} that describes how to update the edges of your flow in some way.
- If you don't need any custom behaviour, this util can be used to take an array of these changes and apply them to your edges.
- * @param changes - Array of changes to apply
- * @param nodes - Array of nodes to apply the changes to
- * @returns Array of updated nodes
- * @example
- *  const onNodesChange = useCallback(
-      (changes) => {
-        setNodes((oldNodes) => applyNodeChanges(changes, oldNodes));
-      },
-      [setNodes],
-    );
-
-    return (
-      <ReactFLow nodes={nodes} edges={edges} onNodesChange={onNodesChange} />
-    );
- */
-export function applyNodeChanges<NodeType extends Node = Node>(changes: NodeChange[], nodes: NodeType[]): NodeType[] {
-  return applyChanges(changes, nodes) as NodeType[];
-}
-
-/**
- * Drop in function that applies edge changes to an array of edges.
- * @public
- * @remarks Various events on the <ReactFlow /> component can produce an {@link EdgeChange} that describes how to update the edges of your flow in some way.
- If you don't need any custom behaviour, this util can be used to take an array of these changes and apply them to your edges.
- * @param changes - Array of changes to apply
- * @param edges - Array of edge to apply the changes to
- * @returns Array of updated edges
- * @example
- *  const onEdgesChange = useCallback(
-      (changes) => {
-        setEdges((oldEdges) => applyEdgeChanges(changes, oldEdges));
-      },
-      [setEdges],
-    );
-
-    return (
-      <ReactFlow nodes={nodes} edges={edges} onEdgesChange={onEdgesChange} />
-    );
- */
-export function applyEdgeChanges<EdgeType extends Edge = Edge>(changes: EdgeChange[], edges: EdgeType[]): EdgeType[] {
-  return applyChanges(changes, edges) as EdgeType[];
-}
--- a/assets/js/hooks/Mapper/components/mapInterface/MapInterface.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/MapInterface.tsx
@@ -48,7 +48,6 @@ const restoreWindowsFromLS = (): WidgetGridItem[] => {
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
  const raw = localStorage.getItem(SESSION_KEY.windows);
  if (!raw) {
-    console.warn('No windows found in local storage!!');
    return DEFAULT_WINDOWS;
  }

@@ -64,7 +63,7 @@ const restoreWindowsFromLS = (): WidgetGridItem[] => {
 };

 export const MapInterface = () => {
-  const [items, setItems] = useState<WidgetGridItem[]>(restoreWindowsFromLS);
+  const [items, setItems] = useState<WidgetGridItem[]>(restoreWindowsFromLS());

  return (
    <WidgetsGrid
--- a/assets/js/hooks/Mapper/components/mapInterface/components/SystemLinkSignatureDialog/SystemLinkSignatureDialog.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/components/SystemLinkSignatureDialog/SystemLinkSignatureDialog.tsx
@@ -10,17 +10,13 @@ import {
  Setting,
  COSMIC_SIGNATURE,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog';
-import { SignatureGroup } from '@/hooks/Mapper/types';

 interface SystemLinkSignatureDialogProps {
  data: CommandLinkSignatureToSystem;
  setVisible: (visible: boolean) => void;
 }

-const signatureSettings: Setting[] = [
-  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true },
-  { key: SignatureGroup.Wormhole, name: 'Wormhole', value: true },
-];
+const signatureSettings: Setting[] = [{ key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true }];

 export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignatureDialogProps) => {
  const { outCommand } = useMapRootState();
@@ -63,7 +59,6 @@ export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignat
    >
      <SystemSignaturesContent
        systemId={`${data.solar_system_source}`}
-        hideLinkedSignatures
        settings={signatureSettings}
        onSelect={handleSelect}
        selectable={true}
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesList/RoutesList.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesList/RoutesList.tsx
@@ -5,7 +5,7 @@ import { SystemViewStandalone, WdTooltip, WdTooltipHandlers } from '@/hooks/Mapp
 import { getBackgroundClass, getShapeClass } from '@/hooks/Mapper/components/map/helpers';
 import { MouseEvent, useCallback, useRef, useState } from 'react';
 import { Commands } from '@/hooks/Mapper/types';
-import { emitMapEvent } from '@/hooks/Mapper/events';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';

 export type RouteSystemProps = {
  destination: number;
@@ -88,10 +88,11 @@ export interface RoutesListProps {

 export const RoutesList = ({ data, onContextMenu }: RoutesListProps) => {
  const [selected, setSelected] = useState<number | null>(null);
+  const { mapRef } = useMapRootState();

  const handleClick = useCallback(
-    (systemId: number) => emitMapEvent({ name: Commands.centerSystem, data: systemId?.toString() }),
-    [],
+    (systemId: number) => mapRef.current?.command(Commands.centerSystem, systemId.toString()),
+    [mapRef],
  );

  if (!data.has_connection) {
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesWidget.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesWidget.tsx
@@ -30,6 +30,7 @@ const sortByDist = (a: Route, b: Route) => {
 export const RoutesWidgetContent = () => {
  const {
    data: { selectedSystems, hubs = [], systems, routes },
+    mapRef,
    outCommand,
  } = useMapRootState();

@@ -41,6 +42,7 @@ export const RoutesWidgetContent = () => {
  const { open, ...systemCtxProps } = useContextMenuSystemInfoHandlers({
    outCommand,
    hubs,
+    mapRef,
  });

  const preparedHubs = useMemo(() => {
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog/SystemSignatureSettingsDialog.module.scss
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog/SystemSignatureSettingsDialog.module.scss
@@ -1,79 +0,0 @@
-.verticalTabsContainer {
-  display: flex;
-  width: 100%;
-  min-height: 300px;
-
-  :global {
-    .p-tabview {
-      width: 100%;
-      display: flex;
-      align-items: flex-start;
-    }
-
-    .p-tabview-panels {
-      padding: 6px 1rem !important;
-      flex-grow: 1;
-    }
-
-    .p-tabview-nav-container {
-      border-right: none;
-      height: 100%;
-    }
-
-    .p-tabview-nav {
-      flex-direction: column;
-      width: 150px;
-      min-height: 100%;
-      border: none;
-
-      li {
-        width: 100%;
-        border-right: 4px solid var(--surface-hover);
-        background-color: var(--surface-card);
-
-        transition:
-          background-color 200ms,
-          border-right-color 200ms;
-
-        &:hover {
-          background-color: var(--surface-hover);
-          border-right: 4px solid var(--surface-100);
-        }
-
-        .p-tabview-nav-link {
-          transition: color 200ms;
-
-          justify-content: flex-end;
-          padding: 10px;
-          //background-color: var(--surface-card);
-          background-color: initial;
-          border: none;
-          color: var(--gray-400);
-
-          border-radius: initial;
-          font-weight: 400;
-          margin: 0;
-        }
-
-        &.p-tabview-selected {
-          background-color: var(--surface-50);
-          border-right: 4px solid var(--primary-color);
-
-          .p-tabview-nav-link {
-            font-weight: 600;
-            color: var(--primary-color);
-          }
-
-          &:hover {
-            //background-color: var(--surface-hover);
-            border-right: 4px solid var(--primary-color);
-          }
-        }
-      }
-    }
-
-    .p-tabview-panel {
-      flex-grow: 1;
-    }
-  }
-}
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog/SystemSignatureSettingsDialog.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog/SystemSignatureSettingsDialog.tsx
@@ -2,10 +2,8 @@ import { Dialog } from 'primereact/dialog';
 import { useCallback, useState } from 'react';
 import { Button } from 'primereact/button';
 import { Checkbox } from 'primereact/checkbox';
-import { TabPanel, TabView } from 'primereact/tabview';
-import styles from './SystemSignatureSettingsDialog.module.scss';

-export type Setting = { key: string; name: string; value: boolean; isFilter?: boolean };
+export type Setting = { key: string; name: string; value: boolean };

 export const COSMIC_SIGNATURE = 'Cosmic Signature';
 export const COSMIC_ANOMALY = 'Cosmic Anomaly';
@@ -26,12 +24,8 @@ export const SystemSignatureSettingsDialog = ({
  onSave,
  onCancel,
 }: SystemSignatureSettingsDialogProps) => {
-  const [activeIndex, setActiveIndex] = useState(0);
  const [settings, setSettings] = useState<Setting[]>(defaultSettings);

-  const filterSettings = settings.filter(setting => setting.isFilter);
-  const userSettings = settings.filter(setting => !setting.isFilter);
-
  const handleSettingsChange = (key: string) => {
    setSettings(prevState => prevState.map(item => (item.key === key ? { ...item, value: !item.value } : item)));
  };
@@ -41,53 +35,23 @@ export const SystemSignatureSettingsDialog = ({
  }, [onSave, settings]);

  return (
-    <Dialog header="System Signatures Settings" visible={true} onHide={onCancel} className="w-full max-w-lg">
+    <Dialog header="Filter signatures" visible draggable={false} style={{ width: '300px' }} onHide={onCancel}>
      <div className="flex flex-col gap-3">
        <div className="flex flex-col gap-2">
-          <div className={styles.verticalTabsContainer}>
-            <TabView
-              activeIndex={activeIndex}
-              onTabChange={e => setActiveIndex(e.index)}
-              className={styles.verticalTabView}
-            >
-              <TabPanel header="Filters" headerClassName={styles.verticalTabHeader}>
-                <div className="w-full h-full flex flex-col gap-1">
-                  {filterSettings.map(setting => {
-                    return (
-                      <div key={setting.key} className="flex items-center">
-                        <Checkbox
-                          inputId={setting.key}
-                          checked={setting.value}
-                          onChange={() => handleSettingsChange(setting.key)}
-                        />
-                        <label htmlFor={setting.key} className="ml-2">
-                          {setting.name}
-                        </label>
-                      </div>
-                    );
-                  })}
-                </div>
-              </TabPanel>
-              <TabPanel header="User Interface" headerClassName={styles.verticalTabHeader}>
-                <div className="w-full h-full flex flex-col gap-1">
-                  {userSettings.map(setting => {
-                    return (
-                      <div key={setting.key} className="flex items-center">
-                        <Checkbox
-                          inputId={setting.key}
-                          checked={setting.value}
-                          onChange={() => handleSettingsChange(setting.key)}
-                        />
-                        <label htmlFor={setting.key} className="ml-2">
-                          {setting.name}
-                        </label>
-                      </div>
-                    );
-                  })}
-                </div>
-              </TabPanel>
-            </TabView>
-          </div>
+          {settings.map(setting => {
+            return (
+              <div key={setting.key} className="flex items-center">
+                <Checkbox
+                  inputId={setting.key}
+                  checked={setting.value}
+                  onChange={() => handleSettingsChange(setting.key)}
+                />
+                <label htmlFor={setting.key} className="ml-2">
+                  {setting.name}
+                </label>
+              </div>
+            );
+          })}
        </div>

        <div className="flex gap-2 justify-end">
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatures.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatures.tsx
@@ -12,7 +12,6 @@ import {
  SHIP,
  DRONE,
 } from './SystemSignatureSettingsDialog';
-import { SignatureGroup } from '@/hooks/Mapper/types';

 import React, { useCallback, useEffect, useState } from 'react';

@@ -20,28 +19,18 @@ import { PrimeIcons } from 'primereact/api';

 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';

-const SIGNATURE_SETTINGS_KEY = 'wanderer_system_signature_settings_v4_1';
-export const SHOW_DESCRIPTION_COLUMN_SETTING = 'show_description_column_setting';
-export const SHOW_INSERTED_COLUMN_SETTING = 'show_inserted_column_setting';
-
 const settings: Setting[] = [
-  { key: SHOW_INSERTED_COLUMN_SETTING, name: 'Show Inserted Column', value: false, isFilter: false },
-  { key: SHOW_DESCRIPTION_COLUMN_SETTING, name: 'Show Description Column', value: false, isFilter: false },
-  { key: COSMIC_ANOMALY, name: 'Show Anomalies', value: true, isFilter: true },
-  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true, isFilter: true },
-  { key: DEPLOYABLE, name: 'Show Deployables', value: true, isFilter: true },
-  { key: STRUCTURE, name: 'Show Structures', value: true, isFilter: true },
-  { key: STARBASE, name: 'Show Starbase', value: true, isFilter: true },
-  { key: SHIP, name: 'Show Ships', value: true, isFilter: true },
-  { key: DRONE, name: 'Show Drones And Charges', value: true, isFilter: true },
-  { key: SignatureGroup.Wormhole, name: 'Show Wormholes', value: true, isFilter: true },
-  { key: SignatureGroup.RelicSite, name: 'Show Relic Sites', value: true, isFilter: true },
-  { key: SignatureGroup.DataSite, name: 'Show Data Sites', value: true, isFilter: true },
-  { key: SignatureGroup.OreSite, name: 'Show Ore Sites', value: true, isFilter: true },
-  { key: SignatureGroup.GasSite, name: 'Show Gas Sites', value: true, isFilter: true },
-  { key: SignatureGroup.CombatSite, name: 'Show Combat Sites', value: true, isFilter: true },
+  { key: COSMIC_ANOMALY, name: 'Show Anomalies', value: true },
+  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true },
+  { key: DEPLOYABLE, name: 'Show Deployables', value: true },
+  { key: STRUCTURE, name: 'Show Structures', value: true },
+  { key: STARBASE, name: 'Show Starbase', value: true },
+  { key: SHIP, name: 'Show Ships', value: true },
+  { key: DRONE, name: 'Show Drones And Charges', value: true },
 ];

+const SIGNATURE_SETTINGS_KEY = 'wanderer_system_signature_settings';
+
 const defaultSettings = () => {
  return [...settings];
 };
@@ -102,7 +91,8 @@ export const SystemSignatures = () => {
                    </InfoDrawer>
                    <InfoDrawer title={<b className="text-slate-50">How to delete?</b>}>
                      For delete any signature first of all you need select before
-                      <br /> and then use <b className="text-sky-500">Backspace</b>
+                      <br /> and then use <b className="text-sky-500">Del</b> or{' '}
+                      <b className="text-sky-500">Backspace</b>
                    </InfoDrawer>
                  </div>
                ) as React.ReactNode,
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx
@@ -3,7 +3,6 @@ import { useClipboard } from '@/hooks/Mapper/hooks/useClipboard';
 import { parseSignatures } from '@/hooks/Mapper/helpers';
 import { Commands, OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { WdTooltip, WdTooltipHandlers } from '@/hooks/Mapper/components/ui-kit';
-import { GROUPS_LIST } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';

 import { DataTable, DataTableRowClickEvent, DataTableRowMouseEvent, SortOrder } from 'primereact/datatable';
 import { Column } from 'primereact/column';
@@ -22,22 +21,16 @@ import {
  getRowColorByTimeLeft,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers';
 import {
-  renderDescription,
  renderIcon,
  renderInfoColumn,
-  renderInsertedTimeLeft,
-  renderUpdatedTimeLeft,
+  renderTimeLeft,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders';
 import useLocalStorageState from 'use-local-storage-state';
 import { PrimeIcons } from 'primereact/api';
 import { SignatureSettings } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings';
 import { useMapEventListener } from '@/hooks/Mapper/events';
 import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
-import { COSMIC_SIGNATURE } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog';
-import {
-  SHOW_DESCRIPTION_COLUMN_SETTING,
-  SHOW_INSERTED_COLUMN_SETTING,
-} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures';
+
 type SystemSignaturesSortSettings = {
  sortField: string;
  sortOrder: SortOrder;
@@ -51,17 +44,10 @@ const SORT_DEFAULT_VALUES: SystemSignaturesSortSettings = {
 interface SystemSignaturesContentProps {
  systemId: string;
  settings: Setting[];
-  hideLinkedSignatures?: boolean;
  selectable?: boolean;
  onSelect?: (signature: SystemSignature) => void;
 }
-export const SystemSignaturesContent = ({
-  systemId,
-  settings,
-  hideLinkedSignatures,
-  selectable,
-  onSelect,
-}: SystemSignaturesContentProps) => {
+export const SystemSignaturesContent = ({ systemId, settings, selectable, onSelect }: SystemSignaturesContentProps) => {
  const { outCommand } = useMapRootState();

  const [signatures, setSignatures, signaturesRef] = useRefState<SystemSignature[]>([]);
@@ -94,41 +80,13 @@ export const SystemSignaturesContent = ({
    }
  }, []);

-  const groupSettings = useMemo(() => settings.filter(s => (GROUPS_LIST as string[]).includes(s.key)), [settings]);
-  const showDescriptionColumn = useMemo(
-    () => settings.find(s => s.key === SHOW_DESCRIPTION_COLUMN_SETTING)?.value,
-    [settings],
-  );
-
-  const showInsertedColumn = useMemo(
-    () => settings.find(s => s.key === SHOW_INSERTED_COLUMN_SETTING)?.value,
-    [settings],
-  );
-
  const filteredSignatures = useMemo(() => {
    return signatures
-      .filter(x => {
-        if (hideLinkedSignatures && !!x.linked_system) {
-          return false;
-        }
-
-        const isCosmicSignature = x.kind === COSMIC_SIGNATURE;
-
-        if (isCosmicSignature) {
-          const showCosmicSignatures = settings.find(y => y.key === COSMIC_SIGNATURE)?.value;
-          if (showCosmicSignatures) {
-            return !x.group || groupSettings.find(y => y.key === x.group)?.value;
-          } else {
-            return !!x.group && groupSettings.find(y => y.key === x.group)?.value;
-          }
-        }
-
-        return settings.find(y => y.key === x.kind)?.value;
-      })
+      .filter(x => settings.find(y => y.key === x.kind)?.value)
      .sort((a, b) => {
        return new Date(b.updated_at || 0).getTime() - new Date(a.updated_at || 0).getTime();
      });
-  }, [signatures, settings, groupSettings, hideLinkedSignatures]);
+  }, [signatures, settings]);

  const handleGetSignatures = useCallback(async () => {
    const { signatures } = await outCommand({
@@ -140,6 +98,26 @@ export const SystemSignaturesContent = ({
    setSignatures(signatures);
  }, [outCommand, systemId]);

+  // const updateSignatures = useCallback(
+  //   async (newSignatures: SystemSignature[], updateOnly: boolean) => {
+  //     const { added, updated, removed } = getActualSigs(signaturesRef.current, newSignatures, updateOnly);
+
+  //     const { signatures: updatedSignatures } = await outCommand({
+  //       type: OutCommand.updateSignatures,
+  //       data: {
+  //         system_id: systemId,
+  //         added,
+  //         updated,
+  //         removed,
+  //       },
+  //     });
+
+  //     setSignatures(() => updatedSignatures);
+  //     setSelectedSignatures([]);
+  //   },
+  //   [outCommand, systemId],
+  // );
+
  const handleUpdateSignatures = useCallback(
    async (newSignatures: SystemSignature[], updateOnly: boolean) => {
      const { added, updated, removed } = getActualSigs(signaturesRef.current, newSignatures, updateOnly);
@@ -203,7 +181,7 @@ export const SystemSignaturesContent = ({

  useHotkey(true, ['a'], handleSelectAll);

-  useHotkey(false, ['Backspace'], handleDeleteSelected);
+  useHotkey(false, ['Backspace', 'Delete'], handleDeleteSelected);

  useEffect(() => {
    if (selectable) {
@@ -367,46 +345,22 @@ export const SystemSignaturesContent = ({
                style={{ maxWidth: nameColumnWidth }}
                hidden={compact || medium}
              ></Column>
-              {showDescriptionColumn && (
-                <Column
-                  field="description"
-                  header="Description"
-                  bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
-                  body={renderDescription}
-                  hidden={compact}
-                  sortable
-                ></Column>
-              )}
-
-              {showInsertedColumn && (
-                <Column
-                  field="inserted_at"
-                  header="Inserted"
-                  dataType="date"
-                  bodyClassName="w-[70px] text-ellipsis overflow-hidden whitespace-nowrap"
-                  body={renderInsertedTimeLeft}
-                  sortable
-                ></Column>
-              )}
-
              <Column
                field="updated_at"
                header="Updated"
                dataType="date"
                bodyClassName="w-[70px] text-ellipsis overflow-hidden whitespace-nowrap"
-                body={renderUpdatedTimeLeft}
+                body={renderTimeLeft}
                sortable
              ></Column>

-              {!selectable && (
-                <Column
-                  bodyClassName="p-0 pl-1 pr-2"
-                  field="group"
-                  body={renderToolbar}
-                  // headerClassName={headerClasses}
-                  style={{ maxWidth: 26, minWidth: 26, width: 26 }}
-                ></Column>
-              )}
+              <Column
+                bodyClassName="p-0 pl-1 pr-2"
+                field="group"
+                body={renderToolbar}
+                // headerClassName={headerClasses}
+                style={{ maxWidth: 26, minWidth: 26, width: 26 }}
+              ></Column>
            </DataTable>
          </>
        )}
@@ -416,14 +370,12 @@ export const SystemSignaturesContent = ({
          content={hoveredSig ? <SignatureView {...hoveredSig} /> : null}
        />

-        {showSignatureSettings && (
-          <SignatureSettings
-            systemId={systemId}
-            show
-            onHide={() => setShowSignatureSettings(false)}
-            signatureData={selectedSignature}
-          />
-        )}
+        <SignatureSettings
+          systemId={systemId}
+          show={showSignatureSettings}
+          onHide={() => setShowSignatureSettings(false)}
+          signatureData={selectedSignature}
+        />

        {askUser && (
          <div className="absolute left-[1px] top-[29px] h-[calc(100%-30px)] w-[calc(100%-3px)] bg-stone-900/10 backdrop-blur-sm">
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers/getActualSigs.ts
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers/getActualSigs.ts
@@ -19,8 +19,6 @@ export const getActualSigs = (
      const isNeedUpgrade = getState(GROUPS_LIST, newSig) > getState(GROUPS_LIST, oldSig);
      if (isNeedUpgrade) {
        updated.push({ ...oldSig, group: newSig.group, name: newSig.name });
-      } else {
-        updated.push({ ...oldSig });
      }
    } else {
      if (!updateOnly) {
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/index.ts
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/index.ts
@@ -1,7 +1,5 @@
 export * from './renderIcon';
-export * from './renderDescription';
 export * from './renderName';
-export * from './renderInsertedTimeLeft';
-export * from './renderUpdatedTimeLeft';
+export * from './renderTimeLeft';
 export * from './renderLinkedSystem';
 export * from './renderInfoColumn';
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderDescription.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderDescription.tsx
@@ -1,5 +0,0 @@
-import { SystemSignature } from '@/hooks/Mapper/types';
-
-export const renderDescription = (row: SystemSignature) => {
-  return <span title={row?.description}>{row?.description}</span>;
-};
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderInfoColumn.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderInfoColumn.tsx
@@ -1,9 +1,5 @@
-import { PrimeIcons } from 'primereact/api';
 import { SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
 import { SystemViewStandalone, WHClassView } from '@/hooks/Mapper/components/ui-kit';
-
-import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
-
 import clsx from 'clsx';
 import { renderName } from './renderName.tsx';
 import classes from './renderInfoColumn.module.scss';
@@ -36,23 +32,13 @@ export const renderInfoColumn = (row: SystemSignature) => {
            </span>
          </>
        )}
-        {row.description && (
-          <WdTooltipWrapper content={row.description}>
-            <span className={clsx(PrimeIcons.EXCLAMATION_CIRCLE, 'text-[12px]')}></span>
-          </WdTooltipWrapper>
-        )}
      </div>
    );
  }

-  return (
-    <div className="flex gap-1 items-center">
-      {renderName(row)}{' '}
-      {row.description && (
-        <WdTooltipWrapper content={row.description}>
-          <span className={clsx(PrimeIcons.EXCLAMATION_CIRCLE, 'text-[12px]')}></span>
-        </WdTooltipWrapper>
-      )}
-    </div>
-  );
+  if (row.description != null && row.description.length > 0) {
+    return <span title={row.description}>{row.description}</span>;
+  }
+
+  return renderName(row);
 };
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderInsertedTimeLeft.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderInsertedTimeLeft.tsx
@@ -1,10 +0,0 @@
-import { SystemSignature } from '@/hooks/Mapper/types';
-import { TimeLeft } from '@/hooks/Mapper/components/ui-kit';
-
-export const renderInsertedTimeLeft = (row: SystemSignature) => {
-  return (
-    <div className="flex w-full items-center">
-      <TimeLeft cDate={row.inserted_at ? new Date(row.inserted_at) : undefined} />
-    </div>
-  );
-};
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderUpdatedTimeLeft.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderUpdatedTimeLeft.tsx
@@ -1,7 +1,7 @@
 import { SystemSignature } from '@/hooks/Mapper/types';
 import { TimeLeft } from '@/hooks/Mapper/components/ui-kit';

-export const renderUpdatedTimeLeft = (row: SystemSignature) => {
+export const renderTimeLeft = (row: SystemSignature) => {
  return (
    <div className="flex w-full items-center">
      <TimeLeft cDate={row.updated_at ? new Date(row.updated_at) : undefined} />
--- a/assets/js/hooks/Mapper/components/mapRootContent/MapRootContent.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/MapRootContent.tsx
@@ -7,13 +7,13 @@ import { useCallback, useState } from 'react';
 import { OnTheMap, RightBar } from '@/hooks/Mapper/components/mapRootContent/components';
 import { MapContextMenu } from '@/hooks/Mapper/components/mapRootContent/components/MapContextMenu/MapContextMenu.tsx';
 import { useSkipContextMenu } from '@/hooks/Mapper/hooks/useSkipContextMenu';
-import { MapSettings } from '@/hooks/Mapper/components/mapRootContent/components/MapSettings';
+import { MapSettings } from "@/hooks/Mapper/components/mapRootContent/components/MapSettings";

 export interface MapRootContentProps {}

 // eslint-disable-next-line no-empty-pattern
 export const MapRootContent = ({}: MapRootContentProps) => {
-  const { interfaceSettings } = useMapRootState();
+  const { mapRef, interfaceSettings } = useMapRootState();
  const { isShowMenu } = interfaceSettings;

  const [showOnTheMap, setShowOnTheMap] = useState(false);
@@ -26,7 +26,7 @@ export const MapRootContent = ({}: MapRootContentProps) => {
  useSkipContextMenu();

  return (
-    <Layout map={<MapWrapper />}>
+    <Layout map={<MapWrapper refn={mapRef} />}>
      {!isShowMenu ? (
        <div className="absolute top-0 left-14 w-[calc(100%-3.5rem)] h-[calc(100%-3.5rem)] pointer-events-none">
          <div className="absolute top-0 left-0 w-[calc(100%-3.5rem)] h-full pointer-events-none">
--- a/assets/js/hooks/Mapper/components/mapRootContent/components/Connections/Connections.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/components/Connections/Connections.tsx
@@ -1,22 +1,13 @@
 import classes from './Connections.module.scss';
 import { Sidebar } from 'primereact/sidebar';
-import { useEffect, useMemo, useState, useCallback } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { VirtualScroller, VirtualScrollerTemplateOptions } from 'primereact/virtualscroller';
 import clsx from 'clsx';
-import {
-  ConnectionType,
-  ConnectionOutput,
-  ConnectionInfoOutput,
-  OutCommand,
-  Passage,
-  SolarSystemConnection,
-} from '@/hooks/Mapper/types';
-
+import { ConnectionOutput, OutCommand, Passage, SolarSystemConnection } from '@/hooks/Mapper/types';
 import { PassageCard } from './PassageCard';
 import { InfoDrawer, SystemView } from '@/hooks/Mapper/components/ui-kit';
 import { kgToTons } from '@/hooks/Mapper/utils/kgToTons.ts';
-import { TimeAgo } from '@/hooks/Mapper/components/ui-kit';

 const sortByDate = (a: string, b: string) => new Date(a).getTime() - new Date(b).getTime();

@@ -77,49 +68,26 @@ export const Connections = ({ selectedConnection, onHide }: OnTheMapProps) => {
    return connections.find(x => x.source === selectedConnection.source && x.target === selectedConnection.target);
  }, [connections, selectedConnection]);

-  const isWormhole = useMemo(() => {
-    return cnInfo?.type !== ConnectionType.gate;
-  }, [cnInfo]);
-
  const [passages, setPassages] = useState<Passage[]>([]);
-  const [info, setInfo] = useState<ConnectionInfoOutput>(null);
-
-  const loadInfo = useCallback(
-    async (connection: SolarSystemConnection) => {
-      const result = await outCommand<ConnectionInfoOutput>({
-        type: OutCommand.getConnectionInfo,
-        data: {
-          from: connection.source,
-          to: connection.target,
-        },
-      });
-
-      setInfo(result);
-    },
-    [outCommand],
-  );
-
-  const loadPassages = useCallback(
-    async (connection: SolarSystemConnection) => {
-      const result = await outCommand<ConnectionOutput>({
-        type: OutCommand.getPassages,
-        data: {
-          from: connection.source,
-          to: connection.target,
-        },
-      });
-
-      setPassages(result.passages.sort((a, b) => sortByDate(b.inserted_at, a.inserted_at)));
-    },
-    [outCommand],
-  );

  useEffect(() => {
    if (!selectedConnection) {
      return;
    }
-    loadInfo(selectedConnection);
-    loadPassages(selectedConnection);
+
+    const loadInfo = async () => {
+      const result = await outCommand<ConnectionOutput>({
+        type: OutCommand.getPassages,
+        data: {
+          from: selectedConnection.source,
+          to: selectedConnection.target,
+        },
+      });
+
+      setPassages(result.passages.sort((a, b) => sortByDate(b.inserted_at, a.inserted_at)));
+    };
+
+    loadInfo();
  }, [selectedConnection]);

  const approximateMass = useMemo(() => {
@@ -160,17 +128,9 @@ export const Connections = ({ selectedConnection, onHide }: OnTheMapProps) => {
          </InfoDrawer>

          {/* Connection Info Row */}
-          {isWormhole && (
-            <>
-              <InfoDrawer title="Approximate mass of passages" rightSide>
-                {kgToTons(approximateMass)}
-              </InfoDrawer>
-
-              <InfoDrawer title="Mark EOL Time" rightSide>
-                {info?.marl_eol_time ? <TimeAgo timestamp={info.marl_eol_time} /> : ' unknown '}
-              </InfoDrawer>
-            </>
-          )}
+          <InfoDrawer title="Approximate mass of passages" rightSide>
+            {kgToTons(approximateMass)}
+          </InfoDrawer>

          <div className="flex gap-2"></div>
        </div>
--- a/assets/js/hooks/Mapper/components/mapRootContent/components/MapSettings/MapSettings.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/components/MapSettings/MapSettings.tsx
@@ -61,7 +61,6 @@ const CONNECTIONS_CHECKBOXES_PROPS: CheckboxesList = [

 const UI_CHECKBOXES_PROPS: CheckboxesList = [
  { prop: InterfaceStoredSettingsProps.isShowMenu, label: 'Enable compact map menu bar' },
-  { prop: InterfaceStoredSettingsProps.isThickConnections, label: 'Thicker connections' },
 ];

 export const MapSettings = ({ show, onHide }: MapSettingsProps) => {
--- a/assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/SignatureSettings.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/SignatureSettings.tsx
@@ -1,5 +1,6 @@
 import { Dialog } from 'primereact/dialog';
 import { useCallback, useEffect } from 'react';
+// import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { OutCommand, SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
 import { Controller, FormProvider, useForm } from 'react-hook-form';
 import {
@@ -24,106 +25,102 @@ export const SignatureSettings = ({ systemId, show, onHide, signatureData }: Map
  const { outCommand } = useMapRootState();

  const handleShow = async () => {};
-  const signatureForm = useForm<Partial<SystemSignaturePrepared>>({});
+  const form = useForm<Partial<SystemSignaturePrepared>>({});

-  const handleSave = useCallback(
-    async (e: any) => {
-      e?.preventDefault();
-      if (!signatureData) {
-        return;
-      }
+  const handleSave = useCallback(async () => {
+    if (!signatureData) {
+      return;
+    }

-      const { group, ...values } = signatureForm.getValues();
-      let out = { ...signatureData };
+    const { group, ...values } = form.getValues();
+    let out = { ...signatureData };

-      switch (group) {
-        case SignatureGroup.Wormhole:
-          if (values.linked_system) {
-            await outCommand({
-              type: OutCommand.linkSignatureToSystem,
-              data: {
-                signature_eve_id: signatureData.eve_id,
-                solar_system_source: systemId,
-                solar_system_target: values.linked_system,
-              },
-            });
-          }
+    switch (group) {
+      case SignatureGroup.Wormhole:
+        if (values.linked_system) {
+          await outCommand({
+            type: OutCommand.linkSignatureToSystem,
+            data: {
+              signature_eve_id: signatureData.eve_id,
+              solar_system_source: systemId,
+              solar_system_target: values.linked_system,
+            },
+          });
+        }

-          if (values.type != null) {
-            out = { ...out, type: values.type };
-          }
+        if (values.type != null) {
+          out = { ...out, type: values.type };
+        }

-          if (signatureData.group !== SignatureGroup.Wormhole) {
-            out = { ...out, name: '' };
-          }
+        if (signatureData.group !== SignatureGroup.Wormhole) {
+          out = { ...out, name: '' };
+        }

-          break;
-        case SignatureGroup.CosmicSignature:
-          out = { ...out, type: '', name: '' };
-          break;
-        default:
-          if (values.name != null) {
-            out = { ...out, name: values.name ?? '' };
-          }
-      }
+        break;
+      case SignatureGroup.CosmicSignature:
+        out = { ...out, type: '', name: '' };
+        break;
+      default:
+        if (values.name != null) {
+          out = { ...out, name: values.name ?? '' };
+        }
+    }

-      if (values.description != null) {
-        out = { ...out, description: values.description };
-      }
-
-      // Note: when type of signature changed from WH to other type - we should drop name
-      if (
-        group !== SignatureGroup.Wormhole && // new
-        signatureData.group === SignatureGroup.Wormhole && // prev
-        signatureData.linked_system
-      ) {
-        await outCommand({
-          type: OutCommand.unlinkSignature,
-          data: { signature_eve_id: signatureData.eve_id, solar_system_source: systemId },
-        });
-
-        out = { ...out, type: '' };
-      }
-
-      if (group === SignatureGroup.Wormhole && signatureData.linked_system != null && values.linked_system === null) {
-        await outCommand({
-          type: OutCommand.unlinkSignature,
-          data: { signature_eve_id: signatureData.eve_id, solar_system_source: systemId },
-        });
-      }
-
-      // Note: despite groups have optional type - this will always set
-      out = { ...out, group: group! };
+    if (values.description != null) {
+      out = { ...out, description: values.description };
+    }

+    // Note: when type of signature changed from WH to other type - we should drop name
+    if (
+      group !== SignatureGroup.Wormhole && // new
+      signatureData.group === SignatureGroup.Wormhole && // prev
+      signatureData.linked_system
+    ) {
      await outCommand({
-        type: OutCommand.updateSignatures,
-        data: {
-          system_id: systemId,
-          added: [],
-          updated: [out],
-          removed: [],
-        },
+        type: OutCommand.unlinkSignature,
+        data: { signature_eve_id: signatureData.eve_id, solar_system_source: systemId },
      });

-      signatureForm.reset();
-      onHide();
-    },
-    [signatureForm, onHide, outCommand, signatureData, systemId],
-  );
+      out = { ...out, type: '' };
+    }
+
+    if (group === SignatureGroup.Wormhole && signatureData.linked_system != null && values.linked_system === null) {
+      await outCommand({
+        type: OutCommand.unlinkSignature,
+        data: { signature_eve_id: signatureData.eve_id, solar_system_source: systemId },
+      });
+    }
+
+    // Note: despite groups have optional type - this will always set
+    out = { ...out, group: group! };
+
+    await outCommand({
+      type: OutCommand.updateSignatures,
+      data: {
+        system_id: systemId,
+        added: [],
+        updated: [out],
+        removed: [],
+      },
+    });
+
+    form.reset();
+    onHide();
+  }, [form, onHide, outCommand, signatureData, systemId]);

  useEffect(() => {
    if (!signatureData) {
-      signatureForm.reset();
+      form.reset();
      return;
    }

    const { linked_system, ...rest } = signatureData;

-    signatureForm.reset({
+    form.reset({
      linked_system: linked_system?.solar_system_id.toString() ?? undefined,
      ...rest,
    });
-  }, [signatureForm, signatureData]);
+  }, [form, signatureData]);

  return (
    <Dialog
@@ -141,34 +138,32 @@ export const SignatureSettings = ({ systemId, show, onHide, signatureData }: Map
      }}
    >
      <SystemsSettingsProvider initialValue={{ systemId }}>
-        <FormProvider {...signatureForm}>
-          <form onSubmit={handleSave}>
-            <div className="flex flex-col gap-2 justify-between">
-              <div className="w-full flex flex-col gap-1 p-1 min-h-[150px]">
-                <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
-                  <span>Group:</span>
-                  <SignatureGroupSelect name="group" />
-                </label>
+        <FormProvider {...form}>
+          <div className="flex flex-col gap-2 justify-between">
+            <div className="w-full flex flex-col gap-1 p-1 min-h-[150px]">
+              <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
+                <span>Group:</span>
+                <SignatureGroupSelect name="group" />
+              </label>

-                <SignatureGroupContent />
+              <SignatureGroupContent />

-                <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
-                  <span>Description:</span>
-                  <Controller
-                    name="description"
-                    control={signatureForm.control}
-                    render={({ field }) => (
-                      <InputText placeholder="Type description" value={field.value} onChange={field.onChange} />
-                    )}
-                  />
-                </label>
-              </div>
-
-              <div className="flex gap-2 justify-end">
-                <Button onClick={handleSave} outlined size="small" label="Save"></Button>
-              </div>
+              <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
+                <span>Description:</span>
+                <Controller
+                  name="description"
+                  control={form.control}
+                  render={({ field }) => (
+                    <InputText placeholder="Type description" value={field.value} onChange={field.onChange} />
+                  )}
+                />
+              </label>
            </div>
-          </form>
+
+            <div className="flex gap-2 justify-end">
+              <Button onClick={handleSave} outlined size="small" label="Save"></Button>
+            </div>
+          </div>
        </FormProvider>
      </SystemsSettingsProvider>
    </Dialog>
--- a/assets/js/hooks/Mapper/components/mapWrapper/MapWrapper.tsx
+++ b/assets/js/hooks/Mapper/components/mapWrapper/MapWrapper.tsx
@@ -1,14 +1,14 @@
 import { Map } from '@/hooks/Mapper/components/map/Map.tsx';
-import { useCallback, useRef, useState } from 'react';
-import { OutCommand, OutCommandHandler, SolarSystemConnection } from '@/hooks/Mapper/types';
+import { ForwardedRef, useCallback, useRef, useState } from 'react';
+import { MapHandlers, OutCommand, OutCommandHandler, SolarSystemConnection } from '@/hooks/Mapper/types';
 import { MapRootData, useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { OnMapSelectionChange } from '@/hooks/Mapper/components/map/map.types.ts';
 import isEqual from 'lodash.isequal';
 import { ContextMenuSystem, useContextMenuSystemHandlers } from '@/hooks/Mapper/components/contexts';
 import {
  SystemCustomLabelDialog,
-  SystemLinkSignatureDialog,
  SystemSettingsDialog,
+  SystemLinkSignatureDialog,
 } from '@/hooks/Mapper/components/mapInterface/components';
 import classes from './MapWrapper.module.scss';
 import { Connections } from '@/hooks/Mapper/components/mapRootContent/components/Connections';
@@ -20,45 +20,25 @@ import { Commands } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { useMapEventListener } from '@/hooks/Mapper/events';

 import { STORED_INTERFACE_DEFAULT_VALUES } from '@/hooks/Mapper/mapRootProvider/MapRootProvider';
-import { useDeleteSystems } from '@/hooks/Mapper/components/contexts/hooks';
-import { useCommonMapEventProcessor } from '@/hooks/Mapper/components/mapWrapper/hooks/useCommonMapEventProcessor.ts';
+
+interface MapWrapperProps {
+  refn: ForwardedRef<MapHandlers>;
+}

 // TODO: INFO - this component needs for abstract work with Map instance
-export const MapWrapper = () => {
+export const MapWrapper = ({ refn }: MapWrapperProps) => {
  const {
    update,
    outCommand,
    data: { selectedConnections, selectedSystems, hubs, systems },
-    interfaceSettings: {
-      isShowMenu,
-      isShowMinimap = STORED_INTERFACE_DEFAULT_VALUES.isShowMinimap,
-      isShowKSpace,
-      isThickConnections,
-    },
+    interfaceSettings: { isShowMenu, isShowMinimap = STORED_INTERFACE_DEFAULT_VALUES.isShowMinimap, isShowKSpace },
  } = useMapRootState();
-  const { deleteSystems } = useDeleteSystems();
-  const { mapRef, runCommand } = useCommonMapEventProcessor();

  const { open, ...systemContextProps } = useContextMenuSystemHandlers({ systems, hubs, outCommand });
  const { handleSystemMultipleContext, ...systemMultipleCtxProps } = useContextMenuSystemMultipleHandlers();

-  const [openSettings, setOpenSettings] = useState<string | null>(null);
-  const [openLinkSignatures, setOpenLinkSignatures] = useState<any | null>(null);
-  const [openCustomLabel, setOpenCustomLabel] = useState<string | null>(null);
-  const [selectedConnection, setSelectedConnection] = useState<SolarSystemConnection | null>(null);
-
-  const ref = useRef({ selectedConnections, selectedSystems, systemContextProps, systems, deleteSystems });
-  ref.current = { selectedConnections, selectedSystems, systemContextProps, systems, deleteSystems };
-
-  useMapEventListener(event => {
-    switch (event.name) {
-      case Commands.linkSignatureToSystem:
-        setOpenLinkSignatures(event.data);
-        return true;
-    }
-
-    runCommand(event);
-  });
+  const ref = useRef({ selectedConnections, selectedSystems, systemContextProps, systems });
+  ref.current = { selectedConnections, selectedSystems, systemContextProps, systems };

  const onSelectionChange: OnMapSelectionChange = useCallback(
    ({ systems, connections }) => {
@@ -79,6 +59,9 @@ export const MapWrapper = () => {
    [update],
  );

+  const [openSettings, setOpenSettings] = useState<string | null>(null);
+  const [openLinkSignatures, setOpenLinkSignatures] = useState<any | null>(null);
+  const [openCustomLabel, setOpenCustomLabel] = useState<string | null>(null);
  const handleCommand: OutCommandHandler = useCallback(
    event => {
      switch (event.type) {
@@ -112,19 +95,22 @@ export const MapWrapper = () => {
    [open],
  );

+  const [selectedConnection, setSelectedConnection] = useState<SolarSystemConnection | null>(null);
+
  const handleConnectionDbClick = useCallback((e: SolarSystemConnection) => setSelectedConnection(e), []);

-  const handleManualDelete = useCallback((toDelete: string[]) => {
-    const restDel = toDelete.filter(x => ref.current.systems.some(y => y.id === x));
-    if (restDel.length > 0) {
-      ref.current.deleteSystems(restDel);
+  useMapEventListener(event => {
+    switch (event.name) {
+      case Commands.linkSignatureToSystem:
+        setOpenLinkSignatures(event.data);
+        return true;
    }
-  }, []);
+  });

  return (
    <>
      <Map
-        ref={mapRef}
+        ref={refn}
        onCommand={handleCommand}
        onSelectionChange={onSelectionChange}
        onConnectionInfoClick={handleConnectionDbClick}
@@ -133,8 +119,6 @@ export const MapWrapper = () => {
        minimapClasses={!isShowMenu ? classes.MiniMap : undefined}
        isShowMinimap={isShowMinimap}
        showKSpaceBG={isShowKSpace}
-        onManualDelete={handleManualDelete}
-        isThickConnections={isThickConnections}
      />

      {openSettings != null && (
--- a/assets/js/hooks/Mapper/components/mapWrapper/hooks/useCommonMapEventProcessor.ts
+++ b/assets/js/hooks/Mapper/components/mapWrapper/hooks/useCommonMapEventProcessor.ts
@@ -1,38 +0,0 @@
-import { MutableRefObject, useCallback, useEffect, useRef } from 'react';
-import { Command, Commands, MapHandlers } from '@/hooks/Mapper/types';
-import { MapEvent } from '@/hooks/Mapper/events';
-import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
-
-export const useCommonMapEventProcessor = () => {
-  const mapRef = useRef<MapHandlers>() as MutableRefObject<MapHandlers>;
-  const {
-    data: { systems },
-  } = useMapRootState();
-
-  const refQueue = useRef<MapEvent<Command>[]>([]);
-
-  // const ref = useRef({})
-
-  const runCommand = useCallback(({ name, data }: MapEvent<Command>) => {
-    switch (name) {
-      case Commands.addSystems:
-      case Commands.removeSystems:
-        // case Commands.addConnections:
-        refQueue.current.push({ name, data });
-        return;
-    }
-
-    // @ts-ignore hz why here type error
-    mapRef.current?.command(name, data);
-  }, []);
-
-  useEffect(() => {
-    refQueue.current.forEach(x => mapRef.current?.command(x.name, x.data));
-    refQueue.current = [];
-  }, [systems]);
-
-  return {
-    mapRef,
-    runCommand,
-  };
-};
--- a/assets/js/hooks/Mapper/components/ui-kit/CharacterCard/CharacterCard.tsx
+++ b/assets/js/hooks/Mapper/components/ui-kit/CharacterCard/CharacterCard.tsx
@@ -4,7 +4,7 @@ import classes from './CharacterCard.module.scss';
 import { SystemView } from '@/hooks/Mapper/components/ui-kit/SystemView';
 import { CharacterTypeRaw, WithIsOwnCharacter } from '@/hooks/Mapper/types';
 import { Commands } from '@/hooks/Mapper/types/mapHandlers.ts';
-import { emitMapEvent } from '@/hooks/Mapper/events';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';

 type CharacterCardProps = {
  compact?: boolean;
@@ -34,12 +34,11 @@ export const CharacterCard = ({
  useSystemsCache,
  ...char
 }: CharacterCardProps) => {
+  const { mapRef } = useMapRootState();
+
  const handleSelect = useCallback(() => {
-    emitMapEvent({
-      name: Commands.centerSystem,
-      data: char?.location?.solar_system_id?.toString(),
-    });
-  }, [char]);
+    mapRef.current?.command(Commands.centerSystem, char?.location?.solar_system_id?.toString());
+  }, [mapRef, char]);

  return (
    <div className={clsx(classes.CharacterCard, 'w-full text-xs', 'flex flex-col box-border')} onClick={handleSelect}>
--- a/assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx
+++ b/assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx
@@ -31,26 +31,24 @@ export enum InterfaceStoredSettingsProps {
  isShowMenu = 'isShowMenu',
  isShowMinimap = 'isShowMinimap',
  isShowKSpace = 'isShowKSpace',
-  isThickConnections = 'isThickConnections',
 }

 export type InterfaceStoredSettings = {
  isShowMenu: boolean;
  isShowMinimap: boolean;
  isShowKSpace: boolean;
-  isThickConnections: boolean;
 };

 export const STORED_INTERFACE_DEFAULT_VALUES: InterfaceStoredSettings = {
  isShowMenu: false,
  isShowMinimap: true,
  isShowKSpace: false,
-  isThickConnections: false,
 };

 export interface MapRootContextProps {
  update: ContextStoreDataUpdate<MapRootData>;
  data: MapRootData;
+  mapRef: RefObject<MapHandlers>;
  outCommand: OutCommandHandler;
  interfaceSettings: InterfaceStoredSettings;
  setInterfaceSettings: Dispatch<SetStateAction<InterfaceStoredSettings>>;
@@ -59,6 +57,7 @@ export interface MapRootContextProps {
 const MapRootContext = createContext<MapRootContextProps>({
  update: () => {},
  data: { ...INITIAL_DATA },
+  mapRef: { current: null },
  // @ts-ignore
  outCommand: async () => void 0,
  interfaceSettings: STORED_INTERFACE_DEFAULT_VALUES,
@@ -68,6 +67,7 @@ const MapRootContext = createContext<MapRootContextProps>({
 type MapRootProviderProps = {
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  fwdRef: ForwardedRef<any>;
+  mapRef: RefObject<MapHandlers>;
  outCommand: OutCommandHandler;
 } & WithChildren;

@@ -78,7 +78,7 @@ const MapRootHandlers = forwardRef(({ children }: WithChildren, fwdRef: Forwarde
 });

 // eslint-disable-next-line react/display-name
-export const MapRootProvider = ({ children, fwdRef, outCommand }: MapRootProviderProps) => {
+export const MapRootProvider = ({ children, fwdRef, mapRef, outCommand }: MapRootProviderProps) => {
  const { update, ref } = useContextStore<MapRootData>({ ...INITIAL_DATA });

  const [interfaceSettings, setInterfaceSettings] = useLocalStorageState<InterfaceStoredSettings>(
@@ -94,6 +94,7 @@ export const MapRootProvider = ({ children, fwdRef, outCommand }: MapRootProvide
        update,
        data: ref,
        outCommand: outCommand,
+        mapRef: mapRef,
        setInterfaceSettings,
        interfaceSettings,
      }}
--- a/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useCommandsSystems.ts
+++ b/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useCommandsSystems.ts
@@ -1,7 +1,6 @@
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { useCallback, useRef } from 'react';
 import { CommandAddSystems, CommandRemoveSystems, CommandUpdateSystems } from '@/hooks/Mapper/types';
-import { useLoadSystemStatic } from '@/hooks/Mapper/mapRootProvider/hooks/useLoadSystemStatic.ts';

 export const useCommandsSystems = () => {
  const {
@@ -9,52 +8,40 @@ export const useCommandsSystems = () => {
    data: { systems },
  } = useMapRootState();

-  const { addSystemStatic } = useLoadSystemStatic({ systems: [] });
+  const ref = useRef({ systems, update });
+  ref.current = { systems, update };

-  const ref = useRef({ systems, update, addSystemStatic });
-  ref.current = { systems, update, addSystemStatic };
-
-  const addSystems = useCallback((systemsToAdd: CommandAddSystems) => {
-    const { update, addSystemStatic, systems } = ref.current;
-
-    systemsToAdd.forEach(sys => {
-      if (sys.system_static_info) {
-        addSystemStatic(sys.system_static_info);
-      }
-    });
-
-    update(
-      {
-        systems: [...systems.filter(sys => !systemsToAdd.some(x => sys.id === x.id)), ...systemsToAdd],
-      },
-      true,
-    );
-  }, []);
+  const addSystems = useCallback(
+    (addSystems: CommandAddSystems) => {
+      update({
+        systems: [...ref.current.systems.filter(sys => addSystems.some(x => sys.id !== x.id)), ...addSystems],
+      });
+    },
+    [update],
+  );

  const removeSystems = useCallback((toRemove: CommandRemoveSystems) => {
    const { update, systems } = ref.current;
-    update(
-      {
-        systems: systems.filter(x => !toRemove.includes(parseInt(x.id))),
-      },
-      true,
-    );
-  }, []);
-
-  const updateSystems = useCallback((updatedSystems: CommandUpdateSystems) => {
-    const { update, systems } = ref.current;
-
-    const out = systems.map(current => {
-      const newSystem = updatedSystems.find(x => current.id === x.id);
-      if (!newSystem) {
-        return current;
-      }
-
-      return newSystem;
+    update({
+      systems: systems.filter(x => !toRemove.includes(parseInt(x.id))),
    });
-
-    update({ systems: out }, true);
  }, []);

+  const updateSystems = useCallback(
+    (systems: CommandUpdateSystems) => {
+      const out = ref.current.systems.map(current => {
+        const newSystem = systems.find(x => current.id === x.id);
+        if (!newSystem) {
+          return current;
+        }
+
+        return newSystem;
+      });
+
+      update({ systems: out });
+    },
+    [update],
+  );
+
  return { addSystems, removeSystems, updateSystems };
 };
--- a/assets/js/hooks/Mapper/mapRootProvider/hooks/useLoadSystemStatic.ts
+++ b/assets/js/hooks/Mapper/mapRootProvider/hooks/useLoadSystemStatic.ts
@@ -24,7 +24,7 @@ interface UseLoadSystemStaticProps {
  systems: (number | string)[];
 }

-export const useLoadSystemStatic = ({ systems = [] }: UseLoadSystemStaticProps) => {
+export const useLoadSystemStatic = ({ systems }: UseLoadSystemStaticProps) => {
  const { outCommand } = useMapRootState();
  const [loading, setLoading] = useState(false);
  const [lastUpdateKey, setLastUpdateKey] = useState(0);
@@ -51,9 +51,6 @@ export const useLoadSystemStatic = ({ systems = [] }: UseLoadSystemStaticProps)
  }, []);

  useEffect(() => {
-    if (!systems.length) {
-      return;
-    }
    loadSystems(systems);
    // eslint-disable-next-line
  }, [systems]);
--- a/assets/js/hooks/Mapper/mapRootProvider/hooks/useMapRootHandlers.ts
+++ b/assets/js/hooks/Mapper/mapRootProvider/hooks/useMapRootHandlers.ts
@@ -44,75 +44,87 @@ export const useMapRootHandlers = (ref: ForwardedRef<MapHandlers>) => {
      return {
        command(type, data) {
          switch (type) {
-            case Commands.init: // USED
+            case Commands.init:
              mapInit(data as CommandInit);
              break;
-            case Commands.addSystems: // USED
+            case Commands.addSystems:
              addSystems(data as CommandAddSystems);
+              setTimeout(() => {
+                emitMapEvent({ name: Commands.addSystems, data });
+              }, 100);
              break;
-            case Commands.updateSystems: // USED
+            case Commands.updateSystems:
              updateSystems(data as CommandUpdateSystems);
              break;
-            case Commands.removeSystems: // USED
+            case Commands.removeSystems:
              removeSystems(data as CommandRemoveSystems);
+              setTimeout(() => {
+                emitMapEvent({ name: Commands.removeSystems, data });
+              }, 100);
+
              break;
-            case Commands.addConnections: // USED
+            case Commands.addConnections:
              addConnections(data as CommandAddConnections);
+              setTimeout(() => {
+                emitMapEvent({ name: Commands.addConnections, data });
+              }, 100);
              break;
-            case Commands.removeConnections: // USED
+            case Commands.removeConnections:
              removeConnections(data as CommandRemoveConnections);
              break;
-            case Commands.updateConnection: // USED
+            case Commands.updateConnection:
              updateConnection(data as CommandUpdateConnection);
              break;
-            case Commands.charactersUpdated: // USED
+            case Commands.charactersUpdated:
              charactersUpdated(data as CommandCharactersUpdated);
              break;
-            case Commands.characterAdded: // USED
+            case Commands.characterAdded:
              characterAdded(data as CommandCharacterAdded);
              break;
-            case Commands.characterRemoved: // USED
+            case Commands.characterRemoved:
              characterRemoved(data as CommandCharacterRemoved);
              break;
-            case Commands.characterUpdated: // USED
+            case Commands.characterUpdated:
              characterUpdated(data as CommandCharacterUpdated);
              break;
-            case Commands.presentCharacters: // USED
+            case Commands.presentCharacters:
              presentCharacters(data as CommandPresentCharacters);
              break;
-            case Commands.mapUpdated: // USED
+            case Commands.mapUpdated:
              mapUpdated(data as CommandMapUpdated);
              break;
            case Commands.routes:
              mapRoutes(data as CommandRoutes);
              break;

-            case Commands.signaturesUpdated: // USED
+            case Commands.centerSystem:
              // do nothing here
              break;

-            case Commands.linkSignatureToSystem: // USED
+            case Commands.selectSystem:
              // do nothing here
              break;

-            case Commands.centerSystem: // USED
-              // do nothing here
-              break;
-
-            case Commands.selectSystem: // USED
-              // do nothing here
+            case Commands.linkSignatureToSystem:
+              // TODO command data type lost
+              // @ts-ignore
+              emitMapEvent({ name: Commands.linkSignatureToSystem, data });
              break;

            case Commands.killsUpdated:
              // do nothing here
              break;

+            case Commands.signaturesUpdated:
+              // TODO command data type lost
+              // @ts-ignore
+              emitMapEvent({ name: Commands.signaturesUpdated, data });
+              break;
+
            default:
              console.warn(`JOipP Interface handlers: Unknown command: ${type}`, data);
              break;
          }
-
-          emitMapEvent({ name: type, data });
        },
      };
    },
--- a/assets/js/hooks/Mapper/types/connection.ts
+++ b/assets/js/hooks/Mapper/types/connection.ts
@@ -1,8 +1,3 @@
-export enum ConnectionType {
-  wormhole,
-  gate,
-}
-
 export enum MassState {
  normal,
  half,
@@ -37,6 +32,4 @@ export type SolarSystemConnection = {

  source: string;
  target: string;
-
-  type?: ConnectionType;
 };
--- a/assets/js/hooks/Mapper/types/connectionPassages.ts
+++ b/assets/js/hooks/Mapper/types/connectionPassages.ts
@@ -11,10 +11,6 @@ export type Passage = {
  character: PassageLimitedCharacterType;
 };

-export type ConnectionInfoOutput = {
-  marl_eol_time: string;
-};
-
 export type ConnectionOutput = {
  passages: Passage[];
 };
--- a/assets/js/hooks/Mapper/types/mapHandlers.ts
+++ b/assets/js/hooks/Mapper/types/mapHandlers.ts
@@ -118,9 +118,7 @@ export enum OutCommand {
  getCharacterJumps = 'get_character_jumps',
  getSignatures = 'get_signatures',
  getSystemStaticInfos = 'get_system_static_infos',
-  getConnectionInfo = 'get_connection_info',
  updateConnectionTimeStatus = 'update_connection_time_status',
-  updateConnectionType = 'update_connection_type',
  updateConnectionMassStatus = 'update_connection_mass_status',
  updateConnectionShipSizeType = 'update_connection_ship_size_type',
  updateConnectionLocked = 'update_connection_locked',
--- a/assets/js/hooks/Mapper/types/signatures.ts
+++ b/assets/js/hooks/Mapper/types/signatures.ts
@@ -25,6 +25,5 @@ export type SystemSignature = {
  group: SignatureGroup;
  type: string;
  linked_system?: SolarSystemStaticInfoRaw;
-  inserted_at?: string;
  updated_at?: string;
 };
--- a/assets/js/hooks/Mapper/useMapperHandlers.ts
+++ b/assets/js/hooks/Mapper/useMapperHandlers.ts
@@ -1,6 +1,7 @@
 import { RefObject, useCallback } from 'react';

 import { MapHandlers } from '@/hooks/Mapper/types/mapHandlers.ts';
+import { getQueryVariable } from './utils';

 export const useMapperHandlers = (handlerRefs: RefObject<MapHandlers>[], hooksRef: RefObject<any>) => {
  const handleCommand = useCallback(
@@ -15,6 +16,10 @@ export const useMapperHandlers = (handlerRefs: RefObject<MapHandlers>[], hooksRe
  );

  const handleMapEvent = useCallback(({ type, body }) => {
+    if (getQueryVariable('debug') === 'true') {
+      console.log(type, body);
+    }
+
    handlerRefs.forEach(ref => {
      if (!ref.current) {
        return;
--- a/assets/js/hooks/drag.ts
+++ b/assets/js/hooks/drag.ts
@@ -8,7 +8,7 @@ export default {
    const selector = '#' + this.el.id;

    const droppable = new Droppable(containers, {
-      delay: 100,
+      delay: 150,
      draggable: '.draggable',
      dropzone: '.dropzone',
      mirror: {
--- a/assets/js/hooks/newVersionUpdate.ts
+++ b/assets/js/hooks/newVersionUpdate.ts
@@ -4,26 +4,13 @@ export default {
  mounted() {
    const hook = this;

-    const refreshZone = hook.el.querySelector('#refresh-area');
+    const button = hook.el.querySelector('.update-button');

-    const handleUpdate = function (e: Event) {
-      const hexBricks = hook.el.querySelectorAll('.hex-brick');
-
-      // Add a new class to each element
-      hexBricks.forEach(el => {
-        el.classList.add('hex-brick--active');
-      });
-
-      setTimeout(() => {
-        const lastVersion = hook.el.dataset.version;
-        localStorage.setItem(LAST_VERSION_KEY, lastVersion);
-
-        window.location.reload();
-      }, 2000);
-    };
-
-    refreshZone.addEventListener('click', handleUpdate);
-    refreshZone.addEventListener('mouseover', handleUpdate);
+    button.addEventListener('click', function () {
+      const lastVersion = hook.el.dataset.version;
+      localStorage.setItem(LAST_VERSION_KEY, lastVersion);
+      window.location.reload();
+    });

    this.updated();
  },
--- a/assets/package.json
+++ b/assets/package.json
@@ -13,6 +13,8 @@
  },
  "dependencies": {
    "@formkit/auto-animate": "0.7.0",
+    "@react-rxjs/core": "^0.10.7",
+    "@react-rxjs/utils": "^0.9.7",
    "@shopify/draggable": "^1.1.3",
    "clsx": "^2.1.1",
    "daisyui": "^4.11.1",
@@ -31,7 +33,8 @@
    "react-grid-layout": "^1.3.4",
    "react-hook-form": "^7.53.1",
    "react-usestateref": "^1.0.9",
-    "reactflow": "^11.11.4",
+    "reactflow": "^11.10.4",
+    "rxjs": "^7.8.1",
    "tailwindcss": "^3.3.6",
    "topbar": "^3.0.0",
    "use-local-storage-state": "^19.3.1"
--- a/assets/yarn.lock
+++ b/assets/yarn.lock
@@ -469,6 +469,19 @@
  resolved "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz"
  integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==

+"@react-rxjs/core@^0.10.7":
+  version "0.10.7"
+  resolved "https://registry.npmjs.org/@react-rxjs/core/-/core-0.10.7.tgz"
+  integrity sha512-dornp8pUs9OcdqFKKRh9+I2FVe21gWufNun6RYU1ddts7kUy9i4Thvl0iqcPFbGY61cJQMAJF7dxixWMSD/A/A==
+  dependencies:
+    "@rx-state/core" "0.1.4"
+    use-sync-external-store "^1.0.0"
+
+"@react-rxjs/utils@^0.9.7":
+  version "0.9.7"
+  resolved "https://registry.npmjs.org/@react-rxjs/utils/-/utils-0.9.7.tgz"
+  integrity sha512-m9CUTdRsglObvUAlYfB24QvN+QH4XqCGEKnCdSILIeOx7mMqSi9TTFp2zrj5XqtMiLnj4ReAdDxrXegLPB73bQ==
+
 "@reactflow/background@11.3.14":
  version "11.3.14"
  resolved "https://registry.npmjs.org/@reactflow/background/-/background-11.3.14.tgz"
@@ -637,6 +650,11 @@
  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz#5a2d08b81e8064b34242d5cc9973ef8dd1e60503"
  integrity sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==

+"@rx-state/core@0.1.4":
+  version "0.1.4"
+  resolved "https://registry.npmjs.org/@rx-state/core/-/core-0.1.4.tgz"
+  integrity sha512-Z+3hjU2xh1HisLxt+W5hlYX/eGSDaXXP+ns82gq/PLZpkXLu0uwcNUh9RLY3Clq4zT+hSsA3vcpIGt6+UAb8rQ==
+
 "@shopify/draggable@^1.1.3":
  version "1.1.3"
  resolved "https://registry.npmjs.org/@shopify/draggable/-/draggable-1.1.3.tgz"
@@ -3262,9 +3280,9 @@ react@18.2.0:
  dependencies:
    loose-envify "^1.1.0"

-reactflow@^11.11.4:
+reactflow@^11.10.4:
  version "11.11.4"
-  resolved "https://registry.yarnpkg.com/reactflow/-/reactflow-11.11.4.tgz#e3593e313420542caed81aecbd73fb9bc6576653"
+  resolved "https://registry.npmjs.org/reactflow/-/reactflow-11.11.4.tgz"
  integrity sha512-70FOtJkUWH3BAOsN+LU9lCrKoKbtOPnz2uq0CV2PLdNSwxTXOhCbsZr50GmZ+Rtw3jx8Uv7/vBFtCGixLfd4Og==
  dependencies:
    "@reactflow/background" "11.3.14"
@@ -3403,6 +3421,13 @@ run-parallel@^1.1.9:
  dependencies:
    queue-microtask "^1.2.2"

+rxjs@^7.8.1:
+  version "7.8.1"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-array-concat@^1.1.2:
  version "1.1.2"
  resolved "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz"
@@ -3707,7 +3732,7 @@ ts-interface-checker@^0.1.9:
  resolved "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz"
  integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==

-tslib@^2.6.2:
+tslib@^2.1.0, tslib@^2.6.2:
  version "2.6.2"
  resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"
  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -3813,7 +3838,7 @@ use-local-storage-state@^19.3.1:
  resolved "https://registry.npmjs.org/use-local-storage-state/-/use-local-storage-state-19.3.1.tgz"
  integrity sha512-y3Z1dODXvZXZB4qtLDNN8iuXbsYD6TAxz61K58GWB9/yKwrNG9ynI0GzCTHi/Je1rMiyOwMimz0oyFsZn+Kj7Q==

-use-sync-external-store@1.2.0:
+use-sync-external-store@1.2.0, use-sync-external-store@^1.0.0:
  version "1.2.0"
  resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -138,7 +138,6 @@ config :ueberauth, WandererApp.Ueberauth.Strategy.Eve.OAuth,
    System.get_env("EVE_CLIENT_WITH_CORP_WALLET_SECRET", "<EVE_CLIENT_WITH_CORP_WALLET_SECRET>")

 config :logger,
-  truncate: :infinity,
  level:
    String.to_existing_atom(
      System.get_env(
@@ -172,65 +171,43 @@ config :wanderer_app, WandererApp.Scheduler,
  timeout: :infinity

 if config_env() == :prod do
-  database_unix_socket =
-    System.get_env("DATABASE_UNIX_SOCKET")
+  database_url =
+    System.get_env("DATABASE_URL") ||
+      raise """
+      environment variable DATABASE_URL is missing.
+      For example: ecto://USER:PASS@HOST/DATABASE
+      """

-  database =
-    database_unix_socket
+  maybe_ipv6 =
+    config_dir
+    |> get_var_from_path_or_env("ECTO_IPV6", "false")
+    |> String.to_existing_atom()
    |> case do
-      nil ->
-        System.get_env("DATABASE_URL") ||
-          raise """
-          environment variable DATABASE_URL is missing.
-          For example: ecto://USER:PASS@HOST/DATABASE
-          """
+      true -> [:inet6]
+      _ -> []
+    end

-      _ ->
-        System.get_env("DATABASE_NAME") ||
-          raise """
-          environment variable DATABASE_NAME is missing.
-          For example: "wanderer"
-          """
+  db_ssl_enabled =
+    config_dir
+    |> get_var_from_path_or_env("DATABASE_SSL_ENABLED", "false")
+    |> String.to_existing_atom()
+
+  db_ssl_verify_none =
+    config_dir
+    |> get_var_from_path_or_env("DATABASE_SSL_VERIFY_NONE", "false")
+    |> String.to_existing_atom()
+
+  client_opts =
+    if db_ssl_verify_none do
+      [verify: :verify_none]
    end

  config :wanderer_app, WandererApp.Repo,
-    pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10")
-
-  if not is_nil(database_unix_socket) do
-    config :wanderer_app, WandererApp.Repo,
-      socket_dir: database_unix_socket,
-      database: database
-  else
-    db_ssl_enabled =
-      config_dir
-      |> get_var_from_path_or_env("DATABASE_SSL_ENABLED", "false")
-      |> String.to_existing_atom()
-
-    db_ssl_verify_none =
-      config_dir
-      |> get_var_from_path_or_env("DATABASE_SSL_VERIFY_NONE", "false")
-      |> String.to_existing_atom()
-
-    client_opts =
-      if db_ssl_verify_none do
-        [verify: :verify_none]
-      end
-
-    maybe_ipv6 =
-      config_dir
-      |> get_var_from_path_or_env("ECTO_IPV6", "false")
-      |> String.to_existing_atom()
-      |> case do
-        true -> [:inet6]
-        _ -> []
-      end
-
-    config :wanderer_app, WandererApp.Repo,
-      url: database,
-      ssl: db_ssl_enabled,
-      ssl_opts: client_opts,
-      socket_options: maybe_ipv6
-  end
+    url: database_url,
+    ssl: db_ssl_enabled,
+    ssl_opts: client_opts,
+    pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"),
+    socket_options: maybe_ipv6

  # The secret key base is used to sign/encrypt cookies and other secrets.
  # A default value is used in config/dev.exs and config/test.exs but you
--- a/fly.toml
+++ b/fly.toml
@@ -3,10 +3,9 @@
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #

-app = 'wanderer-test'
+app = 'wanderer'
 primary_region = 'ams'
 kill_signal = 'SIGTERM'
-swap_size_mb = 512

 [build]

@@ -14,14 +13,18 @@ swap_size_mb = 512
  release_command = '/app/bin/migrate.sh'

 [env]
-  PHX_HOST = 'wanderer-test.fly.dev'
+  PHX_HOST = 'wanderer.fly.dev'
  PHX_SERVER = 'true'
  PORT = '8080'

+[metrics]
+port = 4021
+path = "/metrics"
+
 [http_service]
  internal_port = 8080
  force_https = true
-  auto_stop_machines = 'off'
+  auto_stop_machines = false
  auto_start_machines = false
  min_machines_running = 0
  processes = ['app']
@@ -32,9 +35,6 @@ swap_size_mb = 512
    soft_limit = 1000

 [[vm]]
-  size = 'shared-cpu-1x'
-
-[[metrics]]
-  port = 4021
-  path = '/metrics'
-  https = false
+  memory = '1gb'
+  cpu_kind = 'shared'
+  cpus = 1
--- a/lib/wanderer_app/api/calculations/calc_map_permissions.ex
+++ b/lib/wanderer_app/api/calculations/calc_map_permissions.ex
@@ -4,6 +4,8 @@ defmodule WandererApp.Api.Calculations.CalcMapPermissions do
  use Ash.Resource.Calculation
  require Ash.Query

+  import Bitwise
+
  @impl true
  def load(_query, _opts, _context) do
    [
@@ -15,8 +17,116 @@ defmodule WandererApp.Api.Calculations.CalcMapPermissions do
  end

  @impl true
-  def calculate([record], _opts, %{actor: actor}),
-    do: WandererApp.Permissions.check_characters_access(actor.characters, record.acls)
+  def calculate([record], _opts, %{actor: actor}) do
+    characters = actor.characters
+
+    character_ids = characters |> Enum.map(& &1.id)
+    character_eve_ids = characters |> Enum.map(& &1.eve_id)
+
+    character_corporation_ids =
+      characters |> Enum.map(& &1.corporation_id) |> Enum.map(&to_string/1)
+
+    character_alliance_ids = characters |> Enum.map(& &1.alliance_id) |> Enum.map(&to_string/1)
+
+    result =
+      record.acls
+      |> Enum.reduce([0, 0], fn acl, acc ->
+        is_owner? = acl.owner_id in character_ids
+
+        is_character_member? =
+          acl.members |> Enum.any?(fn member -> member.eve_character_id in character_eve_ids end)
+
+        is_corporation_member? =
+          acl.members
+          |> Enum.any?(fn member -> member.eve_corporation_id in character_corporation_ids end)
+
+        is_alliance_member? =
+          acl.members
+          |> Enum.any?(fn member -> member.eve_alliance_id in character_alliance_ids end)
+
+        if is_owner? || is_character_member? || is_corporation_member? || is_alliance_member? do
+          case acc do
+            [_, -1] ->
+              [-1, -1]
+
+            [-1, char_acc] ->
+              char_acl_mask =
+                acl.members
+                |> Enum.filter(fn member ->
+                  member.eve_character_id in character_eve_ids
+                end)
+                |> Enum.reduce(0, fn member, acc ->
+                  case acc do
+                    -1 -> -1
+                    _ -> WandererApp.Permissions.calc_role_mask(member.role, acc)
+                  end
+                end)
+
+              char_acc =
+                case char_acl_mask do
+                  -1 -> -1
+                  _ -> char_acc ||| char_acl_mask
+                end
+
+              [-1, char_acc]
+
+            [any_acc, char_acc] ->
+              any_acl_mask =
+                acl.members
+                |> Enum.filter(fn member ->
+                  member.eve_character_id in character_eve_ids ||
+                    member.eve_corporation_id in character_corporation_ids ||
+                    member.eve_alliance_id in character_alliance_ids
+                end)
+                |> Enum.reduce(0, fn member, acc ->
+                  case acc do
+                    -1 -> -1
+                    _ -> WandererApp.Permissions.calc_role_mask(member.role, acc)
+                  end
+                end)
+
+              char_acl_mask =
+                acl.members
+                |> Enum.filter(fn member ->
+                  member.eve_character_id in character_eve_ids
+                end)
+                |> Enum.reduce(0, fn member, acc ->
+                  case acc do
+                    -1 -> -1
+                    _ -> WandererApp.Permissions.calc_role_mask(member.role, acc)
+                  end
+                end)
+
+              any_acc =
+                case any_acl_mask do
+                  -1 -> -1
+                  _ -> any_acc ||| any_acl_mask
+                end
+
+              char_acc =
+                case char_acl_mask do
+                  -1 -> -1
+                  _ -> char_acc ||| char_acl_mask
+                end
+
+              [any_acc, char_acc]
+          end
+        else
+          acc
+        end
+      end)
+
+    case result do
+      [_, -1] ->
+        [-1]
+
+      [-1, char_acc] ->
+        [char_acc]
+
+      [any_acc, _char_acc] ->
+        [any_acc]
+    end
+  end

  @impl true
  def calculate(_records, _opts, _context) do
--- a/lib/wanderer_app/api/map_character_settings.ex
+++ b/lib/wanderer_app/api/map_character_settings.ex
@@ -17,12 +17,12 @@ defmodule WandererApp.Api.MapCharacterSettings do
      action: :read_by_map
    )

-    define(:tracked_by_map_filtered,
-      action: :tracked_by_map_filtered
+    define(:tracked_by_map,
+      action: :tracked_by_map
    )

    define(:tracked_by_map_all,
-      action: :tracked_by_map_all
+      action: :read_tracked_by_map
    )

    define(:track, action: :track)
@@ -38,7 +38,7 @@ defmodule WandererApp.Api.MapCharacterSettings do

    defaults [:create, :read, :update, :destroy]

-    read :tracked_by_map_filtered do
+    read :tracked_by_map do
      argument(:map_id, :string, allow_nil?: false)
      argument(:character_ids, {:array, :uuid}, allow_nil?: false)

@@ -52,7 +52,7 @@ defmodule WandererApp.Api.MapCharacterSettings do
      filter(expr(map_id == ^arg(:map_id)))
    end

-    read :tracked_by_map_all do
+    read :read_tracked_by_map do
      argument(:map_id, :string, allow_nil?: false)
      filter(expr(map_id == ^arg(:map_id) and tracked == true))
    end
--- a/lib/wanderer_app/api/map_connection.ex
+++ b/lib/wanderer_app/api/map_connection.ex
@@ -29,16 +29,13 @@ defmodule WandererApp.Api.MapConnection do
    define(:update_ship_size_type, action: :update_ship_size_type)
    define(:update_locked, action: :update_locked)
    define(:update_custom_info, action: :update_custom_info)
-    define(:update_type, action: :update_type)
-    define(:update_wormhole_type, action: :update_wormhole_type)
  end

  actions do
    default_accept [
      :map_id,
      :solar_system_source,
-      :solar_system_target,
-      :type
+      :solar_system_target
    ]

    defaults [:create, :read, :update, :destroy]
@@ -95,14 +92,6 @@ defmodule WandererApp.Api.MapConnection do
    update :update_custom_info do
      accept [:custom_info]
    end
-
-    update :update_type do
-      accept [:type]
-    end
-
-    update :update_wormhole_type do
-      accept [:wormhole_type]
-    end
  end

  attributes do
@@ -137,14 +126,6 @@ defmodule WandererApp.Api.MapConnection do
      allow_nil?(true)
    end

-    # where 0 - Wormhole
-    # where 1 - Gate
-    attribute :type, :integer do
-      default(0)
-
-      allow_nil?(true)
-    end
-
    attribute :wormhole_type, :string

    attribute :count_of_passage, :integer do
--- a/lib/wanderer_app/api/map_system.ex
+++ b/lib/wanderer_app/api/map_system.ex
@@ -12,7 +12,6 @@ defmodule WandererApp.Api.MapSystem do

  code_interface do
    define(:create, action: :create)
-    define(:destroy, action: :destroy)

    define(:by_id,
      get_by: [:id],
--- a/lib/wanderer_app/api/map_system_signature.ex
+++ b/lib/wanderer_app/api/map_system_signature.ex
@@ -16,7 +16,6 @@ defmodule WandererApp.Api.MapSystemSignature do
    define(:update, action: :update)
    define(:update_linked_system, action: :update_linked_system)
    define(:update_type, action: :update_type)
-    define(:update_group, action: :update_group)

    define(:by_id,
      get_by: [:id],
@@ -72,8 +71,7 @@ defmodule WandererApp.Api.MapSystemSignature do
        :description,
        :kind,
        :group,
-        :type,
-        :updated
+        :type
      ]

      primary? true
@@ -88,10 +86,6 @@ defmodule WandererApp.Api.MapSystemSignature do
      accept [:type]
    end

-    update :update_group do
-      accept [:group]
-    end
-
    read :by_system_id do
      argument(:system_id, :string, allow_nil?: false)

@@ -129,8 +123,6 @@ defmodule WandererApp.Api.MapSystemSignature do
    attribute :kind, :string
    attribute :group, :string

-    attribute :updated, :integer
-
    create_timestamp(:inserted_at)
    update_timestamp(:updated_at)
  end
--- a/lib/wanderer_app/application.ex
+++ b/lib/wanderer_app/application.ex
@@ -3,8 +3,6 @@ defmodule WandererApp.Application do

  use Application

-  require Logger
-
  @impl true
  def start(_type, _args) do
    children =
@@ -47,16 +45,7 @@ defmodule WandererApp.Application do
    # See https://hexdocs.pm/elixir/Supervisor.html
    # for other strategies and supported options
    opts = [strategy: :one_for_one, name: WandererApp.Supervisor]
-
    Supervisor.start_link(children, opts)
-    |> case do
-      {:ok, _pid} = ok ->
-        ok
-
-      {:error, info} = e ->
-        Logger.error("Failed to start application: #{inspect(info)}")
-        e
-    end
  end

  # Tell Phoenix to update the endpoint configuration
--- a/lib/wanderer_app/esi/api_client.ex
+++ b/lib/wanderer_app/esi/api_client.ex
@@ -37,32 +37,32 @@ defmodule WandererApp.Esi.ApiClient do

  @logger Application.compile_env(:wanderer_app, :logger)

-  def get_server_status, do: get("/status")
+  def get_server_status, do: _get("/status")

-  def set_autopilot_waypoint(add_to_beginning, clear_other_waypoints, destination_id, opts \\ []),
-    do:
-      post_esi(
-        "/ui/autopilot/waypoint",
-        opts
-        |> Keyword.merge(
-          params: %{
-            add_to_beginning: add_to_beginning,
-            clear_other_waypoints: clear_other_waypoints,
-            destination_id: destination_id
-          }
-        )
+  def set_autopilot_waypoint(add_to_beginning, clear_other_waypoints, destination_id, opts \\ []) do
+    _post_esi(
+      "/ui/autopilot/waypoint",
+      opts
+      |> Keyword.merge(
+        params: %{
+          add_to_beginning: add_to_beginning,
+          clear_other_waypoints: clear_other_waypoints,
+          destination_id: destination_id
+        }
      )
+    )
+  end

  def post_characters_affiliation(character_eve_ids, _opts)
-      when is_list(character_eve_ids),
-      do:
-        post(
-          "#{@base_url}/characters/affiliation/",
-          json: character_eve_ids,
-          params: %{
-            datasource: "tranquility"
-          }
-        )
+      when is_list(character_eve_ids) do
+    _post(
+      "#{@base_url}/characters/affiliation/",
+      json: character_eve_ids,
+      params: %{
+        datasource: "tranquility"
+      }
+    )
+  end

  def find_routes(map_id, origin, hubs, routes_settings) do
    origin = origin |> String.to_integer()
@@ -184,7 +184,7 @@ defmodule WandererApp.Esi.ApiClient do
    routes =
      all_routes
      |> Enum.map(fn route_info ->
-        map_route_info(route_info)
+        _map_route_info(route_info)
      end)
      |> Enum.filter(fn route_info -> not is_nil(route_info) end)

@@ -200,7 +200,7 @@ defmodule WandererApp.Esi.ApiClient do
        {:ok, result}

      _ ->
-        case get_all_routes_custom(hubs, origin, params) do
+        case _get_all_routes_custom(hubs, origin, params) do
          {:ok, result} ->
            WandererApp.Cache.insert(
              cache_key,
@@ -210,21 +210,22 @@ defmodule WandererApp.Esi.ApiClient do

            {:ok, result}

-          {:error, _error} ->
+          {:error, error} ->
+            @logger.error("Error getting custom routes for #{inspect(origin)}: #{inspect(error)}")
            @logger.error("Error getting custom routes for #{inspect(origin)}: #{inspect(hubs)}")

            @logger.error(
              "Error getting custom routes for #{inspect(origin)}: #{inspect(params)}"
            )

-            get_all_routes_eve(hubs, origin, params, opts)
+            _get_all_routes_eve(hubs, origin, params, opts)
        end
    end
  end

-  defp get_all_routes_custom(hubs, origin, params),
+  defp _get_all_routes_custom(hubs, origin, params),
    do:
-      post(
+      _post(
        "#{get_custom_route_base_url()}/route/multiple",
        [
          json: %{
@@ -238,7 +239,7 @@ defmodule WandererApp.Esi.ApiClient do
        |> Keyword.merge(@timeout_opts)
      )

-  def get_all_routes_eve(hubs, origin, params, opts),
+  def _get_all_routes_eve(hubs, origin, params, opts),
    do:
      {:ok,
       hubs
@@ -307,7 +308,7 @@ defmodule WandererApp.Esi.ApiClient do
              opts: [ttl: @ttl]
            )
  def get_character_info(eve_id, opts \\ []) do
-    case get(
+    case _get(
           "/characters/#{eve_id}/",
           opts |> _with_cache_opts()
         ) do
@@ -384,7 +385,7 @@ defmodule WandererApp.Esi.ApiClient do

  defp _get_routes_eve(origin, destination, params, opts),
    do:
-      get(
+      _get(
        "/route/#{origin}/#{destination}/?#{params |> Plug.Conn.Query.encode()}",
        opts |> _with_cache_opts()
      )
@@ -393,14 +394,14 @@ defmodule WandererApp.Esi.ApiClient do

  defp _get_alliance_info(alliance_eve_id, info_path, opts),
    do:
-      get(
+      _get(
        "/alliances/#{alliance_eve_id}/#{info_path}",
        opts |> _with_cache_opts()
      )

  defp _get_corporation_info(corporation_eve_id, info_path, opts),
    do:
-      get(
+      _get(
        "/corporations/#{corporation_eve_id}/#{info_path}",
        opts |> _with_cache_opts()
      )
@@ -415,7 +416,7 @@ defmodule WandererApp.Esi.ApiClient do
    character_id = opts |> Keyword.get(:character_id, nil)

    if not _is_access_token_expired?(character_id) do
-      get(
+      _get(
        path,
        auth_opts,
        opts
@@ -436,7 +437,7 @@ defmodule WandererApp.Esi.ApiClient do

  defp _get_corporation_auth_data(corporation_eve_id, info_path, opts),
    do:
-      get(
+      _get(
        "/corporations/#{corporation_eve_id}/#{info_path}",
        [params: opts[:params] || []] ++
          (opts |> _get_auth_opts() |> _with_cache_opts()),
@@ -447,14 +448,14 @@ defmodule WandererApp.Esi.ApiClient do
    opts |> Keyword.merge(@cache_opts) |> Keyword.merge(cache_dir: System.tmp_dir!())
  end

-  defp post_esi(path, opts),
+  defp _post_esi(path, opts),
    do:
-      post(
+      _post(
        "#{@base_url}#{path}",
        [params: opts[:params] || []] ++ (opts |> _get_auth_opts())
      )

-  defp get(path, api_opts \\ [], opts \\ []) do
+  defp _get(path, api_opts \\ [], opts \\ []) do
    try do
      case Req.get("#{@base_url}#{path}", api_opts |> Keyword.merge(@retry_opts)) do
        {:ok, %{status: 200, body: body}} ->
@@ -486,7 +487,7 @@ defmodule WandererApp.Esi.ApiClient do
    end
  end

-  defp post(url, opts) do
+  defp _post(url, opts) do
    try do
      case Req.post("#{url}", opts) do
        {:ok, %{status: status, body: body}} when status in [200, 201] ->
@@ -524,7 +525,7 @@ defmodule WandererApp.Esi.ApiClient do
        {:ok, token} ->
          auth_opts = [access_token: token.access_token] |> _get_auth_opts()

-          get(
+          _get(
            path,
            api_opts |> Keyword.merge(auth_opts),
            opts |> Keyword.merge(retry_count: retry_count + 1)
@@ -599,7 +600,7 @@ defmodule WandererApp.Esi.ApiClient do
    end
  end

-  defp map_route_info(
+  defp _map_route_info(
         %{
           "origin" => origin,
           "destination" => destination,
@@ -608,14 +609,14 @@ defmodule WandererApp.Esi.ApiClient do
         } = _route_info
       ),
       do:
-         map_route_info(%{
+         _map_route_info(%{
           origin: origin,
           destination: destination,
           systems: result_systems,
           success: success
         })

-  defp map_route_info(
+  defp _map_route_info(
         %{origin: origin, destination: destination, systems: result_systems, success: success} =
           _route_info
       ) do
@@ -637,5 +638,5 @@ defmodule WandererApp.Esi.ApiClient do
    }
  end

-  defp map_route_info(_), do: nil
+  defp _map_route_info(_), do: nil
 end
--- a/lib/wanderer_app/map.ex
+++ b/lib/wanderer_app/map.ex
@@ -8,7 +8,6 @@ defmodule WandererApp.Map do
  defstruct map_id: nil,
            name: nil,
            scope: :none,
-            owner_id: nil,
            characters: [],
            systems: Map.new(),
            hubs: [],
@@ -17,12 +16,11 @@ defmodule WandererApp.Map do
            characters_limit: nil,
            hubs_limit: nil

-  def new(%{id: map_id, name: name, scope: scope, owner_id: owner_id, acls: acls, hubs: hubs}) do
+  def new(%{id: map_id, name: name, scope: scope, acls: acls, hubs: hubs}) do
    map =
      struct!(__MODULE__,
        map_id: map_id,
        scope: scope,
-        owner_id: owner_id,
        name: name,
        acls: acls,
        hubs: hubs
@@ -216,7 +214,7 @@ defmodule WandererApp.Map do
      %{visible: true} = system ->
        system

-      _system ->
+      _ ->
        nil
    end
  end
@@ -264,7 +262,7 @@ defmodule WandererApp.Map do
    case not Map.has_key?(systems, solar_system_id) do
      true ->
        map_id
-        |> update_map(%{systems: Map.put(systems, solar_system_id, system)})
+        |> update_map(%{systems: Map.put_new(systems, solar_system_id, system)})

        :ok

--- a/lib/wanderer_app/map/map_server.ex
+++ b/lib/wanderer_app/map/map_server.ex
@@ -183,24 +183,12 @@ defmodule WandererApp.Map.Server do
      |> map_pid!
      |> GenServer.cast({&Impl.delete_connection/2, [connection_info]})

-  def get_connection_info(map_id, connection_info) when is_binary(map_id),
-    do:
-      map_id
-      |> map_pid!
-      |> GenServer.call({&Impl.get_connection_info/2, [connection_info]}, :timer.minutes(1))
-
  def update_connection_time_status(map_id, connection_info) when is_binary(map_id),
    do:
      map_id
      |> map_pid!
      |> GenServer.cast({&Impl.update_connection_time_status/2, [connection_info]})

-  def update_connection_type(map_id, connection_info) when is_binary(map_id),
-    do:
-      map_id
-      |> map_pid!
-      |> GenServer.cast({&Impl.update_connection_type/2, [connection_info]})
-
  def update_connection_mass_status(map_id, connection_info) when is_binary(map_id),
    do:
      map_id
--- a/lib/wanderer_app/map/map_server_impl.ex
+++ b/lib/wanderer_app/map/map_server_impl.ex
--- a/lib/wanderer_app/map/map_subscription_manager.ex
+++ b/lib/wanderer_app/map/map_subscription_manager.ex
@@ -237,7 +237,7 @@ defmodule WandererApp.Map.SubscriptionManager do
  defp _renew_subscription(%{auto_renew?: true} = subscription) when is_map(subscription) do
    with {:ok, %{map: map}} <-
           subscription |> WandererApp.MapSubscriptionRepo.load_relationships([:map]),
-         {:ok, estimated_price, discount} <- estimate_price(subscription, true),
+         {:ok, estimated_price} <- estimate_price(subscription, true),
         {:ok, map_balance} <- get_balance(map) do
      case map_balance >= estimated_price do
        true ->
@@ -245,7 +245,7 @@ defmodule WandererApp.Map.SubscriptionManager do
            WandererApp.MapTransactionRepo.create(%{
              map_id: map.id,
              user_id: nil,
-              amount: estimated_price - discount,
+              amount: estimated_price,
              type: :out
            })

@@ -267,7 +267,7 @@ defmodule WandererApp.Map.SubscriptionManager do

          :telemetry.execute([:wanderer_app, :map, :subscription, :renew], %{count: 1}, %{
            map_id: map.id,
-            amount: estimated_price - discount
+            amount: estimated_price
          })

          :ok
--- a/lib/wanderer_app/map/server/map_server_connections_impl.ex
+++ b/lib/wanderer_app/map/server/map_server_connections_impl.ex
@@ -1,512 +0,0 @@
-defmodule WandererApp.Map.Server.ConnectionsImpl do
-  @moduledoc """
-  Holds state for a map and exposes an interface to managing the map instance
-  """
-  require Logger
-
-  alias WandererApp.Map.Server.Impl
-
-  # @ccp1 -1
-  @c1 1
-  @c2 2
-  @c3 3
-  @c4 4
-  @c5 5
-  @c6 6
-  @hs 7
-  @ls 8
-  @ns 9
-  # @ccp2 10
-  # @ccp3 11
-  @thera 12
-  @c13 13
-  @sentinel 14
-  @baribican 15
-  @vidette 16
-  @conflux 17
-  @redoubt 18
-  @a1 19
-  @a2 20
-  @a3 21
-  @a4 22
-  @a5 23
-  @ccp4 24
-  # @pochven 25
-  # @zarzakh 10100
-
-  @jita 30_000_142
-
-  @wh_space [
-    @c1,
-    @c2,
-    @c3,
-    @c4,
-    @c5,
-    @c6,
-    @c13,
-    @thera,
-    @sentinel,
-    @baribican,
-    @vidette,
-    @conflux,
-    @redoubt
-  ]
-
-  @known_space [@hs, @ls, @ns]
-
-  @prohibited_systems [@jita]
-  @prohibited_system_classes [
-    @a1,
-    @a2,
-    @a3,
-    @a4,
-    @a5,
-    @ccp4
-  ]
-
-  # this class of systems will guaranty that no one real class will take that place
-  # @unknown 100_100
-  #
-  @connection_time_status_eol 1
-  @connection_auto_eol_hours 21
-  @connection_auto_expire_hours 24
-  @connection_eol_expire_timeout :timer.hours(3) + :timer.minutes(30)
-
-  @connection_type_wormhole 0
-  @connection_type_stargate 1
-
-  def init_eol_cache(map_id, connections_eol_time) do
-    connections_eol_time
-    |> Enum.each(fn {connection_id, connection_eol_time} ->
-      WandererApp.Cache.put(
-        "map_#{map_id}:conn_#{connection_id}:mark_eol_time",
-        connection_eol_time,
-        ttl: @connection_eol_expire_timeout
-      )
-    end)
-  end
-
-  def add_connection(
-        %{map_id: map_id} = state,
-        %{
-          solar_system_source_id: solar_system_source_id,
-          solar_system_target_id: solar_system_target_id,
-          character_id: character_id
-        } = _connection_info
-      ) do
-    :ok =
-      maybe_add_connection(
-        map_id,
-        %{solar_system_id: solar_system_target_id},
-        %{
-          solar_system_id: solar_system_source_id
-        },
-        character_id
-      )
-
-    state
-  end
-
-  def delete_connection(
-        %{map_id: map_id} = state,
-        %{
-          solar_system_source_id: solar_system_source_id,
-          solar_system_target_id: solar_system_target_id
-        } = _connection_info
-      ) do
-    :ok =
-      maybe_remove_connection(map_id, %{solar_system_id: solar_system_target_id}, %{
-        solar_system_id: solar_system_source_id
-      })
-
-    state
-  end
-
-  def get_connection_info(
-        %{map_id: map_id} = _state,
-        %{
-          solar_system_source_id: solar_system_source_id,
-          solar_system_target_id: solar_system_target_id
-        } = _connection_info
-      ) do
-    WandererApp.Map.find_connection(
-      map_id,
-      solar_system_source_id,
-      solar_system_target_id
-    )
-    |> case do
-      {:ok, %{id: connection_id}} ->
-        connection_mark_eol_time = get_connection_mark_eol_time(map_id, connection_id, nil)
-        {:ok, %{marl_eol_time: connection_mark_eol_time}}
-
-      _ ->
-        {:error, :not_found}
-    end
-  end
-
-  def update_connection_time_status(
-        %{map_id: map_id} = state,
-        connection_update
-      ),
-      do:
-        update_connection(state, :update_time_status, [:time_status], connection_update, fn
-          %{id: connection_id, time_status: time_status} ->
-            case time_status == @connection_time_status_eol do
-              true ->
-                WandererApp.Cache.put(
-                  "map_#{map_id}:conn_#{connection_id}:mark_eol_time",
-                  DateTime.utc_now(),
-                  ttl: @connection_eol_expire_timeout
-                )
-
-              _ ->
-                WandererApp.Cache.delete("map_#{map_id}:conn_#{connection_id}:mark_eol_time")
-            end
-        end)
-
-  def update_connection_type(
-        state,
-        connection_update
-      ),
-      do: update_connection(state, :update_type, [:type], connection_update)
-
-  def update_connection_mass_status(
-        state,
-        connection_update
-      ),
-      do: update_connection(state, :update_mass_status, [:mass_status], connection_update)
-
-  def update_connection_ship_size_type(
-        state,
-        connection_update
-      ),
-      do: update_connection(state, :update_ship_size_type, [:ship_size_type], connection_update)
-
-  def update_connection_locked(
-        state,
-        connection_update
-      ),
-      do: update_connection(state, :update_locked, [:locked], connection_update)
-
-  def update_connection_custom_info(
-        state,
-        connection_update
-      ),
-      do: update_connection(state, :update_custom_info, [:custom_info], connection_update)
-
-  def cleanup_connections(%{map_id: map_id} = state) do
-    state =
-      map_id
-      |> WandererApp.Map.list_connections!()
-      |> Enum.filter(fn %{
-                          inserted_at: inserted_at,
-                          solar_system_source: solar_system_source_id,
-                          solar_system_target: solar_system_target_id,
-                          type: type
-                        } ->
-        type != @connection_type_stargate &&
-          DateTime.diff(DateTime.utc_now(), inserted_at, :hour) >=
-            @connection_auto_eol_hours &&
-          is_connection_valid(
-            :wormholes,
-            solar_system_source_id,
-            solar_system_target_id
-          )
-      end)
-      |> Enum.reduce(state, fn %{
-                                 solar_system_source: solar_system_source_id,
-                                 solar_system_target: solar_system_target_id
-                               },
-                               state ->
-        state
-        |> update_connection_time_status(%{
-          solar_system_source_id: solar_system_source_id,
-          solar_system_target_id: solar_system_target_id,
-          time_status: @connection_time_status_eol
-        })
-      end)
-
-    state =
-      map_id
-      |> WandererApp.Map.list_connections!()
-      |> Enum.filter(fn %{
-                          id: connection_id,
-                          inserted_at: inserted_at,
-                          solar_system_source: solar_system_source_id,
-                          solar_system_target: solar_system_target_id,
-                          type: type
-                        } ->
-        connection_mark_eol_time =
-          get_connection_mark_eol_time(map_id, connection_id)
-
-        reverse_connection =
-          WandererApp.Map.get_connection(
-            map_id,
-            solar_system_target_id,
-            solar_system_source_id
-          )
-
-        is_connection_exist =
-          is_connection_exist(
-            map_id,
-            solar_system_source_id,
-            solar_system_target_id
-          ) || not is_nil(reverse_connection)
-
-        is_connection_valid =
-          is_connection_valid(
-            :wormholes,
-            solar_system_source_id,
-            solar_system_target_id
-          )
-
-        not is_connection_exist ||
-          (type != @connection_type_stargate && is_connection_valid &&
-             (DateTime.diff(DateTime.utc_now(), inserted_at, :hour) >=
-                @connection_auto_expire_hours ||
-                DateTime.diff(DateTime.utc_now(), connection_mark_eol_time, :hour) >=
-                  @connection_auto_expire_hours - @connection_auto_eol_hours))
-      end)
-      |> Enum.reduce(state, fn %{
-                                 solar_system_source: solar_system_source_id,
-                                 solar_system_target: solar_system_target_id
-                               },
-                               state ->
-        state
-        |> delete_connection(%{
-          solar_system_source_id: solar_system_source_id,
-          solar_system_target_id: solar_system_target_id
-        })
-      end)
-
-    state
-  end
-
-  def maybe_add_connection(map_id, location, old_location, character_id)
-      when not is_nil(location) and not is_nil(old_location) and
-             not is_nil(old_location.solar_system_id) and
-             location.solar_system_id != old_location.solar_system_id do
-    character_id
-    |> WandererApp.Character.get_character!()
-    |> case do
-      nil ->
-        :ok
-
-      character ->
-        :telemetry.execute([:wanderer_app, :map, :character, :jump], %{count: 1}, %{})
-
-        {:ok, _} =
-          WandererApp.Api.MapChainPassages.new(%{
-            map_id: map_id,
-            character_id: character_id,
-            ship_type_id: character.ship,
-            ship_name: character.ship_name,
-            solar_system_source_id: old_location.solar_system_id,
-            solar_system_target_id: location.solar_system_id
-          })
-    end
-
-    case WandererApp.Map.check_connection(map_id, location, old_location) do
-      :ok ->
-        connection_type =
-          is_connection_valid(
-            :stargates,
-            old_location.solar_system_id,
-            location.solar_system_id
-          )
-          |> case do
-            true ->
-              @connection_type_stargate
-
-            _ ->
-              @connection_type_wormhole
-          end
-
-        {:ok, connection} =
-          WandererApp.MapConnectionRepo.create(%{
-            map_id: map_id,
-            solar_system_source: old_location.solar_system_id,
-            solar_system_target: location.solar_system_id,
-            type: connection_type
-          })
-
-        WandererApp.Map.add_connection(map_id, connection)
-
-        Impl.broadcast!(map_id, :maybe_select_system, %{
-          character_id: character_id,
-          solar_system_id: location.solar_system_id
-        })
-
-        Impl.broadcast!(map_id, :add_connection, connection)
-
-        Impl.broadcast!(map_id, :maybe_link_signature, %{
-          character_id: character_id,
-          solar_system_source: old_location.solar_system_id,
-          solar_system_target: location.solar_system_id
-        })
-
-        :ok
-
-      {:error, error} ->
-        Logger.debug(fn -> "Failed to add connection: #{inspect(error, pretty: true)}" end)
-        :ok
-    end
-  end
-
-  def maybe_add_connection(_map_id, _location, _old_location, _character_id), do: :ok
-
-  def can_add_location(_scope, nil), do: false
-
-  def can_add_location(:all, _solar_system_id), do: true
-
-  def can_add_location(:none, _solar_system_id), do: false
-
-  def can_add_location(scope, solar_system_id) do
-    system_static_info =
-      case WandererApp.CachedInfo.get_system_static_info(solar_system_id) do
-        {:ok, system_static_info} when not is_nil(system_static_info) ->
-          system_static_info
-
-        _ ->
-          %{system_class: nil}
-      end
-
-    case scope do
-      :wormholes ->
-        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
-          not (@prohibited_systems |> Enum.member?(solar_system_id)) and
-          @wh_space |> Enum.member?(system_static_info.system_class)
-
-      :stargates ->
-        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
-          @known_space |> Enum.member?(system_static_info.system_class)
-
-      _ ->
-        false
-    end
-  end
-
-  def is_connection_exist(map_id, from_solar_system_id, to_solar_system_id),
-    do:
-      not is_nil(
-        WandererApp.Map.find_system_by_location(
-          map_id,
-          %{solar_system_id: from_solar_system_id}
-        )
-      ) &&
-        not is_nil(
-          WandererApp.Map.find_system_by_location(
-            map_id,
-            %{solar_system_id: to_solar_system_id}
-          )
-        )
-
-  def is_connection_valid(_scope, nil, _to_solar_system_id), do: false
-
-  def is_connection_valid(:all, _from_solar_system_id, _to_solar_system_id), do: true
-
-  def is_connection_valid(:none, _from_solar_system_id, _to_solar_system_id), do: false
-
-  def is_connection_valid(scope, from_solar_system_id, to_solar_system_id) do
-    {:ok, known_jumps} =
-      WandererApp.Api.MapSolarSystemJumps.find(%{
-        before_system_id: from_solar_system_id,
-        current_system_id: to_solar_system_id
-      })
-
-    system_static_info =
-      case WandererApp.CachedInfo.get_system_static_info(to_solar_system_id) do
-        {:ok, system_static_info} when not is_nil(system_static_info) ->
-          system_static_info
-
-        _ ->
-          %{system_class: nil}
-      end
-
-    case scope do
-      :wormholes ->
-        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
-          not (@prohibited_systems |> Enum.member?(to_solar_system_id)) and
-          known_jumps |> Enum.empty?() and to_solar_system_id != @jita and
-          from_solar_system_id != @jita
-
-      :stargates ->
-        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
-          not (known_jumps |> Enum.empty?())
-    end
-  end
-
-  def get_connection_mark_eol_time(map_id, connection_id, default \\ DateTime.utc_now()) do
-    WandererApp.Cache.get("map_#{map_id}:conn_#{connection_id}:mark_eol_time")
-    |> case do
-      nil ->
-        default
-
-      value ->
-        value
-    end
-  end
-
-  defp maybe_remove_connection(map_id, location, old_location)
-       when not is_nil(location) and not is_nil(old_location) and
-              location.solar_system_id != old_location.solar_system_id do
-    case WandererApp.Map.find_connection(
-           map_id,
-           location.solar_system_id,
-           old_location.solar_system_id
-         ) do
-      {:ok, connection} when not is_nil(connection) ->
-        :ok = WandererApp.MapConnectionRepo.destroy(map_id, connection)
-
-        Impl.broadcast!(map_id, :remove_connections, [connection])
-        map_id |> WandererApp.Map.remove_connection(connection)
-
-      _error ->
-        :ok
-    end
-  end
-
-  defp maybe_remove_connection(_map_id, _location, _old_location), do: :ok
-
-  defp update_connection(
-         %{map_id: map_id} = state,
-         update_method,
-         attributes,
-         %{
-           solar_system_source_id: solar_system_source_id,
-           solar_system_target_id: solar_system_target_id
-         } = update,
-         callback_fn \\ nil
-       ) do
-    with {:ok, connection} <-
-           WandererApp.Map.find_connection(
-             map_id,
-             solar_system_source_id,
-             solar_system_target_id
-           ),
-         {:ok, update_map} <- Impl.get_update_map(update, attributes),
-         {:ok, updated_connection} <-
-           apply(WandererApp.MapConnectionRepo, update_method, [
-             connection,
-             update_map
-           ]),
-         :ok <-
-           WandererApp.Map.update_connection(
-             map_id,
-             connection |> Map.merge(update_map)
-           ) do
-      if not is_nil(callback_fn) do
-        callback_fn.(updated_connection)
-      end
-
-      Impl.broadcast!(map_id, :update_connection, updated_connection)
-
-      state
-    else
-      {:error, error} ->
-        Logger.error("Failed to update connection: #{inspect(error, pretty: true)}")
-
-        state
-    end
-  end
-end
--- a/lib/wanderer_app/permissions.ex
+++ b/lib/wanderer_app/permissions.ex
@@ -87,113 +87,4 @@ defmodule WandererApp.Permissions do
      delete_map: check_permission(user_permissions, @delete_map)
    }
  end
-
-  def check_characters_access(characters, acls) do
-    character_ids = characters |> Enum.map(& &1.id)
-    character_eve_ids = characters |> Enum.map(& &1.eve_id)
-
-    character_corporation_ids =
-      characters |> Enum.map(& &1.corporation_id) |> Enum.map(&to_string/1)
-
-    character_alliance_ids = characters |> Enum.map(& &1.alliance_id) |> Enum.map(&to_string/1)
-
-    result =
-      acls
-      |> Enum.reduce([0, 0], fn acl, acc ->
-        is_owner? = acl.owner_id in character_ids
-
-        is_character_member? =
-          acl.members |> Enum.any?(fn member -> member.eve_character_id in character_eve_ids end)
-
-        is_corporation_member? =
-          acl.members
-          |> Enum.any?(fn member -> member.eve_corporation_id in character_corporation_ids end)
-
-        is_alliance_member? =
-          acl.members
-          |> Enum.any?(fn member -> member.eve_alliance_id in character_alliance_ids end)
-
-        if is_owner? || is_character_member? || is_corporation_member? || is_alliance_member? do
-          case acc do
-            [_, -1] ->
-              [-1, -1]
-
-            [-1, char_acc] ->
-              char_acl_mask =
-                acl.members
-                |> Enum.filter(fn member ->
-                  member.eve_character_id in character_eve_ids
-                end)
-                |> Enum.reduce(0, fn member, acc ->
-                  case acc do
-                    -1 -> -1
-                    _ -> calc_role_mask(member.role, acc)
-                  end
-                end)
-
-              char_acc =
-                case char_acl_mask do
-                  -1 -> -1
-                  _ -> char_acc ||| char_acl_mask
-                end
-
-              [-1, char_acc]
-
-            [any_acc, char_acc] ->
-              any_acl_mask =
-                acl.members
-                |> Enum.filter(fn member ->
-                  member.eve_character_id in character_eve_ids ||
-                    member.eve_corporation_id in character_corporation_ids ||
-                    member.eve_alliance_id in character_alliance_ids
-                end)
-                |> Enum.reduce(0, fn member, acc ->
-                  case acc do
-                    -1 -> -1
-                    _ -> calc_role_mask(member.role, acc)
-                  end
-                end)
-
-              char_acl_mask =
-                acl.members
-                |> Enum.filter(fn member ->
-                  member.eve_character_id in character_eve_ids
-                end)
-                |> Enum.reduce(0, fn member, acc ->
-                  case acc do
-                    -1 -> -1
-                    _ -> calc_role_mask(member.role, acc)
-                  end
-                end)
-
-              any_acc =
-                case any_acl_mask do
-                  -1 -> -1
-                  _ -> any_acc ||| any_acl_mask
-                end
-
-              char_acc =
-                case char_acl_mask do
-                  -1 -> -1
-                  _ -> char_acc ||| char_acl_mask
-                end
-
-              [any_acc, char_acc]
-          end
-        else
-          acc
-        end
-      end)
-
-    case result do
-      [_, -1] ->
-        [-1]
-
-      [-1, char_acc] ->
-        [char_acc]
-
-      [any_acc, _char_acc] ->
-        [any_acc]
-    end
-  end
 end
--- a/lib/wanderer_app/repositories/map_character_settings_repo.ex
+++ b/lib/wanderer_app/repositories/map_character_settings_repo.ex
@@ -3,23 +3,4 @@ defmodule WandererApp.MapCharacterSettingsRepo do

  def create(settings),
    do: WandererApp.Api.MapCharacterSettings.create(settings)
-
-  def get_tracked_by_map_filtered(map_id, character_ids),
-    do:
-      WandererApp.Api.MapCharacterSettings.tracked_by_map_filtered(%{
-        map_id: map_id,
-        character_ids: character_ids
-      })
-
-  def get_all_by_map(map_id),
-    do: WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id})
-
-  def get_tracked_by_map_all(map_id),
-    do: WandererApp.Api.MapCharacterSettings.tracked_by_map_all(%{map_id: map_id})
-
-  def track(settings), do: settings |> WandererApp.Api.MapCharacterSettings.track()
-  def untrack(settings), do: settings |> WandererApp.Api.MapCharacterSettings.untrack()
-
-  def track!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.track!()
-  def untrack!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.untrack!()
 end
--- a/lib/wanderer_app/repositories/map_connection_repo.ex
+++ b/lib/wanderer_app/repositories/map_connection_repo.ex
@@ -27,7 +27,6 @@ defmodule WandererApp.MapConnectionRepo do
    end
  end

-  def create(connection), do: connection |> WandererApp.Api.MapConnection.create()
  def create!(connection), do: connection |> WandererApp.Api.MapConnection.create!()

  def destroy(map_id, connection) when not is_nil(connection) do
@@ -71,11 +70,6 @@ defmodule WandererApp.MapConnectionRepo do
      connection
      |> WandererApp.Api.MapConnection.update_time_status(update)

-  def update_type(connection, update),
-    do:
-      connection
-      |> WandererApp.Api.MapConnection.update_type(update)
-
  def update_mass_status(connection, update),
    do:
      connection
--- a/lib/wanderer_app/repositories/map_system_repo.ex
+++ b/lib/wanderer_app/repositories/map_system_repo.ex
@@ -35,12 +35,12 @@ defmodule WandererApp.MapSystemRepo do

  def cleanup_labels!(%{labels: labels} = system, opts) do
    store_custom_labels? =
-      Keyword.get(opts, :store_custom_labels)
+      Keyword.get(opts, :store_custom_labels, "false") |> String.to_existing_atom()

    labels = get_filtered_labels(labels, store_custom_labels?)

    system
-    |> update_labels!(%{
+    |> WandererApp.Api.MapSystem.update_labels!(%{
      labels: labels
    })
  end
@@ -52,13 +52,6 @@ defmodule WandererApp.MapSystemRepo do
    })
  end

-  def cleanup_tags!(system) do
-    system
-    |> WandererApp.Api.MapSystem.update_tag!(%{
-      tag: nil
-    })
-  end
-
  def get_filtered_labels(labels, true) when is_binary(labels) do
    labels
    |> Jason.decode!()
@@ -104,11 +97,6 @@ defmodule WandererApp.MapSystemRepo do
      system
      |> WandererApp.Api.MapSystem.update_labels(update)

-  def update_labels!(system, update),
-    do:
-      system
-      |> WandererApp.Api.MapSystem.update_labels!(update)
-
  def update_position(system, update),
    do:
      system
@@ -118,14 +106,4 @@ defmodule WandererApp.MapSystemRepo do
    do:
      system
      |> WandererApp.Api.MapSystem.update_position!(update)
-
-  def update_visible(system, update),
-    do:
-      system
-      |> WandererApp.Api.MapSystem.update_visible(update)
-
-  def update_visible!(system, update),
-    do:
-      system
-      |> WandererApp.Api.MapSystem.update_visible!(update)
 end
--- a/lib/wanderer_app_web/components/core_components.ex
+++ b/lib/wanderer_app_web/components/core_components.ex
@@ -146,12 +146,7 @@ defmodule WandererAppWeb.CoreComponents do
      class="flex flex-col p-4 items-center absolute bottom-16 left-1 gap-2 tooltip tooltip-right"
      data-tip="server: Tranquility"
    >
-      <div
-        :if={@online}
-        class="absolute block w-4 h-4 rounded-full shadow-inner bg-green-500 animate-ping"
-      >
-      </div>
-      <div class={"block w-4 h-4 rounded-full shadow-inner  #{if @online, do: " bg-green-500", else: "bg-red-500"}"}>
+      <div class={"block w-4 h-4 rounded-full shadow-inner  #{if @online, do: " bg-green-500 animate-pulse", else: "bg-red-500"}"}>
      </div>
    </div>
    """
--- a/lib/wanderer_app_web/components/layouts.ex
+++ b/lib/wanderer_app_web/components/layouts.ex
@@ -30,35 +30,25 @@ defmodule WandererAppWeb.Layouts do
      phx-hook="NewVersionUpdate"
      phx-update="ignore"
      data-version={@app_version}
-      class="!z-1000 hidden absolute top-0 left-0 w-full h-full group items-center fade-in-scale text-white !bg-opacity-70 rounded p-px overflow-hidden flex items-center"
+      class="!z-100 hidden group alert items-center fixed bottom-52 left-2 fade-in-scale text-white !bg-opacity-70 w-10 h-10 hover:w-[250px] hover:h-[70px] rounded p-px overflow-hidden"
    >
-      <div class="hs-overlay-backdrop transition duration absolute left-0 top-0 w-full h-full bg-gray-900 bg-opacity-50 dark:bg-opacity-80 dark:bg-neutral-900">
-      </div>
-      <div class="absolute top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] flex items-center">
-        <div class="rounded w-9 h-9 w-[80px] h-[66px] flex items-center justify-center relative z-20">
-          <.icon name="hero-chevron-double-right" class="w-9 h-9 mr-[-40px]" />
-        </div>
-        <div id="refresh-area">
-          <.live_component module={WandererAppWeb.MapRefresh} id="map-refresh" />
+      <div class="group animate-rotate absolute inset-0 h-full w-full rounded-full bg-[conic-gradient(#0ea5e9_20deg,transparent_120deg)] group-hover:bg-[#0ea5e9]" />
+
+      <div class="!bg-black  rounded w-9 h-9 hover:m-0 group-hover:w-[246px] group-hover:h-[66px] flex items-center justify-center p-2 relative z-20">
+        <.icon name="hero-bell-alert" class="animate-pulse group-hover:hidden absolute top-2 h-5 w-5" />
+        <div class="opacity-0 group-hover:opacity-100 flex flex-col items-center justify-center w-[250px] h-full">
+          <div class="text-white text-nowrap text-sm">
+            New Version Available
+          </div>
+          <a href="/changelog" target="_blank" class="text-sm link-secondary">What's new?</a>
        </div>

-        <div class="rounded h-[66px] flex items-center justify-center relative z-20">
-          <div class=" flex items-center w-[200px] h-full">
-            <.icon name="hero-chevron-double-left" class="w-9 h-9 mr-[20px]" />
-            <div class=" flex flex-col items-center justify-center h-full">
-              <div class="text-white text-nowrap text-sm [text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]">
-                Update Required
-              </div>
-              <a
-                href="/changelog"
-                target="_blank"
-                class="text-sm link-secondary [text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]"
-              >
-                What's new?
-              </a>
-            </div>
-          </div>
-        </div>
+        <button
+          type="button"
+          class="invisible group-hover:visible update-button p-button p-component p-button-outlined p-button-sm p-0 px-1 w-[76px]"
+        >
+          Update
+        </button>
      </div>
    </div>
    """
--- a/lib/wanderer_app_web/components/map/map_refresh.ex
+++ b/lib/wanderer_app_web/components/map/map_refresh.ex
@@ -1,197 +0,0 @@
-defmodule WandererAppWeb.MapRefresh do
-  use WandererAppWeb, :live_component
-
-  def render(assigns) do
-    ~H"""
-    <div id="map-refresh" class="socket">
-      <div class="gel center-gel">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c1 r1">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c2 r1">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c3 r1">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c4 r1">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c5 r1">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c6 r1">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-
-      <div class="gel c7 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-
-      <div class="gel c8 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c9 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c10 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c11 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c12 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c13 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c14 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c15 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c16 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c17 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c18 r2">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c19 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c20 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c21 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c22 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c23 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c24 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c25 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c26 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c28 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c29 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c30 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c31 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c32 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c33 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c34 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c35 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c36 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-      <div class="gel c37 r3">
-        <div class="hex-brick h1"></div>
-        <div class="hex-brick h2"></div>
-        <div class="hex-brick h3"></div>
-      </div>
-    </div>
-    """
-  end
-end
--- a/lib/wanderer_app_web/live/access_lists/access_lists_live.ex
+++ b/lib/wanderer_app_web/live/access_lists/access_lists_live.ex
@@ -1,5 +1,4 @@
 defmodule WandererAppWeb.AccessListsLive do
-  alias Pathex.Builder.Viewer
  use WandererAppWeb, :live_view

  require Logger
@@ -90,10 +89,7 @@ defmodule WandererAppWeb.AccessListsLive do
      |> assign(:page_title, "Access Lists - Members")
      |> assign(:selected_acl_id, acl_id)
      |> assign(:access_list, access_list)
-      |> assign(
-        :members,
-        members
-      )
+      |> assign(:members, members)
    else
      _ ->
        socket
@@ -149,7 +145,7 @@ defmodule WandererAppWeb.AccessListsLive do
          :send_after,
          [self(), {:search, text}, 100],
          "member_search_#{socket.assigns.selected_acl_id}",
-          250
+          500
        )

        [%{label: "Loading...", value: :loading, disabled: true}]
@@ -292,11 +288,7 @@ defmodule WandererAppWeb.AccessListsLive do
  end

  @impl true
-  def handle_event(
-        "dropped",
-        %{"draggedId" => dragged_id, "dropzoneId" => dropzone_id},
-        %{assigns: %{access_list: access_list, members: members}} = socket
-      ) do
+  def handle_event("dropped", %{"draggedId" => dragged_id, "dropzoneId" => dropzone_id}, socket) do
    role_atom =
      [:admin, :manager, :member, :viewer, :blocked]
      |> Enum.find(fn role_atom -> to_string(role_atom) == dropzone_id end)
@@ -307,27 +299,13 @@ defmodule WandererAppWeb.AccessListsLive do

      role_atom ->
        member =
-          members
+          socket.assigns.members
          |> Enum.find(&(&1.id == dragged_id))

-        {:noreply, socket |> maybe_update_role(member, role_atom, access_list)}
+        {:noreply, socket |> maybe_update_role(member, role_atom, socket.assigns.access_list)}
    end
  end

-  @impl true
-  def handle_info(
-        {"update_role", %{member_id: member_id, role: role}},
-        %{assigns: %{access_list: access_list, members: members}} = socket
-      ) do
-    role_atom = role |> String.to_existing_atom()
-
-    member =
-      members
-      |> Enum.find(&(&1.id == member_id))
-
-    {:noreply, socket |> maybe_update_role(member, role_atom, access_list)}
-  end
-
  @impl true
  def handle_event("noop", _, socket) do
    {:noreply, socket}
@@ -347,33 +325,10 @@ defmodule WandererAppWeb.AccessListsLive do
      |> Enum.map(& &1.id)
      |> Enum.at(0)

-    uniq_search_req_id = UUID.uuid4(:default)
+    {:ok, options} = search(active_character_id, text)

-    Task.async(fn ->
-      {:ok, options} = search(active_character_id, text)
-
-      {:search_results, uniq_search_req_id, options}
-    end)
-
-    {:noreply, socket |> assign(uniq_search_req_id: uniq_search_req_id)}
-  end
-
-  def handle_info(
-        {ref, result},
-        %{assigns: %{member_search_id: member_search_id, uniq_search_req_id: uniq_search_req_id}} =
-          socket
-      )
-      when is_reference(ref) do
-    Process.demonitor(ref, [:flush])
-
-    case result do
-      {:search_results, ^uniq_search_req_id, options} ->
-        send_update(LiveSelect.Component, options: options, id: member_search_id)
-        {:noreply, socket |> assign(member_search_options: options)}
-
-      _ ->
-        {:noreply, socket}
-    end
+    send_update(LiveSelect.Component, options: options, id: socket.assigns.member_search_id)
+    {:noreply, socket |> assign(member_search_options: options)}
  end

  @impl true
@@ -448,7 +403,6 @@ defmodule WandererAppWeb.AccessListsLive do
      _ ->
        socket
        |> put_flash(:error, "You're not allowed to assign this role")
-        |> push_navigate(to: ~p"/access-lists/#{socket.assigns.selected_acl_id}")
    end
  end

@@ -457,11 +411,10 @@ defmodule WandererAppWeb.AccessListsLive do
         _member,
         _role_atom,
         _access_list
-       ),
-       do:
-         socket
-         |> put_flash(:info, "Only Characters can have Admin or Manager roles")
-         |> push_navigate(to: ~p"/access-lists/#{socket.assigns.selected_acl_id}")
+       ) do
+    socket
+    |> put_flash(:info, "Only Characters can have Admin or Manager roles")
+  end

  defp characters_has_role?(character_eve_ids, access_list, role_atom) do
    access_list.members
@@ -661,6 +614,27 @@ defmodule WandererAppWeb.AccessListsLive do
    """
  end

+  def member_item(assigns) do
+    ~H"""
+    <div class="flex items-center gap-2">
+      <.icon :if={not is_nil(@member.role)} name={member_role_icon(@member.role)} class="w-6 h-6" />
+      <div class="avatar">
+        <div class="rounded-md w-8 h-8">
+          <img src={member_icon_url(@member)} alt={@member.name} />
+        </div>
+      </div>
+      <%= @member.name %>
+    </div>
+    """
+  end
+
+  def member_role_icon(:admin), do: "hero-user-group-solid"
+  def member_role_icon(:manager), do: "hero-academic-cap-solid"
+  def member_role_icon(:member), do: "hero-user-solid"
+  def member_role_icon(:viewer), do: "hero-eye-solid"
+  def member_role_icon(:blocked), do: "hero-no-symbol-solid text-red-500"
+  def member_role_icon(_), do: "hero-cake-solid"
+
  def search_member_icon_url(%{character: true} = option),
    do: member_icon_url(%{eve_character_id: option.value})

--- a/lib/wanderer_app_web/live/access_lists/access_lists_live.html.heex
+++ b/lib/wanderer_app_web/live/access_lists/access_lists_live.html.heex
@@ -82,20 +82,14 @@
          id="acl_members"
        >
          <div
-            :for={member <- @members |> Enum.sort_by(&{&1.role, &1.name}, &<=/2)}
+            :for={member <- @members |> Enum.sort(&(&1.name < &2.name))}
            draggable="true"
            id={member.id}
            class="draggable !p-1 h-10 cursor-move bg-black bg-opacity-25 hover:text-white"
            data-dropzone="pool"
          >
            <div class="flex justify-between relative">
-              <.live_component
-                module={WandererAppWeb.AclMember}
-                id={"select_role_" <> member.id}
-                notify_to={self()}
-                member={member}
-                event_name="update_role"
-              />
+              <.member_item member={member} />
              <button
                :if={can_delete_member?(member, @access_list, @current_user)}
                class="z-10 absolute top-0 right-2"
@@ -156,71 +150,6 @@
  show
  on_cancel={JS.patch(~p"/access-lists/#{@selected_acl_id}")}
 >
-  <%!-- <div class="mt-4 mb-2 p-tabmenu p-component " data-pc-section="tabmenu">
-    <ul
-      class="p-tabmenu-nav border-none h-[25px] w-full flex"
-      role="menubar"
-      data-pc-section="menu"
-    >
-      <li
-        id="pr_id_17_0"
-        class="p-tabmenuitem p-highlight"
-        role="presentation"
-        data-p-highlight="true"
-        data-p-disabled="false"
-        data-pc-section="menuitem"
-      >
-        <a
-          href="#"
-          role="menuitem"
-          aria-label="Router Link"
-          tabindex="0"
-          class="p-menuitem-link"
-          data-pc-section="action"
-        >
-          <span class="p-menuitem-text" data-pc-section="label">Character</span>
-        </a>
-      </li>
-      <li
-        id="pr_id_17_1"
-        class="p-tabmenuitem"
-        role="presentation"
-        data-p-highlight="false"
-        data-p-disabled="false"
-        data-pc-section="menuitem"
-      >
-        <a
-          href="#"
-          role="menuitem"
-          aria-label="Programmatic"
-          tabindex="-1"
-          class="p-menuitem-link"
-          data-pc-section="action"
-        >
-          <span class="p-menuitem-text" data-pc-section="label">Corporation</span>
-        </a>
-      </li>
-      <li
-        id="pr_id_17_2"
-        class="p-tabmenuitem"
-        role="presentation"
-        data-p-highlight="false"
-        data-p-disabled="false"
-        data-pc-section="menuitem"
-      >
-        <a
-          href="#"
-          role="menuitem"
-          aria-label="External"
-          tabindex="-1"
-          class="p-menuitem-link"
-          data-pc-section="action"
-        >
-          <span class="p-menuitem-text" data-pc-section="label">Alliance</span>
-        </a>
-      </li>
-    </ul>
-  </div> --%>
  <.form :let={f} for={@member_form} phx-submit={@live_action}>
    <.live_select
      field={f[:member_id]}
--- a/lib/wanderer_app_web/live/access_lists/components/acl_member.ex
+++ b/lib/wanderer_app_web/live/access_lists/components/acl_member.ex
@@ -1,86 +0,0 @@
-defmodule WandererAppWeb.AclMember do
-  use WandererAppWeb, :live_component
-
-  use LiveViewEvents
-
-  @roles [
-    :admin,
-    :manager,
-    :member,
-    :viewer,
-    :blocked
-  ]
-
-  @impl true
-  def mount(socket) do
-    {:ok, socket |> assign(roles: get_roles())}
-  end
-
-  @impl true
-  def update(
-        %{
-          member: member
-        } = assigns,
-        socket
-      ) do
-    socket = handle_info_or_assign(socket, assigns)
-
-    {:ok,
-     socket
-     |> assign(member: member, form: to_form(%{"role" => member.role}))}
-  end
-
-  @impl true
-  def render(assigns) do
-    ~H"""
-    <div id={@id} class="flex items-center gap-2">
-      <.icon :if={not is_nil(@member.role)} name={member_role_icon(@member.role)} class="w-6 h-6" />
-      <.form :let={f} id={"role_form_" <> @id} for={@form} phx-change="select" phx-target={@myself}>
-        <.input
-          type="select"
-          field={f[:role]}
-          class="select h-8 min-h-[0px] !pt-1 !pb-1 text-sm bg-neutral-900 w-[70px]"
-          placeholder="Select a role..."
-          options={Enum.map(@roles, fn role -> {role.label, role.value} end)}
-        />
-      </.form>
-      <div class="avatar">
-        <div class="rounded-md w-8 h-8">
-          <img src={member_icon_url(@member)} alt={@member.name} />
-        </div>
-      </div>
-      <%= @member.name %>
-    </div>
-    """
-  end
-
-  @impl true
-  def handle_event(
-        "select",
-        %{"role" => role} = _params,
-        %{assigns: %{event_name: event_name, member: member, notify_to: notify_to}} = socket
-      ) do
-    notify_to(notify_to, event_name, %{
-      member_id: member.id,
-      role: role
-    })
-
-    {:noreply, socket}
-  end
-
-  def member_role_icon(:admin), do: "hero-user-group-solid"
-  def member_role_icon(:manager), do: "hero-academic-cap-solid"
-  def member_role_icon(:member), do: "hero-user-solid"
-  def member_role_icon(:viewer), do: "hero-eye-solid"
-  def member_role_icon(:blocked), do: "hero-no-symbol-solid text-red-500"
-  def member_role_icon(_), do: "hero-cake-solid"
-
-  def member_role_title(:admin), do: "Admin"
-  def member_role_title(:manager), do: "Manager"
-  def member_role_title(:member), do: "Member"
-  def member_role_title(:viewer), do: "Viewer"
-  def member_role_title(:blocked), do: "-blocked-"
-  def member_role_title(_), do: "-"
-
-  defp get_roles(), do: @roles |> Enum.map(&%{label: member_role_title(&1), value: &1})
-end
--- a/lib/wanderer_app_web/live/characters/characters_tracking_live.ex
+++ b/lib/wanderer_app_web/live/characters/characters_tracking_live.ex
@@ -41,7 +41,7 @@ defmodule WandererAppWeb.CharactersTrackingLive do
    selected_map = socket.assigns.maps |> Enum.find(&(&1.slug == map_slug))

    {:ok, character_settings} =
-      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(selected_map.id) do
+      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: selected_map.id}) do
        {:ok, settings} ->
          {:ok, settings}

@@ -83,7 +83,7 @@ defmodule WandererAppWeb.CharactersTrackingLive do

    case character_settings |> Enum.find(&(&1.character_id == character_id)) do
      nil ->
-        WandererApp.MapCharacterSettingsRepo.create(%{
+        WandererApp.Api.MapCharacterSettings.create(%{
          character_id: character_id,
          map_id: selected_map.id,
          tracked: true
@@ -95,18 +95,18 @@ defmodule WandererAppWeb.CharactersTrackingLive do
        case character_setting.tracked do
          true ->
            character_setting
-            |> WandererApp.MapCharacterSettingsRepo.untrack!()
+            |> WandererApp.Api.MapCharacterSettings.untrack!()

          _ ->
            character_setting
-            |> WandererApp.MapCharacterSettingsRepo.track!()
+            |> WandererApp.Api.MapCharacterSettings.track!()
        end
    end

    %{result: characters} = socket.assigns.characters

    {:ok, character_settings} =
-      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(selected_map.id) do
+      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: selected_map.id}) do
        {:ok, settings} -> {:ok, settings}
        _ -> {:ok, []}
      end
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex
@@ -75,7 +75,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
        } = socket
      ) do
    {:ok, character_settings} =
-      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
+      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
        {:ok, settings} -> {:ok, settings}
        _ -> {:ok, []}
      end
@@ -132,7 +132,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
      case character_settings |> Enum.find(&(&1.character_id == character_id)) do
        nil ->
          {:ok, map_character_settings} =
-            WandererApp.MapCharacterSettingsRepo.create(%{
+            WandererApp.Api.MapCharacterSettings.create(%{
              character_id: character_id,
              map_id: map_id,
              tracked: true
@@ -150,7 +150,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
            true ->
              {:ok, map_character_settings} =
                character_setting
-                |> WandererApp.MapCharacterSettingsRepo.untrack()
+                |> WandererApp.Api.MapCharacterSettings.untrack()

              character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)

@@ -166,7 +166,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
            _ ->
              {:ok, map_character_settings} =
                character_setting
-                |> WandererApp.MapCharacterSettingsRepo.track()
+                |> WandererApp.Api.MapCharacterSettings.track()

              character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)

@@ -184,7 +184,7 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
    user_character_eve_ids = map_characters |> Enum.map(& &1.eve_id)

    {:ok, character_settings} =
-      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
+      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
        {:ok, settings} -> {:ok, settings}
        _ -> {:ok, []}
      end
@@ -225,10 +225,10 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
  def has_tracked_characters?(_user_characters), do: true

  def get_tracked_map_characters(map_id, current_user) do
-    case WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(
-           map_id,
-           current_user.characters |> Enum.map(& &1.id)
-         ) do
+    case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
+           map_id: map_id,
+           character_ids: current_user.characters |> Enum.map(& &1.id)
+         }) do
      {:ok, settings} ->
        {:ok,
         settings
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_connections_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_connections_event_handler.ex
@@ -54,8 +54,7 @@ defmodule WandererAppWeb.MapConnectionsEventHandler do
    map_id
    |> WandererApp.Map.Server.add_connection(%{
      solar_system_source_id: solar_system_source_id |> String.to_integer(),
-      solar_system_target_id: solar_system_target_id |> String.to_integer(),
-      character_id: tracked_character_ids |> List.first()
+      solar_system_target_id: solar_system_target_id |> String.to_integer()
    })

    {:ok, _} =
@@ -123,7 +122,6 @@ defmodule WandererAppWeb.MapConnectionsEventHandler do
    method_atom =
      case param do
        "time_status" -> :update_connection_time_status
-        "type" -> :update_connection_type
        "mass_status" -> :update_connection_mass_status
        "ship_size_type" -> :update_connection_ship_size_type
        "locked" -> :update_connection_locked
@@ -134,7 +132,6 @@ defmodule WandererAppWeb.MapConnectionsEventHandler do
    key_atom =
      case param do
        "time_status" -> :time_status
-        "type" -> :type
        "mass_status" -> :mass_status
        "ship_size_type" -> :ship_size_type
        "locked" -> :locked
@@ -165,16 +162,6 @@ defmodule WandererAppWeb.MapConnectionsEventHandler do
    {:noreply, socket}
  end

-  def handle_ui_event(
-        "get_connection_info",
-        %{"from" => from, "to" => to} = _event,
-        %{assigns: %{map_id: map_id}} = socket
-      ) do
-    {:ok, info} = map_id |> get_connection_info(from, to)
-
-    {:reply, info, socket}
-  end
-
  def handle_ui_event(
        "get_passages",
        %{"from" => from, "to" => to} = _event,
@@ -207,19 +194,4 @@ defmodule WandererAppWeb.MapConnectionsEventHandler do

    {:ok, %{passages: passages}}
  end
-
-  defp get_connection_info(map_id, from, to) do
-    map_id
-    |> WandererApp.Map.Server.get_connection_info(%{
-      solar_system_source_id: "#{from}" |> String.to_integer(),
-      solar_system_target_id: "#{to}" |> String.to_integer()
-    })
-    |> case do
-      {:ok, info} ->
-        {:ok, info}
-
-      _ ->
-        {:ok, %{}}
-    end
-  end
 end
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex
@@ -41,10 +41,10 @@ defmodule WandererAppWeb.MapCoreEventHandler do

      %{track_character: track_character} ->
        {:ok, map_characters} =
-          case WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(
-                 map_id,
-                 current_user.characters |> Enum.map(& &1.id)
-               ) do
+          case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
+                 map_id: map_id,
+                 character_ids: current_user.characters |> Enum.map(& &1.id)
+               }) do
            {:ok, settings} ->
              {:ok,
               settings
@@ -258,7 +258,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
      )

    {:ok, character_settings} =
-      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
+      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
        {:ok, settings} -> {:ok, settings}
        _ -> {:ok, []}
      end
@@ -511,10 +511,10 @@ defmodule WandererAppWeb.MapCoreEventHandler do
  end

  defp get_tracked_map_characters(map_id, current_user) do
-    case WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(
-           map_id,
-           current_user.characters |> Enum.map(& &1.id)
-         ) do
+    case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
+           map_id: map_id,
+           character_ids: current_user.characters |> Enum.map(& &1.id)
+         }) do
      {:ok, settings} ->
        {:ok,
         settings
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_signatures_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_signatures_event_handler.ex
@@ -145,10 +145,7 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do

              if not is_nil(updated) do
                s
-                |> WandererApp.Api.MapSystemSignature.update(
-                  updated
-                  |> Map.put(:updated, System.os_time())
-                )
+                |> WandererApp.Api.MapSystemSignature.update(updated)
              end
            end)

@@ -228,7 +225,6 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
            |> Enum.filter(fn s -> s.eve_id == signature_eve_id end)
            |> Enum.each(fn s ->
              s
-              |> WandererApp.Api.MapSystemSignature.update_group!(%{group: "Wormhole"})
              |> WandererApp.Api.MapSystemSignature.update_linked_system(%{
                linked_system_id: solar_system_target
              })
@@ -316,11 +312,7 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
    do:
      system_id
      |> WandererApp.Api.MapSystemSignature.by_system_id!()
-      |> Enum.map(fn %{
-                       inserted_at: inserted_at,
-                       updated_at: updated_at,
-                       linked_system_id: linked_system_id
-                     } = s ->
+      |> Enum.map(fn %{updated_at: updated_at, linked_system_id: linked_system_id} = s ->
        s
        |> Map.take([
          :eve_id,
@@ -328,10 +320,10 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
          :description,
          :kind,
          :group,
-          :type
+          :type,
+          :updated_at
        ])
        |> Map.put(:linked_system, MapEventHandler.get_system_static_info(linked_system_id))
-        |> Map.put(:inserted_at, inserted_at |> Calendar.strftime("%Y/%m/%d %H:%M:%S"))
        |> Map.put(:updated_at, updated_at |> Calendar.strftime("%Y/%m/%d %H:%M:%S"))
      end)

--- a/lib/wanderer_app_web/live/maps/map_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/map_event_handler.ex
@@ -61,10 +61,8 @@ defmodule WandererAppWeb.MapEventHandler do
  @map_connection_ui_events [
    "manual_add_connection",
    "manual_delete_connection",
-    "get_connection_info",
    "get_passages",
    "update_connection_time_status",
-    "update_connection_type",
    "update_connection_mass_status",
    "update_connection_ship_size_type",
    "update_connection_locked",
@@ -155,7 +153,7 @@ defmodule WandererAppWeb.MapEventHandler do

  def handle_ui_event(event, body, socket)
      when event in @map_characters_ui_events,
-      do: MapCharactersEventHandler.handle_ui_event(event, body, socket)
+      do: MapSystemsEventHandler.handle_ui_event(event, body, socket)

  def handle_ui_event(event, body, socket)
      when event in @map_system_ui_events,
@@ -216,7 +214,6 @@ defmodule WandererAppWeb.MapEventHandler do
          solar_system_target: solar_system_target,
          mass_status: mass_status,
          time_status: time_status,
-          type: type,
          ship_size_type: ship_size_type,
          locked: locked
        } = _connection
@@ -225,7 +222,6 @@ defmodule WandererAppWeb.MapEventHandler do
        id: "#{solar_system_source}_#{solar_system_target}",
        mass_status: mass_status,
        time_status: time_status,
-        type: type,
        ship_size_type: ship_size_type,
        locked: locked,
        source: "#{solar_system_source}",
--- a/lib/wanderer_app_web/live/maps/maps_live.ex
+++ b/lib/wanderer_app_web/live/maps/maps_live.ex
@@ -848,9 +848,9 @@ defmodule WandererAppWeb.MapsLive do
          |> Enum.map(fn acl -> acl |> Ash.load!(:members) end)

        {:ok, characters_count} =
-          map.id
-          |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_all()
-          |> case do
+          case WandererApp.Api.MapCharacterSettings.tracked_by_map_all(%{
+                 map_id: map.id
+               }) do
            {:ok, settings} ->
              {:ok,
               settings
--- a/mix.exs
+++ b/mix.exs
@@ -2,7 +2,7 @@ defmodule WandererApp.MixProject do
  use Mix.Project

  @source_url "https://github.com/wanderer-industries/wanderer"
-  @version "1.20.1"
+  @version "1.13.7"

  def project do
    [
--- a/priv/repo/migrations/20240922090429_install_ash-functions_extension_4.exs
+++ b/priv/repo/migrations/20240922090429_install_ash-functions_extension_4.exs
@@ -0,0 +1,54 @@
+defmodule WandererApp.Repo.Migrations.InstallAshFunctionsExtension420240922090427 do
+  @moduledoc """
+  Installs any extensions that are mentioned in the repo's `installed_extensions/0` callback
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    execute("""
+    CREATE OR REPLACE FUNCTION uuid_generate_v7()
+    RETURNS UUID
+    AS $$
+    DECLARE
+      timestamp    TIMESTAMPTZ;
+      microseconds INT;
+    BEGIN
+      timestamp    = clock_timestamp();
+      microseconds = (cast(extract(microseconds FROM timestamp)::INT - (floor(extract(milliseconds FROM timestamp))::INT * 1000) AS DOUBLE PRECISION) * 4.096)::INT;
+
+      RETURN encode(
+        set_byte(
+          set_byte(
+            overlay(uuid_send(gen_random_uuid()) placing substring(int8send(floor(extract(epoch FROM timestamp) * 1000)::BIGINT) FROM 3) FROM 1 FOR 6
+          ),
+          6, (b'0111' || (microseconds >> 8)::bit(4))::bit(8)::int
+        ),
+        7, microseconds::bit(8)::int
+      ),
+      'hex')::UUID;
+    END
+    $$
+    LANGUAGE PLPGSQL
+    VOLATILE;
+    """)
+
+    execute("""
+    CREATE OR REPLACE FUNCTION timestamp_from_uuid_v7(_uuid uuid)
+    RETURNS TIMESTAMP WITHOUT TIME ZONE
+    AS $$
+      SELECT to_timestamp(('x0000' || substr(_uuid::TEXT, 1, 8) || substr(_uuid::TEXT, 10, 4))::BIT(64)::BIGINT::NUMERIC / 1000);
+    $$
+    LANGUAGE SQL
+    IMMUTABLE PARALLEL SAFE STRICT;
+    """)
+  end
+
+  def down do
+    # Uncomment this if you actually want to uninstall the extensions
+    # when this migration is rolled back:
+    execute("DROP FUNCTION IF EXISTS uuid_generate_v7(), timestamp_from_uuid_v7(uuid)")
+  end
+end
--- a/priv/repo/migrations/20241119140514_add_signature_updated.exs
+++ b/priv/repo/migrations/20241119140514_add_signature_updated.exs
@@ -1,21 +0,0 @@
-defmodule WandererApp.Repo.Migrations.AddSignatureUpdated do
-  @moduledoc """
-  Updates resources based on their most recent snapshots.
-
-  This file was autogenerated with `mix ash_postgres.generate_migrations`
-  """
-
-  use Ecto.Migration
-
-  def up do
-    alter table(:map_system_signatures_v1) do
-      add :updated, :bigint
-    end
-  end
-
-  def down do
-    alter table(:map_system_signatures_v1) do
-      remove :updated
-    end
-  end
-end
--- a/priv/repo/migrations/20241122091348_add_connection_type.exs
+++ b/priv/repo/migrations/20241122091348_add_connection_type.exs
@@ -1,21 +0,0 @@
-defmodule WandererApp.Repo.Migrations.AddConnectionType do
-  @moduledoc """
-  Updates resources based on their most recent snapshots.
-
-  This file was autogenerated with `mix ash_postgres.generate_migrations`
-  """
-
-  use Ecto.Migration
-
-  def up do
-    alter table(:map_chain_v1) do
-      add :type, :bigint, default: 0
-    end
-  end
-
-  def down do
-    alter table(:map_chain_v1) do
-      remove :type
-    end
-  end
-end
--- a/priv/resource_snapshots/repo/map_chain_v1/20241122091349.json
+++ b/priv/resource_snapshots/repo/map_chain_v1/20241122091349.json
@@ -1,178 +0,0 @@
-{
-  "attributes": [
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"gen_random_uuid()\")",
-      "generated?": false,
-      "primary_key?": true,
-      "references": null,
-      "size": null,
-      "source": "id",
-      "type": "uuid"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "solar_system_source",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "solar_system_target",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": true,
-      "default": "0",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "mass_status",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": true,
-      "default": "0",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "time_status",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": true,
-      "default": "1",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "ship_size_type",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": true,
-      "default": "0",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "type",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "wormhole_type",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "0",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "count_of_passage",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "locked",
-      "type": "boolean"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "custom_info",
-      "type": "text"
-    },
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "inserted_at",
-      "type": "utc_datetime_usec"
-    },
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "updated_at",
-      "type": "utc_datetime_usec"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": {
-        "deferrable": false,
-        "destination_attribute": "id",
-        "destination_attribute_default": null,
-        "destination_attribute_generated": null,
-        "index?": false,
-        "match_type": null,
-        "match_with": null,
-        "multitenancy": {
-          "attribute": null,
-          "global": null,
-          "strategy": null
-        },
-        "name": "map_chain_v1_map_id_fkey",
-        "on_delete": null,
-        "on_update": null,
-        "primary_key?": true,
-        "schema": "public",
-        "table": "maps_v1"
-      },
-      "size": null,
-      "source": "map_id",
-      "type": "uuid"
-    }
-  ],
-  "base_filter": null,
-  "check_constraints": [],
-  "custom_indexes": [],
-  "custom_statements": [],
-  "has_create_action": true,
-  "hash": "D9587518CE16355CA4FB501321848465A3E1DDD7800563069242249DA0B4C389",
-  "identities": [],
-  "multitenancy": {
-    "attribute": null,
-    "global": null,
-    "strategy": null
-  },
-  "repo": "Elixir.WandererApp.Repo",
-  "schema": null,
-  "table": "map_chain_v1"
-}
--- a/priv/resource_snapshots/repo/map_system_signatures_v1/20241119140514.json
+++ b/priv/resource_snapshots/repo/map_system_signatures_v1/20241119140514.json
@@ -1,187 +0,0 @@
-{
-  "attributes": [
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"gen_random_uuid()\")",
-      "generated?": false,
-      "primary_key?": true,
-      "references": null,
-      "size": null,
-      "source": "id",
-      "type": "uuid"
-    },
-    {
-      "allow_nil?": false,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "eve_id",
-      "type": "text"
-    },
-    {
-      "allow_nil?": false,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "character_eve_id",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "name",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "description",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "type",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "linked_system_id",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "kind",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "group",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "updated",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "inserted_at",
-      "type": "utc_datetime_usec"
-    },
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "updated_at",
-      "type": "utc_datetime_usec"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": {
-        "deferrable": false,
-        "destination_attribute": "id",
-        "destination_attribute_default": null,
-        "destination_attribute_generated": null,
-        "index?": false,
-        "match_type": null,
-        "match_with": null,
-        "multitenancy": {
-          "attribute": null,
-          "global": null,
-          "strategy": null
-        },
-        "name": "map_system_signatures_v1_system_id_fkey",
-        "on_delete": null,
-        "on_update": null,
-        "primary_key?": true,
-        "schema": "public",
-        "table": "map_system_v1"
-      },
-      "size": null,
-      "source": "system_id",
-      "type": "uuid"
-    }
-  ],
-  "base_filter": null,
-  "check_constraints": [],
-  "custom_indexes": [],
-  "custom_statements": [],
-  "has_create_action": true,
-  "hash": "6A255286EC34371C26500578C2B991D604C154AB4751B8F1EFBE4E7E61AA6F2D",
-  "identities": [
-    {
-      "all_tenants?": false,
-      "base_filter": null,
-      "index_name": "map_system_signatures_v1_uniq_system_eve_id_index",
-      "keys": [
-        {
-          "type": "atom",
-          "value": "system_id"
-        },
-        {
-          "type": "atom",
-          "value": "eve_id"
-        }
-      ],
-      "name": "uniq_system_eve_id",
-      "nils_distinct?": true,
-      "where": null
-    }
-  ],
-  "multitenancy": {
-    "attribute": null,
-    "global": null,
-    "strategy": null
-  },
-  "repo": "Elixir.WandererApp.Repo",
-  "schema": null,
-  "table": "map_system_signatures_v1"
-}
Author	SHA1	Message	Date
Dmitry Popov	b1f1098df6	chore: release version v1.13.7	2024-10-31 22:56:59 +01:00
Dmitry Popov	ed5d824c0a	refactor(Map): Map event handling refactoring	2024-10-31 19:19:23 +01:00
Dmitry Popov	d8e4631981	refactor(Map): Map event handling refactoring	2024-10-31 19:19:07 +01:00