17 files changed, 293 insertions, 302 deletions
diff --git a/base/ini/factions.ini b/base/ini/factions.ini
index 4d5df22..4968832 100644
--- a/base/ini/factions.ini
+++ b/base/ini/factions.ini
@@ -42,7 +42,25 @@ color=106 95 87
 colorsecond=152 166 169
 
 [faction]
+label=research
+name=Central Research
+colorsecond=152 166 169
+color=106 95 87
+
+[faction]
+label=independent
+name=Independent
+color=0.7 0.7 0.9
+colorsecond=0.7 0.8 0.95
+
+[faction]
 label=pirates
 name=Pirates
 color=158 0 255
 colorsecond=140 140 180
+
+[faction]
+label=tsukhan
+color=127 26 127
+colorsecond=0 0 0
+
diff --git a/base/ini/templates.ini b/base/ini/templates.ini
index c433682..667c4b4 100644
--- a/base/ini/templates.ini
+++ b/base/ini/templates.ini
@@ -8,10 +8,21 @@
 [template]
 label=navpoint
 model=maps/static/navpoint
-radius=0.25
+radius=0.20
 
 ; the cargopod template is used by the game code
 [template]
 label=cargopod
 model=maps/cargo/pod
 radius=0.1
+
+; the jumppoint template is used by the game code
+[template]
+label=jumppoint
+color=0.0 0.8 0.8
+colorsecond=0.6 0.6 0.6
+
+; the jumpgate template is used by the game code
+[template]
+label=jumpgate
+model=maps/colonial/jumpgate
diff --git a/base/ini/world.ini b/base/ini/world.ini
index 91e542b..4e61c8b 100644
--- a/base/ini/world.ini
+++ b/base/ini/world.ini
@@ -24,7 +24,7 @@ zone=anara
 
 ; lindblade space
 zone=lindblade
-zone=dover
+zone=albion
 zone=burton
 zone=caledonia
 
diff --git a/base/ini/zones/albion.ini b/base/ini/zones/albion.ini
new file mode 100644
index 0000000..6e408fe
--- /dev/null
+++ b/base/ini/zones/albion.ini
@@ -0,0 +1,71 @@
+;
+; albion.ini
+; world description for the Albion system
+;
+
+[zone]
+name=Albion system
+sky=sky05
+
+; ------------------------------------------------------------------ 
+; ORIGIN
+
+[navpoint]
+label=navpoint_origin
+name=Navigation point Origin
+location=0 0 0
+
+; ------------------------------------------------------------------ 
+; STAR
+
+[star]
+label=star
+name=class F star
+location=-512 -512 0
+color=255 238 158
+radius=112
+
+; ------------------------------------------------------------------ 
+; LINDBLADE JUMPGATE
+
+[navpoint]
+label=navpoint_north
+name=Navigation point North
+location=504 0 -2
+
+[jumpgate]
+label=jumpgate_lindblade
+target=lindblade:jumpgate_albion
+faction=lindblade
+location=512 0 0
+direction=180
+
+; ------------------------------------------------------------------ 
+; EAST END JUMPGATE
+
+[navpoint]
+label=navpoint_east
+name=Navigation point East
+location=2 -504 -2
+
+[jumpgate]
+label=jumpgate_eastend
+target=eastend:jumpgate_albion
+faction=lindblade
+location=0 -512 0
+direction=90
+
+; ------------------------------------------------------------------ 
+; ANTWERP JUMPGATE
+
+[navpoint]
+label=navpoint_west
+name=Navigation point West
+location=-34 496 -2
+
+[jumpgate]
+label=jumpgate_antwerp
+target=antwerp:jumpgate_albion
+faction=lindblade
+location=-32 532 0
+direction=270
diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini
index 61c7ed3..94edd65 100644
--- a/base/ini/zones/anara.ini
+++ b/base/ini/zones/anara.ini
@@ -3,21 +3,17 @@
 ; world description for the Anara system
 ;
 
-;
-; ZONE IDENTIFICATION
-
 [zone]
 name=Anara system
 sky=sky06
 
-;
-; there is no star for tha Anara system
+; ------------------------------------------------------------------ 
+; there's no star in the Anara system
 
 [navpoint]
 label=navpoint_origin
 name=Navpoint Origin
 location=0 0 0
