diff --git a/wg-voidships-builder/packs/wg-voidship-archeotech.db b/wg-voidships-builder/packs/wg-voidship-archeotech.db
index 3224210..d8470a6 100644
--- a/wg-voidships-builder/packs/wg-voidship-archeotech.db
+++ b/wg-voidships-builder/packs/wg-voidship-archeotech.db
@@ -1,12 +1,16 @@
-{"_id":"0cc5c3b3a915adf7","name":"Castellan Shield","type":"gear","img":null,"system":{"description":"Ancient projection-field array that can extend protection beyond the host hull. Temperamental and zealously maintained by dedicated Tech-Priests.","keywords":"VOIDSHIP, ARCHEOTECH, SHIELDS","value":0,"rarity":"very rare","source":"Archeotech Components (RT)"}}
-{"_id":"a2aab0f18b9e4b9d","name":"Castellan Shield Array","type":"gear","img":null,"system":{"description":"Expanded castellum of emitters tuned for fleet support—projects a formidable ward to nearby vessels at grotesque power cost.","keywords":"VOIDSHIP, ARCHEOTECH, SHIELDS","value":0,"rarity":"very rare","source":"Archeotech Components (RT)"}}
-{"_id":"ed965d6a2b3c1a65","name":"Cogitator Interlink","type":"gear","img":null,"system":{"description":"Ancient datalooms and logic-engines that interlink bridge, augurs and gunnery pits, smoothing latency and improving battle rhythm.","keywords":"VOIDSHIP, ARCHEOTECH, BRIDGE","value":0,"rarity":"very rare","source":"Archeotech Components (RT)"}}
-{"_id":"2f96e98996b2414b","name":"Energistic Conversion Matrix","type":"gear","img":null,"system":{"description":"Relic matrix that reclaims waste energies throughout the ship and feeds them back into the grid; miraculous efficiency at inscrutable risk.","keywords":"VOIDSHIP, ARCHEOTECH, DRIVE","value":0,"rarity":"very rare","source":"Archeotech Components (RT)"}}
-{"_id":"b1d5aa8f4a6b2e1a","name":"Gyro-Stabilization Matrix","type":"gear","img":null,"system":{"description":"Deep-keel stabilisers and vanes governed by pre-Imperial machine-logic; lessen recoil and improve tracking solutions.","keywords":"VOIDSHIP, ARCHEOTECH, MANOEUVRE","value":0,"rarity":"very rare","source":"Archeotech Components (RT)"}}
-{"_id":"9e875efc3b2a4d1c","name":"Staravar Laser Macrobattery","type":"weapon","img":null,"system":{"category":"ranged","damage":{"base":12,"bonus":0,"rank":0,"ed":{"base":2,"bonus":0,"rank":0},"ap":{"base":-1,"bonus":0,"rank":0},"enabled":false,"otherDamage":{"mortal":"0","shock":"0","wounds":"0"}},"range":{"short":30,"medium":60,"long":120,"melee":1,"thrown":null},"salvo":2,"traits":{"list":[{"name":"volley","rating":"2"}]},"description":"Archeotech laser batteries from the Staravar school, famed for peerless coherence and range.","keywords":"VOIDSHIP, ARCHEOTECH, MACROLASERS","source":"Archeotech Components (RT)"}}
-{"_id":"4a3d2c1b0e9f8a77","name":"Star-Flare Lance","type":"weapon","img":null,"system":{"category":"ranged","damage":{"base":12,"bonus":0,"rank":0,"ed":{"base":2,"bonus":0,"rank":0},"ap":{"base":-1,"bonus":0,"rank":0},"enabled":false,"otherDamage":{"mortal":"0","shock":"0","wounds":"0"}},"range":{"short":30,"medium":60,"long":120,"melee":1,"thrown":null},"salvo":2,"traits":{"list":[{"name":"lance","rating":"-"}]},"description":"A lance emitter of pre-Imperial refinement; slices armour with unsettling ease and little thermal bloom.","keywords":"VOIDSHIP, ARCHEOTECH, LANCE","source":"Archeotech Components (RT)"}}
-{"_id":"arch-ancient-life-sustainer","name":"Ancient Life Sustainer","type":"gear","img":null,"system":{"description":"Archaiczny, wysokoefektywny podtrzymywacz życia z rozległą siecią przewodów i oczyszczaczy. Podnosi morale załogi i ogranicza straty załogi od nie-bojowych przyczyn; pełni rolę Life Sustainer.","keywords":"VOIDSHIP, ARCHEOTECH, LIFE-SUSTAINER","rarity":"extremely rare","source":"RT Core (205–210)"}}
-{"_id":"arch-modified-drive","name":"Modified Drive","type":"gear","img":null,"system":{"description":"Starożytny napęd STC z egzotycznych materiałów i nietypowej konstrukcji. Zwiększa prędkość okrętu, a jednocześnie ogranicza zajmowaną przestrzeń napędu; kapryśny w eksploatacji.","keywords":"VOIDSHIP, ARCHEOTECH, DRIVE","rarity":"extremely rare","source":"RT Core (205–210)"}}
-{"_id":"arch-bridge-of-antiquity","name":"Bridge of Antiquity","type":"gear","img":null,"system":{"description":"Mostek-relikt z epok przedimperialnych: rozbudowane loże dowódcze, antyczne interfejsy i sakralne pulpita. Ułatwia koordynację działań i przegląd sensorażu.","keywords":"VOIDSHIP, ARCHEOTECH, BRIDGE","rarity":"extremely rare","source":"RT Core (205–210)"}}
-{"_id":"arch-auto-logis-targeter","name":"Auto-stabilised Logis-targeter (Archeotech)","type":"gear","img":null,"system":{"description":"Zabytek mechanologicznym – stabilizowane cogitatory balistyczne, które poprawiają celność baterii makro i zgrywają ogień z rozwiązaniami mostka.","keywords":"VOIDSHIP, ARCHEOTECH, GUNNERY","rarity":"extremely rare","source":"RT Core (205–210)"}}
-{"_id":"arch-teleportarium","name":"Teleportarium (Archeotech)","type":"gear","img":null,"system":{"description":"Krótkozasięgowy translator materii. Umożliwia błyskawiczne naloty abordażowe i ewakuację; obciążony ciężkimi restrykcjami i ryzykiem.","keywords":"VOIDSHIP, ARCHEOTECH, BOARDING","rarity":"extremely rare","source":"RT Core (205–210)"}}
+{"_id":"ARCH000000000001","name":"Teleportarium","type":"gear","img":"icons/svg/portal.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"teleport","tags":["archeotech","teleport","boarding"]},"voidOnly":true}},"system":{"description":"Krótkozasięgowy translator materii używany do abordażu/ewakuacji. W RT pozwala na natychmiastowe desanty z ryzykiem zakłóceń empirycznych. (RT/BFK)","voidship":{"slot":"Internal","use":{"space":1,"power":4},"mods":{"armour":0,"integrity":0,"manoeuvre":0,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000002","name":"Empyrean Mantle","type":"gear","img":"icons/svg/wing.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"mantle","tags":["archeotech","stealth","defence"]},"voidOnly":true}},"system":{"description":"Zasłona empiryczna tłumiąca echo energetyczne okrętu i utrudniająca namierzenie. (IT/BFK)","voidship":{"slot":"Internal","use":{"space":1,"power":2},"mods":{"armour":0,"integrity":0,"manoeuvre":1,"detection":2,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000003","name":"Warpsbane Hull","type":"gear","img":"icons/svg/anchor.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"warpsbane","tags":["archeotech","hull","defence"]},"voidOnly":true}},"system":{"description":"Konsekrowane pancerze i relikwiarze ograniczające anomalie Immaterium. (IT)","voidship":{"slot":"Internal","use":{"space":2,"power":0},"mods":{"armour":1,"integrity":6,"manoeuvre":0,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000004","name":"Starchart Cogitator","type":"gear","img":"icons/svg/book.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"nav","tags":["archeotech","sensor","navigation"]},"voidOnly":true}},"system":{"description":"Gwiezdne kogitatory i mapy sprzed Ery Ciemności; ułatwiają pozycjonowanie i kalkulacje nawigacyjne. (BFK)","voidship":{"slot":"Aetherics","use":{"space":1,"power":1},"mods":{"armour":0,"integrity":0,"manoeuvre":0,"detection":2,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000005","name":"Auto-Temple","type":"gear","img":"icons/svg/holy-symbol.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"morale","tags":["archeotech","crew"]},"voidOnly":true}},"system":{"description":"Zautomatyzowana kaplica i rytuały podnoszące morale. W RT redukuje straty/niepokoje; w W&G modelujemy jako +Integrity (abstrakcja).","voidship":{"slot":"Internal","use":{"space":1,"power":1},"mods":{"armour":0,"integrity":2,"manoeuvre":0,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000006","name":"Castellan Shield","type":"gear","img":"icons/svg/shield.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"castellan","tags":["archeotech","shield","support"]},"voidOnly":true}},"system":{"description":"Archaiczny układ projekcyjny osłon; potrafi wzmacniać ochronę własną i—w ograniczonym zakresie—sojuszników w pobliżu. (RT Archeotech)","voidship":{"slot":"Internal","use":{"space":2,"power":8},"mods":{"armour":0,"integrity":6,"manoeuvre":0,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000007","name":"Castellan Shield Array","type":"gear","img":"icons/svg/shield.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"castellan-array","tags":["archeotech","shield","support"]},"voidOnly":true}},"system":{"description":"Rozbudowana wieża kastelańska o zwiększonym zasięgu projekcji tarcz; koszmarne zużycie mocy. (RT Archeotech)","voidship":{"slot":"Internal","use":{"space":3,"power":12},"mods":{"armour":0,"integrity":8,"manoeuvre":0,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000008","name":"Cogitator Interlink","type":"gear","img":"icons/svg/book.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"interlink","tags":["archeotech","bridge","gunnery"]},"voidOnly":true}},"system":{"description":"Reliktowe dataloomy spajające mostek, auspeksy i jamy artyleryjskie; wygładzają latencję i cykl ogniowy. (RT Archeotech)","voidship":{"slot":"Internal","use":{"space":1,"power":2},"mods":{"armour":0,"integrity":0,"manoeuvre":0,"detection":2,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000009","name":"Energistic Conversion Matrix","type":"gear","img":"icons/svg/energy.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"conversion-matrix","tags":["archeotech","reactor","efficiency"]},"voidOnly":true}},"system":{"description":"Macierz odzysku energii wtórnej; „cudowna” sprawność przy nieprzewidywalnych efektach ubocznych. (RT Archeotech)","voidship":{"slot":"Internal","use":{"space":2,"power":1},"mods":{"armour":0,"integrity":0,"manoeuvre":0,"detection":0,"speed":0,"space":0,"power":6}}},"effects":[]}
+{"_id":"ARCH000000000010","name":"Gyro-Stabilization Matrix","type":"gear","img":"icons/svg/compass.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"gyro","tags":["archeotech","manoeuvre","stability"]},"voidOnly":true}},"system":{"description":"Głębokokilowe stabilizatory i stery zarządzane maszynologicą sprzed Imperium; lepsze śledzenie i odrzut. (RT Archeotech)","voidship":{"slot":"Internal","use":{"space":1,"power":1},"mods":{"armour":0,"integrity":0,"manoeuvre":2,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000011","name":"Staravar Laser Macrobattery (Dorsal)","type":"gear","img":"icons/svg/explosion.svg","flags":{"wg-voidships-builder":{"component":{"kind":"weapon","subtype":"macro-laser","tags":["archeotech","weapon","laser","dorsal"]},"voidOnly":true}},"system":{"description":"Szkoła Staravar: znakomita koherencja i zasięg. W RT to archeotechowa bateria laserowa. Slot: Dorsal.","voidship":{"slot":"Dorsal","use":{"space":2,"power":5},"mods":{"armour":0,"integrity":0,"manoeuvre":0,"detection":1,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000012","name":"Star-Flare Lance (Prow)","type":"gear","img":"icons/svg/sword.svg","flags":{"wg-voidships-builder":{"component":{"kind":"weapon","subtype":"lance-starflare","tags":["archeotech","weapon","lance","prow"]},"voidOnly":true}},"system":{"description":"Przedimperialny emiter lancy o „chłodnym” przekroju termicznym, tnie pancerze z niepokojącą łatwością. Slot: Prow.","voidship":{"slot":"Prow","use":{"space":3,"power":7},"mods":{"armour":0,"integrity":0,"manoeuvre":0,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000013","name":"Ancient Life Sustainer","type":"gear","img":"icons/svg/stoned-tower.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"life-sustainer","tags":["archeotech","life-sustainer","support"]},"voidOnly":true}},"system":{"description":"Archaiczny, wysoko-efektywny podtrzymywacz życia i filtracja. W RT poprawia komfort/straty; tu daje lekki buff integralności. (RT Core)","voidship":{"slot":"Internal","use":{"space":2,"power":2},"mods":{"armour":0,"integrity":2,"manoeuvre":0,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000014","name":"Modified Drive (Archeotech)","type":"gear","img":"icons/svg/wing.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"drive-modified","tags":["archeotech","drive"]},"voidOnly":true}},"system":{"description":"Reliktowy napęd STC o nietypowej konstrukcji; wyższa prędkość i odzysk przestrzeni kosztem kaprysów serwisowych. (RT Core)","voidship":{"slot":"Internal","use":{"space":8,"power":3},"mods":{"armour":0,"integrity":0,"manoeuvre":0,"detection":0,"speed":1,"space":3,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000015","name":"Bridge of Antiquity","type":"gear","img":"icons/svg/book.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"bridge-antiquity","tags":["archeotech","bridge"]},"voidOnly":true}},"system":{"description":"Reliktowy mostek: loże dowódcze, antyczne interfejsy. Ułatwia koordynację i sensoraż. (RT Core)","voidship":{"slot":"Internal","use":{"space":2,"power":3},"mods":{"armour":0,"integrity":0,"manoeuvre":1,"detection":2,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"ARCH000000000016","name":"Auto-stabilised Logis-targeter","type":"gear","img":"icons/svg/crosshair.svg","flags":{"wg-voidships-builder":{"component":{"kind":"archeotech","subtype":"logis-targeter","tags":["archeotech","gunnery","weapon-mod"]},"voidOnly":true}},"system":{"description":"Stabilizowane kogitatory balistyczne poprawiające celność baterii. W praktyce lepsza akwizycja celów i synchronizacja ognia. (RT Core)","voidship":{"slot":"Internal","use":{"space":1,"power":2},"mods":{"armour":0,"integrity":0,"manoeuvre":0,"detection":2,"speed":0,"space":0,"power":0}}},"effects":[]}
diff --git a/wg-voidships-builder/packs/wg-voidship-xenos.db b/wg-voidships-builder/packs/wg-voidship-xenos.db
index 7662d69..92d1abd 100644
--- a/wg-voidships-builder/packs/wg-voidship-xenos.db
+++ b/wg-voidships-builder/packs/wg-voidship-xenos.db
@@ -1,6 +1,5 @@
-{"_id":"2a8c7c6b5d4e3f21","name":"Xenos Habitats","type":"gear","img":null,"system":{"description":"Specialist compartments and atmospherics for transporting or housing alien beings and crews. Includes containment precautions and adaptable life-support matrices.","keywords":"VOIDSHIP, XENOS, QUARTERS","value":0,"rarity":"rare","source":"Into the Storm, p. 161"}}
-{"_id":"xeno-ghost-field","name":"Ghost Field","type":"gear","img":null,"system":{"description":"Eldarski „widmowy” ekran tworzący fałszywe echo jednostki i myliący wrogie augury. W akcji wymusza wybór: tarcze osłonowe albo ghost field.","keywords":"VOIDSHIP, XENOS, SHIELDS","rarity":"near unique","source":"RT Core (205–210)"}}
-{"_id":"xeno-shard-cannon-battery","name":"Shard Cannon Battery","type":"weapon","img":null,"system":{"category":"ranged","damage":{"base":12,"bonus":0,"rank":0,"ed":{"base":2,"bonus":0,"rank":0},"ap":{"base":-1,"bonus":0,"rank":0},"enabled":false,"otherDamage":{"mortal":"0","shock":"0","wounds":"0"}},"range":{"short":30,"medium":60,"long":120},"salvo":2,"traits":{"list":[{"name":"xenos-tech","rating":"-"}]},"description":"Obca, autonomiczna bateria „odłamkowa” – nie wymaga standardowego zasilania ani amunicji; jej charakterystyka bojowa odbiega od imperialnych norm.","keywords":"VOIDSHIP, XENOS, MACROBATT","rarity":"near unique","source":"RT Core (205–210)"}}
-{"_id":"xeno-runecaster","name":"Runecaster","type":"gear","img":null,"system":{"description":"Węzeł runiczny (eldarski) wspierający sensoraż i nawigację; generuje „rune-echoes” poprawiające wykrywanie i maskowanie.","keywords":"VOIDSHIP, XENOS, AUGUR","rarity":"near unique","source":"RT Core (205–210)"}}
-{"_id":"xeno-micro-laser-defence-grid","name":"Micro Laser Defence Grid","type":"gear","img":null,"system":{"description":"Drobno-segmentowa siatka mikro-laserów przechwytująca bliskie cele (bomby, torpedy, drobne łodzie); rośnie szansa zestrzelenia zagrożeń zbliżeniowych.","keywords":"VOIDSHIP, XENOS, POINT-DEFENCE","rarity":"near unique","source":"RT Core (205–210)"}}
-{"_id":"xeno-gravity-sails","name":"Gravity Sails","type":"gear","img":null,"system":{"description":"Grawito-żagle (często spotykane u Eldarów) pozwalające na niemal bezgłośny napęd przy minimalnej sygnaturze; idealne do skrytych przelotów.","keywords":"VOIDSHIP, XENOS, DRIVE","rarity":"near unique","source":"RT Core (205–210)"}}
+{"_id":"XENO000000000001","name":"Eldar Solar Sails","type":"gear","img":"icons/svg/wing.svg","flags":{"wg-voidships-builder":{"component":{"kind":"xenos","subtype":"eldar-sails","tags":["xenos","eldar","propulsion"]},"voidOnly":true}},"system":{"description":"Żagle solarne Aeldari — ciche, wysokosprawne napędy żaglowe. W RT zmniejszają zużycie mocy/ślad; u nas: +Speed i +Power (pula).","voidship":{"slot":"Internal","use":{"space":2,"power":0},"mods":{"armour":0,"integrity":0,"manoeuvre":1,"detection":0,"speed":1,"space":0,"power":2}}},"effects":[]}
+{"_id":"XENO000000000002","name":"Eldar Holofield","type":"gear","img":"icons/svg/mystery-man.svg","flags":{"wg-voidships-builder":{"component":{"kind":"xenos","subtype":"eldar-holofield","tags":["xenos","eldar","defence"]},"voidOnly":true}},"system":{"description":"Holo-osłony rozszczepiające obraz i echo sensorażu — trudniej trafić i namierzyć.","voidship":{"slot":"Internal","use":{"space":2,"power":4},"mods":{"armour":0,"integrity":3,"manoeuvre":2,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"XENO000000000003","name":"Ork Kustom Force Field","type":"gear","img":"icons/svg/shield.svg","flags":{"wg-voidships-builder":{"component":{"kind":"xenos","subtype":"ork-kff","tags":["xenos","ork","defence"]},"voidOnly":true}},"system":{"description":"‘Kustom’ pole siłowe Mekboyów — bardzo mocne, bardzo kapryśne.","voidship":{"slot":"Internal","use":{"space":3,"power":6},"mods":{"armour":0,"integrity":6,"manoeuvre":-1,"detection":-1,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"XENO000000000004","name":"Ork Reinforced Ram Prow","type":"gear","img":"icons/svg/anchor.svg","flags":{"wg-voidships-builder":{"component":{"kind":"xenos","subtype":"ork-ram","tags":["xenos","ork","prow"]},"voidOnly":true}},"system":{"description":"Mega-rampa do taranowania — i do ‘wygrywania’ dyskusji na krótkim dystansie.","voidship":{"slot":"Internal","use":{"space":1,"power":0},"mods":{"armour":3,"integrity":2,"manoeuvre":-1,"detection":0,"speed":0,"space":0,"power":0}}},"effects":[]}
+{"_id":"XENO000000000005","name":"Eldar Targeting Matrix (Dorsal)","type":"gear","img":"icons/svg/crosshair.svg","flags":{"wg-voidships-builder":{"component":{"kind":"xenos","subtype":"eldar-matrix","tags":["xenos","eldar","weapon-mod","dorsal"]},"voidOnly":true}},"system":{"description":"Aeldari macierz celownicza wzmacniająca akwizycję i śledzenie celów. Działa najlepiej z bateriami dorsalnymi.","voidship":{"slot":"Dorsal","use":{"space":1,"power":2},"mods":{"armour":0,"integrity":0,"manoeuvre":0,"detection":2,"speed":0,"space":0,"power":0}}},"effects":[]}
diff --git a/wg-voidships-builder/scripts/voidship-actor.js b/wg-voidships-builder/scripts/voidship-actor.js
index 2ab6bbd..a180433 100644
--- a/wg-voidships-builder/scripts/voidship-actor.js
+++ b/wg-voidships-builder/scripts/voidship-actor.js
@@ -83,13 +83,18 @@ class VoidshipSheet extends ActorSheet {
   const VB_MOD = "wg-voidships-builder";
 
   // Flagowe źródła (przeżywają migracje W&G)
-  const flags = actor.getFlag(VB_MOD, "") || {};
-  const hull = flags.hull || { class: actor.name, size: "Cruiser", slots: { prow: 0, dorsal: 0, port: 0, starboard: 0, keel: 0 } };
-  const base = flags.base || { armour: 0, integrity: 0, manoeuvre: 0, detection: 0, speed: 0, space: 0, power: 0 };
-  const crew = flags.crew || { command: 0, pilot: 0, sensors: 0, engineering: 0, gunnery: 0, security: 0, flightDeck: 0, passengers: 0 };
+// czytaj flagi wprost z actor.flags[namespace] (albo pojedyncze klucze)
+const flagsNs = actor.flags?.[VB_MOD] || {};
+const defaultHull = { class: actor.name, size: "Cruiser", slots: { prow: 0, dorsal: 0, port: 0, starboard: 0, keel: 0 } };
+const defaultBase = { armour: 0, integrity: 0, manoeuvre: 0, detection: 0, speed: 0, space: 0, power: 0 };
+const defaultCrew = { command: 0, pilot: 0, sensors: 0, engineering: 0, gunnery: 0, security: 0, flightDeck: 0, passengers: 0 };
+
+const hull = actor.getFlag(VB_MOD, "hull") ?? flagsNs.hull ?? defaultHull;
+const base = actor.getFlag(VB_MOD, "base") ?? flagsNs.base ?? defaultBase;
+const crew = actor.getFlag(VB_MOD, "crew") ?? flagsNs.crew ?? defaultCrew;
+
+const rtRaw = actor.getFlag(VB_MOD, "rtRaw") ?? flagsNs.rtRaw ?? {};
 
-  // RT snapshot (jak dotąd)
-  const rtRaw = actor.getFlag(VB_MOD, "rtRaw") || {};
   const rt = rtRaw.rt || {};
   const rtCard = {
     speed: rt.speed ?? rtRaw.combat?.speed ?? 0,
@@ -207,14 +212,16 @@ class VoidshipSheet extends ActorSheet {
     warnings.capacity = "Not enough Space/Power for installed components.";
 
   // wstrzyknij do template
-  data.hull = hull;
-  data.base = base;
-  data.crew = crew;
-  data.rtCard = rtCard;
-  data.components = components;
-  data.slotsUsed = slotsUsed;
-  data.totals = totals;
-  data.warnings = warnings;
+data.hull = hull;
+data.base = base;
+data.crew = crew;
+data.rtCard = rtCard;
+data.components = components;
+data.slotsUsed = slotsUsed;
+data.totals = totals;
+data.mods = modsSum;          // ← DODANE: żeby HBS miał liczby modów
+data.warnings = warnings;
+
 
   dbg("sheet.getData", { base, hull, totals, slotsUsed, componentsCount: components.length });
   return data;
diff --git a/wg-voidships-builder/templates/voidship-sheet.hbs b/wg-voidships-builder/templates/voidship-sheet.hbs
index d5e8453..a85cb52 100644
--- a/wg-voidships-builder/templates/voidship-sheet.hbs
+++ b/wg-voidships-builder/templates/voidship-sheet.hbs
@@ -56,13 +56,14 @@
         <div class="card">
           <h3>Base (flags)</h3>
           <ol class="properties">
-            <li>Armour: <b>{{base.armour}}</b></li>
-            <li>Integrity: <b>{{base.integrity}}</b></li>
-            <li>Manoeuvre: <b>{{base.manoeuvre}}</b></li>
-            <li>Detection: <b>{{base.detection}}</b></li>
-            <li>Speed: <b>{{base.speed}}</b></li>
-            <li>Space: <b>{{base.space}}</b></li>
-            <li>Power: <b>{{base.power}}</b></li>
+<li>Armour: <b>{{totals.armour}}</b></li>
+<li>Integrity: <b>{{totals.integrity}}</b></li>
+<li>Manoeuvre: <b>{{totals.manoeuvre}}</b></li>
+<li>Detection: <b>{{totals.detection}}</b></li>
+<li>Speed: <b>{{totals.speed}}</b></li>
+<li>Space (free/total): <b>{{totals.spaceFree}}</b> / <b>{{totals.space}}</b></li>
+<li>Power (free/total): <b>{{totals.powerFree}}</b> / <b>{{totals.power}}</b></li>
+
           </ol>
         </div>