-model=maps/static/navpoint
 
 ;
 ; GALILEO OUTPOST
@@ -26,9 +22,9 @@ model=maps/static/navpoint
 label=galileo_outpost
 name=Galileo Outpost
 model=maps/independent/researchstation
+faction=research
 location=128 768 32
-color=106 95 87
-colorsecond=152 166 169
+
 
 	[ship]
 	label=avenger
@@ -44,59 +40,69 @@ colorsecond=152 166 169
 	price=500
 	amount=0
 
-;
+
+; ------------------------------------------------------------------ 
 ; this is the line of navpoints for leading ships through anara's gas clouds
 
 [navpoint]
 label=navpoint_path01
 name=Safety Buoy
+faction=research
 location=128 -640 0
-model=maps/static/navpoint
+
 [navpoint]
 label=navpoint_path02
 name=Safety Buoy
+faction=research
 location=120 -512 0
-model=maps/static/navpoint
+
 [navpoint]
 label=navpoint_path03
 name=Safety Buoy
+faction=research
 location=112 -384 0
-model=maps/static/navpoint
+
 [navpoint]
 label=navpoint_path04
 name=Safety Buoy
+faction=research
 location=104 -256 0
-model=maps/static/navpoint
+
 [navpoint]
 label=navpoint_path05
 name=Safety Buoy
+faction=research
 location=96 -128 0
-model=maps/static/navpoint
+
 [navpoint]
 label=navpoint_path06
 name=Safety Buoy
+faction=research
 location=88 0 0
-model=maps/static/navpoint
+
 [navpoint]
 label=navpoint_path07
 name=Safety Buoy
+faction=research
 location=96 128 0
-model=maps/static/navpoint
+
 [navpoint]
 label=navpoint_path08
 name=Safety Buoy
+faction=research
 location=112 256 0
-model=maps/static/navpoint
+
 [navpoint]
 label=navpoint_path09
 name=Safety Buoy
+faction=research
 location=120 384 0
-model=maps/static/navpoint
+
 [navpoint]
 label=navpoint_path10
 name=Safety Buoy
+faction=research
 location=128 512 0
-model=maps/static/navpoint
 
 ; ------------------------------------------------------------------ 
 ; CALEDONIA JUMPGATE
@@ -105,18 +111,13 @@ model=maps/static/navpoint
 label=navpoint_east
 name=Navigation Point East
 location=128 -768 0
-model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_caledonia
-name=Jumpgate Anara -> Caledonia
-model=maps/colonial/jumpgate
 target=caledonia:jumpgate_anara
-color=106 95 87
-colorsecond=152 166 169
+faction=research
 location=120 -760 0
 direction=95
-info=Jumpgate to the Caledonia system.
 
 ; ------------------------------------------------------------------ 
 ; KARELIA JUMPPOINT
@@ -125,12 +126,9 @@ info=Jumpgate to the Caledonia system.
 label=navpoint_south
 name=Navigation Point South
 location=-512 0 -64
-model=maps/static/navpoint
 
 [jumppoint]
 label=jumppoint_karelia
-name=Jumppoint Anara -> Karelia
 target=karelia:jumppoint_anara
 location=-524 0 64
 direction=0
-info=Jumppoint to the Karelia system.
diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini
index 4bbd9f0..0227de9 100644
--- a/base/ini/zones/antwerp.ini
+++ b/base/ini/zones/antwerp.ini
@@ -31,10 +31,10 @@ radius=88
 label=helianthos
 name=Starbase Helianthos
 model=maps/colonial/helianthos
-location=512 -512 0
 faction=militia
-; overwrite faction colorsecond
+; override faction secnodary color
 colorsecond=0 1 0
+location=512 -512 0
 
 	[ship]
 	label=sharkan
@@ -54,8 +54,8 @@ colorsecond=0 1 0
 label=buccaneers
 name=Buccaneers' Den
 model=maps/pirate/juggernaut
-location=-768 1280 0
 faction=pirates
+location=-768 1280 0
 
 	[ship]
 	label=raider
@@ -79,12 +79,11 @@ faction=pirates
 [navpoint]
 label=navpoint_south
 name=Navigation point South
-model=maps/static/navpoint
 location=-1024 0 0
 
-
 [jumpgate]
 label=jumpgate_ghant
+; override default model
 model=maps/pirate/jumpgate
 target=ghant:jumpgate_antwerp
 faction=pirates
@@ -92,18 +91,17 @@ location=-1048 0 8
 direction=0
 
 ; ------------------------------------------------------------------ 
-; DOVER JUMPGATE
+; ALBION JUMPGATE
 
 [navpoint]
 label=navpoint_north
 name=Navigation point North
-model=maps/static/navpoint
 location=1096 -256 0
 
 [jumpgate]
-label=jumpgate_dover
+label=jumpgate_albion
 model=maps/colonial/jumpgate
-target=dover:jumpgate_antwerp
+target=albion:jumpgate_antwerp
 faction=colonies
 location=1124 -302 0
 direction=300
@@ -115,11 +113,9 @@ direction=300
 label=navpoint_west
 name=Navigation point West
 location=256 1024 16
-model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_finnmark
-model=maps/colonial/jumpgate
 target=finnmark:jumpgate_antwerp
 faction=colonies
 location=384 1056 16
diff --git a/base/ini/zones/brogha.ini b/base/ini/zones/brogha.ini
index 8ca30f7..c6c3183 100644
--- a/base/ini/zones/brogha.ini
+++ b/base/ini/zones/brogha.ini
@@ -9,7 +9,7 @@
 [zone]
 ; [string] zone name
 name=Brogha system
-; [string] sky texture
+; [string] skybox name
 sky=sky03
 
 ; ------------------------------------------------------------------ 
@@ -73,7 +73,6 @@ info=Planet Brogha is largest exporter of agricultural products in the Independe
 label=navpoint_solar
 name=Navigation point Solar
 location=-486 0 16
-model=maps/static/navpoint
 
 ; ------------------------------------------------------------------ 
 ; CANTOR STATION
@@ -81,11 +80,10 @@ model=maps/static/navpoint
 [station]
 label=cantor
 name=Cantor observatory
+model=maps/colonial/cantor
+faction=colonies
 location=-512 0 32
-color=222 192 145
-colorsecond=.5 .4 .4
 direction=-45
-model=maps/colonial/cantor
 
 	[ship]
 	label=vector
@@ -113,16 +111,13 @@ model=maps/colonial/cantor
 label=navpoint_west
 name=Navigation point West
 location=-440 840 128
-model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_ghant
-name=Jumpgate Brogha -> Ghant
-model=maps/colonial/jumpgate
+faction=colonies
 target=ghant:jumpgate_brogha
 location=-440 808 128
 direction=270
-color=222 192 145
 
 ; ------------------------------------------------------------------ 
 ; EASTEND JUMPGATE
@@ -135,10 +130,7 @@ model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_eastend
-name=Jumpgate Brogha -> East End
-model=maps/colonial/jumpgate
+faction=colonies
 target=eastend:jumpgate_brogha
 location=700 -1024 0
 direction=180
-color=222 192 145
-
diff --git a/base/ini/zones/burton.ini b/base/ini/zones/burton.ini
index 66cdfaf..f1991ec 100644
--- a/base/ini/zones/burton.ini
+++ b/base/ini/zones/burton.ini
@@ -7,7 +7,7 @@
 ; ZONE IDENTIFICATION
 [zone]
 name=Burton system
-sky=sky27
+;sky=
 
 ;
 ; ORIGIN
@@ -20,9 +20,8 @@ name=Navigation point Origin
 ; [x y x] entity location
 location=0 0 0
 ; [path] path to model
-model=maps/static/navpoint
 
-;
+; ------------------------------------------------------------------ 
 ; STAR
 
 [star]
@@ -32,10 +31,28 @@ location=-256 0 0
 color=1 .9 .5
 radius=84
 
+; ------------------------------------------------------------------ 
 ; LINDBLADE SHIPYARD
 ;
+
 [entity]
 label=shipyard
 name=Lindblade Shipyard
-location=128 128 0
+faction=lindblade
 model=maps/lindblade/lindblade_dock
+location=128 128 0
+
+; ------------------------------------------------------------------ 
+; FINNMARK JUMPGATE
+
+[navpoint]
+label=navpoint_west
+name=Navigation point West
+location=256 1024 16
+
+[jumpgate]
+label=jumpgate_lindblade
+target=lindblade:jumpgate_burton
+faction=lindblade
+location=384 1056 16
+direction=275
diff --git a/base/ini/zones/caledonia.ini b/base/ini/zones/caledonia.ini
index cc3c04a..bfde1cb 100644
--- a/base/ini/zones/caledonia.ini
+++ b/base/ini/zones/caledonia.ini
@@ -9,26 +9,37 @@
 [zone]
 name=Caledonia system
 
-
 ; ------------------------------------------------------------------ 
 ; ANARA JUMPGATE
 
 [navpoint]
 label=navpoint_west
 name=Navigation point West
-location=256 1024 16
-model=maps/static/navpoint
+location=364 1016 14
 color=0.5 0.1 0.1
 
 [jumpgate]
 label=jumpgate_anara
-name=Jumpgate Caledonia -> Anara
-model=maps/pirate/jumpgate
+model=maps/colonial/jumpgate
 target=anara:jumpgate_caledonia
-color=0.5 0.1 0.1
-location=384 1056 16
-direction=300
-info=Jumpgate to the Anara system.
+faction=lindblade
+location=376 1024 16
+direction=250
+
+; ------------------------------------------------------------------ 
+; LINDBLADE JUMPGATE
+
+[navpoint]
+label=navpoint_east
+name=Navigation Point East
+location=128 -768 0
+
+[jumpgate]
+label=jumpgate_lindblade
+target=lindblade:jumpgate_caledonia
+faction=lindblade
+location=120 -760 0
+direction=95
 
 ; ------------------------------------------------------------------ 
 ; KARELIA JUMPPOINT
@@ -37,15 +48,11 @@ info=Jumpgate to the Anara system.
 label=navpoint_south
 name=Navigation point South
 location=-512 0 32
-model=maps/static/navpoint
 color=0.5 0.1 0.1
 
-[jumpgate]
+[jumppoint]
 label=jumppoint_karelia
-name=Jumpgate Caledonia -> Karelia
-model=maps/pirate/jumpgate
 target=karelia:jumppoint_caledonia
 color=0.5 0.1 0.1
 location=-524 0 32
 direction=0
-info=Jumppoint to the Karelia system.
diff --git a/base/ini/zones/dover.ini b/base/ini/zones/dover.ini
deleted file mode 100644
index 4e8eeb8..0000000
--- a/base/ini/zones/dover.ini
+++ /dev/null
@@ -1,87 +0,0 @@
-;
-; dover.ini
-; world description for the Dover system
-;
-
-;
-; ZONE IDENTIFICATION
-[zone]
-name=Dover system
-sky=sky05
-
-;
-; ORIGIN
-
-[navpoint]
-; [string] entity label
-label=navpoint_origin
-; [string] entity name
-name=Navigation point Origin
-; [x y x] entity location
-location=0 0 0
-; [path] path to model
-model=maps/static/navpoint
-
-;
-; STAR
-
-[star]
-label=star
-name=class F star
-location=-512 -512 0
-color=255 238 158
-radius=112
-
-;
-; LINDBLADE JUMPGATE
-
-[navpoint]
-label=navpoint_north
-name=Navigation point North
-location=504 0 0
-model=maps/static/navpoint
-
-[jumpgate]
-label=jumpgate_lindblade
-name=Jumpgate Dover -> Lindblade 
-model=maps/colonial/jumpgate
-target=lindblade:jumpgate_dover
-color=0.5 0.1 0.1
-location=512 0 0
-direction=180
-
-;
-; EAST END JUMPGATE
-
-[navpoint]
-label=navpoint_east
-name=Navigation point East
-location=0 -504 0
-model=maps/static/navpoint
-
-[jumpgate]
-label=jumpgate_eastend
-name=Jumpgate Dover -> East End
-model=maps/colonial/jumpgate
-target=eastend:jumpgate_dover
-color=0.5 0.1 0.1
-location=0 -512 0
-direction=90
-
-;
-; ANTWERP JUMPGATE
-
-[navpoint]
-label=navpoint_west
-name=Navigation point West
-location=-32 496 0
-model=maps/static/navpoint
-
-[jumpgate]
-label=jumpgate_antwerp
-name=Jumpgate Dover -> Antwerp
-model=maps/pirate/jumpgate
-target=antwerp:jumpgate_dover
-color=158 0 255
-location=-32 532 0
-direction=270
diff --git a/base/ini/zones/eastend.ini b/base/ini/zones/eastend.ini
index 10db783..9b306c6 100644
--- a/base/ini/zones/eastend.ini
+++ b/base/ini/zones/eastend.ini
@@ -15,7 +15,6 @@ sky=sky08
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
-model=maps/static/navpoint
 
 ; ------------------------------------------------------------------ 
 ; ENSOR STATION
@@ -23,11 +22,10 @@ model=maps/static/navpoint
 [station]
 label=ensor
 name=Ensor station
-color=0.7 0.7 0.9
-colorsecond=0.7 0.8 0.95
+model=maps/independent/ensor
+faction=independent
 location=-32 32 2
 direction=30
-model=maps/independent/ensor
 ; this entity is the default zone view
 default = yes
 
@@ -43,21 +41,17 @@ default = yes
 	amount=5
 
 ; ------------------------------------------------------------------ 
-; DOVER JUMPGATE
+; ALBION JUMPGATE
 
 [navpoint]
 label=navpoint_north
 name=Navigation point North
 location=504 0 0
-model=maps/static/navpoint
 
 [jumpgate]
-label=jumpgate_dover
-name=Jumpgate East End -> Dover
-model=maps/colonial/jumpgate
-target=dover:jumpgate_eastend
-color=0.7 0.7 0.9
-colorsecond=0.7 0.8 0.95
+label=jumpgate_albion
+target=albion:jumpgate_eastend
+faction=independent
 location=520 0 0
 direction=270
 
@@ -68,14 +62,10 @@ direction=270
 label=navpoint_south
 name=Navigation point South
 location=-504 0 0
-model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_brogha
-name=Jumpgate East End -> Brogha
-model=maps/colonial/jumpgate
 target=brogha:jumpgate_eastend
-color=0.7 0.7 0.9
-colorsecond=0.7 0.8 0.95
+faction=independent
 location=-520 0 0
 direction=0
diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini
index aa42d94..8520f4e 100644
--- a/base/ini/zones/finnmark.ini
+++ b/base/ini/zones/finnmark.ini
@@ -33,6 +33,7 @@ name=planet Finnmark
 texture=planets/finnmark
 default=yes
 faction=miners
+;override faction color
 color=1.0 1.0 1.0
 location=128 64 0
 radius=70
@@ -72,11 +73,9 @@ info=Nobody objected when the miners colonized this inhospitable frozen world an
 label=navpoint_east
 name=Navigation Point East
 location=-96 -560 0
-model=maps/static/navpoint
 
 [jumpgate]
 label=jumpgate_antwerp
-model=maps/colonial/jumpgate
 target=antwerp:jumpgate_finnmark
 faction=miners
 location=-96 -576 4
@@ -89,7 +88,6 @@ direction=95
 label=navpoint_north
 name=Navigation Point North
 location=616 512 0
-model=maps/static/navpoint
 
 [jumppoint]
 label=jumppoint_karelia
diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini
index a563982..463b14a 100644
--- a/base/ini/zones/ghant.ini
+++ b/base/ini/zones/ghant.ini
@@ -9,7 +9,7 @@
 [zone]
 ; [string] zone name
 name=Ghant system
-; [string] sky texture
+; [string] skybox name
 sky=sky02
 
 ; ------------------------------------------------------------------
@@ -22,10 +22,6 @@ label=navpoint_origin
 name=Navigation point Origin
 ; [x y x] entity location
 location=0 0 0
-; this entity is the default zone view
-;default = yes
-; [path] model path
-model=maps/static/navpoint
 
 ; ------------------------------------------------------------------
 ; STAR
@@ -72,18 +68,14 @@ label=alexandria
 name=Alexandria outpost
 ; [string] entity model name
 model=maps/colonial/alexandria
+; [string] faction this entity belongs to, sets faction colors
+faction=colonies
 ; [x y x] entity location
 location=-192 -704 32
-; [r g b] entity primary color, values in the 0-255 range
-color=222 192 145
-; [r g b] entity secondary color, values in the 0-255 range
-colorsecond=160 160 160
 ; [float] axis direction, in degrees
 direction=45
 ; this is the default base where new players are docked
 default=yes
-; faction this station belongs to, it will automaticly receive faction colors
-faction=colonies
 ; info text
 info=Alexandria outpost serves as a commercial and entertainment centre for the Ghant system. Because of its remote location, it is also a popular transit zone for more shady operations, giving birth to its nickname Queen of the Wasteland.
 
@@ -127,17 +119,18 @@ info=Alexandria outpost serves as a commercial and entertainment centre for the
 label=alexandria_storage1
 name=storage tanks
 model=maps/colonial/alexandria_storage
+faction=colonies
 location=-176 -720 32
 direction=45
-faction=colonies
+
 
 [entity]
 label=alexandria_storage2
 name=storage tanks
 model=maps/colonial/alexandria_storage
+faction=colonies
 location=-172 -720 32
 direction=45
-faction=colonies
 
 ; ------------------------------------------------------------------
 ; BATTLESHIP CUSTODIAN
@@ -146,9 +139,9 @@ faction=colonies
 label=custodian
 name=battleship Custodian
 model=maps/colonial/custodian
+faction=militia
 location=-204 -656 32
 direction=305
-faction=militia
 
 	[ship]
 	label=sharkan
@@ -218,10 +211,10 @@ color=0.4 0.7 0
 label=ikarus
 name=Ikarus satellite
 model=maps/colonial/ikarus
+faction=militia
 location=64 -16 0
 direction=120
 pitch=15
-faction=militia
 
 ; ------------------------------------------------------------------
 ; BROGHA JUMPGATE
@@ -230,12 +223,10 @@ faction=militia
 label=navpoint_east
 name=Navigation point East
 location=716 -1008 20
-model=maps/static/navpoint
 
 [jumpgate]
 ; name and info are automaticly set for jumpgates
 label=jumpgate_brogha
-model=maps/colonial/jumpgate
 target=brogha:jumpgate_ghant
 faction=colonies
 location=716 -1024 24
@@ -246,6 +237,7 @@ direction=90
 
 [jumpgate]
 label=jumpgate_antwerp
+; override default jumpgate model
 model=maps/pirate/jumpgate
 target=antwerp:jumpgate_ghant
 faction=pirates
diff --git a/base/ini/zones/karelia.ini b/base/ini/zones/karelia.ini
index c692ba8..50d554a 100644
--- a/base/ini/zones/karelia.ini
+++ b/base/ini/zones/karelia.ini
@@ -13,14 +13,12 @@ sky=sky09
 [navpoint]
 label=navpoint_north
 name=Navigation Point North
-model=maps/static/navpoint
-location=752 0 -64
+location=752 164 -64
 
 [jumppoint]
 label=jumppoint_anara
-name=Jumppoint Karelia -> Anara
 target=anara:jumppoint_karelia
-location=764 0 64
+location=764 164 64
 direction=180
 
 ; ------------------------------------------------------------------ 
@@ -29,14 +27,12 @@ direction=180
 [navpoint]
 label=navpoint_south
 name=Navigation Point South
-model=maps/static/navpoint
-location=-752 0 -64
+location=-752 128 -64
 
 [jumppoint]
 label=jumppoint_finnmark
-name=Jumppoint Karelia -> Finnmark
 target=finnmark:jumppoint_karelia
-location=-764 0 64
+location=-764 128 64
 direction=0
 
 ; ------------------------------------------------------------------ 
@@ -45,12 +41,10 @@ direction=0
 [navpoint]
 label=navpoint_east
 name=Navigation Point East
-model=maps/static/navpoint
 location=-96 -500 12
 
 [jumppoint]
 label=jumppoint_caledonia
-name=Jumppoint Karelia -> Caledonia
 target=caledonia:jumppoint_karelia
 location=-96 -512 12
 direction=80
diff --git a/base/ini/zones/kiana.ini b/base/ini/zones/kiana.ini
index db351fd..39ccbc9 100644
--- a/base/ini/zones/kiana.ini
+++ b/base/ini/zones/kiana.ini
@@ -3,23 +3,19 @@
 ; world description for the Kiana system
 ;
 
-; 
-; ZONE IDENTIFICATION
-
 [zone]
 name=Kiana system
 sky=sky04
 
-;
+; ------------------------------------------------------------------ 
 ; ORIGIN
 
 [navpoint]
 label=navpoint_origin
 name=Navigation point Origin
 location=0 0 0
-model=maps/static/navpoint
 
-; 
+; ------------------------------------------------------------------ 
 ; STAR
 
 [star]
@@ -29,28 +25,27 @@ location=1204 768 96
 radius=128
 color=210 210 255
 
-;
-; PLANET KIANA ALPHA
+; ------------------------------------------------------------------ 
+; PLANET KIANA PRIME
 
 [planet]
-label=kiana_alpha
-name=Planet Kiana Alpha
+label=kiana_prime
+name=Planet Kiana Prime
 location=-256 0 16
 color=1 1 1
 radius=72
 texture=planets/kiana
 
-;
+; ------------------------------------------------------------------ 
 ; TSU-KHAN CENTRAL
 
 [station]
 label=tsukhan_central
 name=Tsu-Khan Central
-location=-128 -64 12
 model=maps/tsukhan/tsukhan_central
+faction=tsukhan
+location=-128 -64 12
 default=yes
-color=127 26 127
-colorsecond=0 0 0
 
 	[ship]
 	label=imp
@@ -61,149 +56,126 @@ colorsecond=0 0 0
 [planet]
 label=tsukhan_generator
 name=M-L13
+texture=structures/generator
+faction=tsukhan
 location=-128 -64 12
-color=127 26 127
 radius=8
 rotationspeed=0
-texture=structures/generator
 showonmap=false
 
-;
+; ------------------------------------------------------------------ 
 ; CIVILIAN STARSCRAPERS
 
 [entity]
 label=civilian_starscraper01
 name=Tsu-Khan Starscraper
-location=-128 -128 12
 model=maps/tsukhan/civilian_starscraper
-default=yes
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-128 -128 12
 
 [entity]
 label=civilian_starscraper02
 name=Tsu-Khan Starscraper
-location=-128 -160 12
 model=maps/tsukhan/civilian_starscraper
-default=yes
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-128 -160 12
 
 [entity]
 label=civilian_starscraper03
 name=Tsu-Khan Starscraper
-location=-128 -192 12
 model=maps/tsukhan/civilian_starscraper
-default=yes
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-128 -192 12
 
 [entity]
 label=civilian_starscraper04
 name=Tsu-Khan Starscraper
-location=-160 -128 12
 model=maps/tsukhan/civilian_starscraper
-default=yes
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-160 -128 12
 
 [entity]
 label=civilian_starscraper05
 name=Tsu-Khan Starscraper
-location=-160 -160 12
 model=maps/tsukhan/civilian_starscraper
-default=yes
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-160 -160 12
 
 [entity]
 label=civilian_starscraper06
 name=Tsu-Khan Starscraper
-location=-160 -192 12
 model=maps/tsukhan/civilian_starscraper
-default=yes
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-160 -192 12
 
 [entity]
 label=civilian_starscraper07
 name=Tsu-Khan Starscraper
-location=32 128 0
 model=maps/tsukhan/civilian_starscraper
-default=yes
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=32 128 0
 
 [entity]
 label=civilian_starscraper08
 name=Tsu-Khan Starscraper
-location=128 72 -32
 model=maps/tsukhan/civilian_starscraper
-default=yes
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=128 72 -32
 
-;
+; ------------------------------------------------------------------ 
 ; CIVILIAN HOUSING
 
 [entity]
 label=civilian_housing1
 name=Tsu-Khan Civilian Housing
-location=-96 -56 12
 model=maps/tsukhan/civilian_housing
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-96 -56 12
 
 [entity]
 label=civilian_housing2
 name=Tsu-Khan Civilian Housing
-location=-96 -56 11
 model=maps/tsukhan/civilian_housing
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-96 -56 11
 
 [entity]
 label=civilian_housing3
 name=Tsu-Khan Civilian Housing
-location=-96 -55 10
 model=maps/tsukhan/civilian_housing
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-96 -55 10
 
 [entity]
 label=civilian_housing4
 name=Tsu-Khan Civilian Housing
-location=-96 -55 12
 model=maps/tsukhan/civilian_housing
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-96 -55 12
 
 [entity]
 label=civilian_housing6
 name=Tsu-Khan Civilian Housing
-location=-96 -55 11
 model=maps/tsukhan/civilian_housing
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-96 -55 11
 
 [entity]
 label=civilian_housing6
 name=Tsu-Khan Civilian Housing
-location=-96 -56 10
 model=maps/tsukhan/civilian_housing
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=-96 -56 10
 
-;
+; ------------------------------------------------------------------ 
 ; BATTLESHIP K-T98
 
 [station]
 label=battleship_kt98
 name=Battleship K-T98
-location=256 16 16
 model=maps/tsukhan/ravager
-color=127 26 127
-colorsecond=0 0 0
+faction=tsukhan
+location=256 16 16
 
 	[ship]
 	label=imp
diff --git a/base/ini/zones/lindblade.ini b/base/ini/zones/lindblade.ini
index d02e0f4..39bb998 100644
--- a/base/ini/zones/lindblade.ini
+++ b/base/ini/zones/lindblade.ini
@@ -16,7 +16,7 @@ sky=sky10
 [star]
 label=star
 name=class G star
-location=256 -512 0
+location=0 -512 0
 color=1 .9 .5
 radius=96
 
@@ -27,7 +27,7 @@ radius=96
 label=lindblade
 name=planet Lindblade
 texture=planets/lindblade
-location=618 780 16
+location=362 780 16
 direction=90
 pitch=7.5
 rotationspeed=1.5
@@ -41,10 +41,11 @@ radius=74
 label=lindblade_central
 name=Lindblade Central
 model=maps/lindblade/lindblade_central
-location=720 564 18
+faction=lindblade
+location=464 564 18
 direction=250
 pitch=0
-faction=lindblade
+
 
 	[ship]
 	label=halcyon
@@ -69,8 +70,8 @@ faction=lindblade
 label=station15
 name=Station 15
 model=maps/lindblade/station15
-color=0.5 0.1 0.1
-location=-292 -68 8
+faction=lindblade
+location=-548 -68 8
 direction=315
 
 	[ship]
@@ -92,19 +93,46 @@ name=Navigation point 15
 location=-290 -60 6
 
 ; ------------------------------------------------------------------ 
-; DOVER JUMPGATE
+; ALBION JUMPGATE
 
 [navpoint]
 label=navpoint_south
 name=Navigation point South
-location=-324 -768 12
+location=-580 -768 12
 
 [jumpgate]
-label=jumpgate_dover
-name=Jumpgate Lindblade -> Dover
-model=maps/colonial/jumpgate
-target=dover:jumpgate_lindblade
-color=0.5 0.1 0.1
-location=-332 -768 16
+label=jumpgate_albion
+target=albion:jumpgate_lindblade
+faction=lindblade
+location=-588 -768 16
 direction=90
 
+; ------------------------------------------------------------------ 
+; CALEDONIA JUMPGATE
+
+[navpoint]
+label=navpoint_west
+name=Navigation point West
+location=752 1264 15
+
+[jumpgate]
+label=jumpgate_caledonia
+target=caledonia:jumpgate_lindblade
+faction=lindblade
+location=768 1280 16
+direction=250
+
+; ------------------------------------------------------------------ 
+; BURTON JUMPGATE
+
+[navpoint]
+label=navpoint_east
+name=Navigation point East
+location=1022 -248 14
+
+[jumpgate]
+label=jumpgate_burton
+target=burton:jumpgate_lindblade
+faction=lindblade
+location=1024 -256 16
+direction=110
diff --git a/base/ini/zones/unknown.ini b/base/ini/zones/unknown.ini
index 43fef0a..d035998 100644
--- a/base/ini/zones/unknown.ini
+++ b/base/ini/zones/unknown.ini
@@ -14,25 +14,19 @@ location=0 0 0
 model=maps/static/navpoint
 
 [entity]
-label=vector
-name=Micron Vector
-model=maps/merchant/vector
+ship=vector
 location=4 -8 0
 color=0.5 0 0
 colorsecond=0.8 0.2 0
 
 [entity]
-label=tensor
-name=Micron Scalar
-model=maps/merchant/scalar
+ship=scalar
 location=4 0  0
 color=0.5 0 0
 colorsecond=0.8 0.2 0
 
 [entity]
-label=matrix
-name=Micron Matrix
-model=maps/merchant/matrix
+ship=matrix
 location=4 8 0
 color=0.5 0 0
 colorsecond=0.8 0.2 0
@@ -45,7 +39,7 @@ location=32 -16 0
 color=127 26 127
 
 [entity]
-label=juggernaut
+ship=juggernaut
 name=Pirate Juggernaut
 model=maps/pirate/juggernaut
 location=32 16 0