diff --git a/configs/overview/system_migovec.thconfig b/configs/overview/system_migovec.thconfig
index a958610b..ad25109d 100644
--- a/configs/overview/system_migovec.thconfig
+++ b/configs/overview/system_migovec.thconfig
@@ -16,33 +16,61 @@ source "../../data/system_migovec.th"
 #export map -o "../../outputs/GIS/system_migovec" -fmt esri
 #----------------------------------------------------------------------------------|
 # input the layout files
-input "../../layouts/base-p.thl"
+input "../../layouts/detailed-p.thl"
 input "../../layouts/base-e.thl"
 input "../../layouts/mods.thl"
+input "../../layouts/user_label.thl"
 
 #----------------------------------------------------------------------------------|
 # select the relevant map definitions, and levels within those maps
-#select m-primadona_ubend_monatip-p@system_migovec -map-level 0
+
+source
+	map local-p -projection plan
+		m-all-p@M16.m2m16m18.system_migovec
+		M16@m2m16m18.system_migovec
+	endmap
+endsource
+select local-p
 #select  m-primadona_ubend_monatip-e@system_migovec -map-level 0
 
 #----------------------------------------------------------------------------------|
 # export a PLAN view
 layout plan
-	copy base-p
-	copy colour-by-new
-	map-comment "<lang:fr>Občina Tolmin, Slovenija<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Raziskave: 2000-2019<br>Natančmost meritev IV/B<br><br>Primadona<br>kat. št.: 8282<br><br>U-Bend 571<br>kat. št.: 12114<br><br>Mona tip<br>kat. št.: 10180<lang:en>Tolmin, Julian Alps<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Exploration: 2000-2019<br>BCRA grade 4-5b<br><br>Primadona<br>Cadastral number: 8282<br><br>U-Bend 571<br>Cadastral number: 12114<br><br>Mona tip<br>Cadastral number: 10180"
-	code tex-map
-	\framethickness=0.5mm
-	\def\maplayout{
-	\legendbox{-5}{99}{NW}{\size[26]\the\cavename}
-	\legendbox{-5}{95}{NW}{\size[10]\the\comment}
-	\legendbox{5}{70}{NW}{\scalebar}
-	\legendbox{5}{65}{NW}{\northarrow}
-	}
+	copy user_label
+
+
+	
+	#map-comment "<lang:fr>Občina Tolmin, Slovenija<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Raziskave: 2000-2019<br>Natančmost meritev IV/B<br><br>Primadona<br>kat. št.: 8282<br><br>U-Bend 571<br>kat. št.: 12114<br><br>Mona tip<br>kat. št.: 10180<lang:en>Tolmin, Julian Alps<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Exploration: 2000-2019<br>BCRA grade 4-5b<br><br>Primadona<br>Cadastral number: 8282<br><br>U-Bend 571<br>Cadastral number: 12114<br><br>Mona tip<br>Cadastral number: 10180"
+
+	#code tex-map
+	#\framethickness=0.5mm
+	#\def\maplayout{
+	#\legendbox{-5}{99}{NW}{\size[26]\the\cavename}
+	#\legendbox{-5}{95}{NW}{\size[10]\the\comment}
+	#\legendbox{5}{70}{NW}{\scalebar}
+	#\legendbox{5}{65}{NW}{\northarrow}
+	#}
+	copy detailed
+
+	map-header 0 0 off	
+
+	scale 1 2000
+	symbol-hide point remark
+	symbol-show point station
+	symbol-show line survey
+	symbol-hide line label
+	colour map-fg [95 95 82]
+	symbol-assign point water-flow MY
+	symbol-colour point water-flow [0 10 70]
+	symbol-hide point station-name
+
+	code metapost
+		max_label_level("2"); % yeah, now it works!
+	endcode
 endlayout
 
 language fr
-#export map -projection plan -o ../../outputs/system_migovec_overview_plan_SLO.pdf -layout plan
+export map -projection plan -o ../../outputs/system_migovec_overview_plan_SLO.pdf -layout plan
 
 #----------------------------------------------------------------------------------|
 # export an ELEVATION view, using the LAYOUT overview2
@@ -50,6 +78,11 @@ language fr
 layout ee
 	copy base-e
 	copy colour-by-new
+	copy user_label
+	copy show-centreline
+
+	
+	symbol-assign point water-flow MY
 	map-comment "<lang:fr>Občina Tolmin, Slovenija<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Raziskave: 2000-2019<br>Natančmost meritev IV/B<br><br>Primadona<br>kat. št.: 8282<br><br>U-Bend 571<br>kat. št.: 12114<br><br>Mona tip<br>kat. št.: 10180<lang:en>Tolmin, Julian Alps<br>Imperial College Caving Club<br>Jamarska sekcija PD Tolmin<br>Exploration: 2000-2019<br>BCRA grade 4-5b<br><br>Primadona<br>Cadastral number: 8282<br><br>U-Bend 571<br>Cadastral number: 12114<br><br>Mona tip<br>Cadastral number: 10180"
 	code tex-map
 	\framethickness=0.5mm
@@ -63,12 +96,16 @@ layout ee
 	symbol-hide point station
 	symbol-hide line survey
 	symbol-hide line label
+
+	code metapost
+		max_label_level("2"); % yeah, now it works!
+	endcode
 endlayout
 
 select m-all-e@system_migovec
 
 language sl
-export map -projection extended -o ../../outputs/system_migovec_overview_elevation_SLO.pdf -layout ee
+#export map -projection extended -o ../../outputs/system_migovec_overview_elevation_SLO.pdf -layout ee
 
 #----------------------------------------------------------------------------------|
 # export a .3d model, which can be opened in AVEN and LOCH
diff --git a/data/M16/1997/galact1/galact1-p.th2 b/data/M16/1997/galact1/galact1-p.th2
index 67735f55..22958f45 100644
--- a/data/M16/1997/galact1/galact1-p.th2
+++ b/data/M16/1997/galact1/galact1-p.th2
@@ -2,13 +2,7 @@ encoding  utf-8
 ##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000
 ##XTHERION## xth_me_area_zoom_to 100
 
-
-scrap galact1-1p -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -projection plan
-
-line wall 
-  24.4449 122.7338
-  24.4449 122.7338
-endline
+scrap galact1-1p -projection plan -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
 
 line pit 
   0.2401 47.1741
@@ -31,13 +25,10 @@ line wall
   -1.0803 63.0188 -1.0803 70.4611 -0.7202 71.3013
   -0.3601 72.1416 6.4819 80.7841 6.722 81.2643
   6.9621 81.7444 14.7653 96.0212 15.7838 97.2095
-  16.8023 98.3978 20.1236 106.2889 20.1236 106.2889
-  25.5252 109.5298
 endline
 
 line wall 
-  1.6534 119.7415
-  1.6534 119.7415 -1.8652 114.8619 -1.8652 113.1642
+  -1.8652 113.1642
   -1.8652 111.4667 -19.3522 85.8967 -20.0312 84.1992
   -20.7103 82.5016 -21.5591 65.6957 -21.3893 64.6772
   -21.2195 63.6586 -20.201 61.9611 -19.522 60.4333
diff --git a/data/M16/1997/galact3/galact3-p.th2 b/data/M16/1997/galact3/galact3-p.th2
index 5c69550e..0d416b28 100644
--- a/data/M16/1997/galact3/galact3-p.th2
+++ b/data/M16/1997/galact3/galact3-p.th2
@@ -2,8 +2,7 @@ encoding  utf-8
 ##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000
 ##XTHERION## xth_me_area_zoom_to 100
 
-
-scrap galact3-1p -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -projection plan
+scrap galact3-1p -projection plan -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
 
 area u:smallblocks_MY -attr scale 2
   blocks1
@@ -29,8 +28,7 @@ area u:smallblocks_MY -attr scale 1
   blocks7
 endarea
 
-
-line border -subtype invisible -id blocks7 -close on
+line border -close on -id blocks7 -subtype invisible
   -28.8086 265.0392
   -28.8086 265.0392 -26.4079 265.5193 -21.1263 265.5193
   -15.8447 265.5193 19.6859 277.0428 19.6859 277.0428
@@ -47,7 +45,7 @@ line border -subtype invisible -id blocks7 -close on
   -12.9639 282.8045
 endline
 
-line border -subtype invisible -id blocks5 -close on
+line border -close on -id blocks5 -subtype invisible
   71.2977 113.3972
   6.1112 145.3114
   -65.526 126.6382
@@ -59,7 +57,7 @@ line border -subtype invisible -id blocks5 -close on
   18.3337 66.5445
 endline
 
-line border -subtype invisible -id blocks2 -close on
+line border -close on -id blocks2 -subtype invisible
   -44.8157 -111.3602
   -44.8157 -111.3602 3.3951 -98.4587 12.9015 -101.1748
   22.4078 -103.8909 134.447 -129.0148 134.447 -129.0148
@@ -71,7 +69,7 @@ line border -subtype invisible -id blocks2 -close on
   16.9756 61.7913 -71.2977 -74.0138 -71.2977 -74.0138
 endline
 
-line border -subtype invisible -id blocks3 -close on
+line border -close on -id blocks3 -subtype invisible
   -81.82 -285.55
   -81.82 -285.55 -65.8655 -281.1165 -67.9025 -278.4004
   -69.9396 -275.6843 -99.1377 -219.3252 -99.1377 -215.9301
@@ -87,7 +85,7 @@ line border -subtype invisible -id blocks3 -close on
   -148.0275 -264.8199 -81.82 -285.55 -81.82 -285.55
 endline
 
-line border -subtype invisible -id blocks4 -close on
+line border -close on -id blocks4 -subtype invisible
   42.0996 -345.6239
   42.0996 -345.6239 145.3114 -290.6229 152.7807 -279.0794
   160.25 -267.536 179.2627 -249.8814 172.4725 -215.2511
@@ -117,7 +115,7 @@ line border -subtype invisible -id blocks4 -close on
   156.8549 -359.2044 134.06 -367.31 134.06 -367.31
 endline
 
-line border -subtype invisible -id blocks1 -close on
+line border -close on -id blocks1 -subtype invisible
   71.2977 -339.5127
   74.0138 -338.1547 167.7193 -286.5487 173.1515 -251.2394
   178.5837 -215.9301 160.929 -146.6695 141.9163 -137.8422
@@ -154,8 +152,8 @@ line pit
   -126.2987 -4.0742
 endline
 
-point 178.9232 108.6441 u:label_MY -attr lvl 1 -attr text Galaktikđa -scale l -align r
-point 94.2882 332.1993 water-flow -align r -scale l -orientation 70.0
+point 178.9232 108.6441 u:label_MY -align r -attr lvl 1 -attr text "Galaktikđa" -scale l
+point 94.2882 332.1993 water-flow -align r -orientation 70.0 -scale l
 line wall 
   90.8672 333.9398
   82.7047 333.5797
@@ -184,8 +182,8 @@ line wall
 endline
 
 line wall 
-  -167.0402 -259.3877
-  -167.0402 -259.3877 -137.8422 -262.7828 -133.089 -266.857
+  -141.1124 -276.6729
+  -141.1124 -276.6729 -137.8422 -262.7828 -133.089 -266.857
   -128.3358 -270.9311 -110.3416 -277.3819 -106.2675 -280.098
   -102.1933 -282.8141 -45.1552 -298.4317 -41.7601 -302.8453
   -38.3649 -307.259 -4.0742 -329.6668 -1.0185 -332.7225
@@ -227,7 +225,9 @@ line wall
   -149.3856 -97.7797 -145.9905 -118.1504 -147.3485 -122.9036
   -148.7066 -127.6568 -149.3856 -131.0519 -152.7807 -148.0275
   -156.1758 -165.0032 -152.1017 -163.6451 -163.6451 -191.4852
-  -175.1886 -219.3252 -184.6949 -220.0042 -184.6949 -220.0042
+  -167.2644 -200.214 -170.6834 -206.2728 -173.672 -210.4778
+  -177.8168 -216.3096 -190.5742 -224.5483 -199.3697 -229.8044
+  -204.4591 -232.8459 -206.7815 -237.7695 -206.7815 -237.7695
 endline
 
 point -64.13 122.24 station -name 16
diff --git a/data/M16/1997/galact4/galact4-p.th2 b/data/M16/1997/galact4/galact4-p.th2
index daef0fcc..d97805d0 100644
--- a/data/M16/1997/galact4/galact4-p.th2
+++ b/data/M16/1997/galact4/galact4-p.th2
@@ -2,63 +2,101 @@ encoding  utf-8
 ##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000
 ##XTHERION## xth_me_area_zoom_to 100
 
-scrap DELETE-ME-survey-legs-p -projection plan -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-line survey 
-  69.55 82.88
-  69.55 82.88
-endline
-line survey 
-  57.92 80.83
-  69.55 82.88
-endline
-line survey 
-  75.74 45.39
-  57.92 80.83
-endline
-line survey 
-  44.78 -0.88
-  75.74 45.39
-endline
-line survey 
-  44.78 -0.88
-  22.76 -23.72
-endline
-line survey 
-  -49.85 -137.97
-  22.76 -23.72
-endline
-line survey 
-  -49.85 -137.97
-  -48.72 -58.78
+
+
+scrap galact4-1p -projection plan -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
+
+line border -close on -id galact4-1p_blocks_1 -visibility off
+  546.8834 444.6129
+  501.2698 461.898
+  496.4684 454.2157
+  495.5081 411.0028
+  487.3456 385.0751
+  480.1435 369.2303
+  501.7499 364.909
+  507.9918 393.2375
+  531.0387 419.1653
 endline
-line survey 
-  -48.72 -58.78
-  -75.74 -21.56
+
+area u:smallblocks_MY -attr scale 0.8 
+  galact4-1p_blocks_1
+endarea
+
+line border -close on -id galact4-1p_blocks_2 -visibility off
+  628.5078 572.8112
+  593.9375 623.7064
+  541.1217 658.7569
+  534.8798 655.876
+  520.9557 611.7028
+  501.7499 588.1758
+  484.9449 528.1578
+  473.9016 502.2301
+  511.833 461.4179
+  544.4827 448.454
+  577.6126 487.3456
+  587.2155 505.1109
+  602.0999 513.2734
+  613.6234 516.1542
+  635.71 560.3274
 endline
-line survey 
-  -22.67 93.51
-  -75.74 -21.56
+
+area u:smallblocks_MY -attr scale 1.6 
+  galact4-1p_blocks_2
+endarea
+
+line wall -subtype invisible
+  616.0241 509.9124
+  640.5114 563.2083
+  614.5837 616.0241
 endline
-line survey 
-  -22.67 93.51
-  -12.07 137.97
+
+line wall 
+  503.1904 361.548
+  503.1904 364.4289 511.3528 389.8765 512.7932 392.2772
+  514.2337 394.6779 524.3167 408.122 527.6777 411.483
+  531.0387 414.844 537.2806 426.3674 541.6019 433.0894
+  545.9231 439.8114 548.3239 445.093 551.6849 449.8944
+  555.0459 454.6959 575.692 479.6633 576.6523 481.5839
+  577.6126 483.5045 583.3743 486.8655 584.3346 491.1868
+  585.2949 495.5081 585.2949 498.3889 587.2155 500.7897
+  589.136 503.1904 605.4609 510.3925 605.4609 510.3925
+  616.0241 509.9124
 endline
-line survey 
-  57.92 80.83
-  -12.07 137.97
+
+line wall 
+  614.5837 616.0241
+  610.7425 618.9049 601.6198 628.988 599.6992 630.9085
+  597.7786 632.8291 593.9375 638.1107 590.5765 640.0313
+  587.2155 641.9518 575.692 644.8327 575.692 644.8327
+  575.692 644.8327 570.8906 647.2334 567.0494 649.6341
+  563.2083 652.0348 555.526 656.3561 555.526 656.3561
+  555.526 656.3561 538.2408 668.8399 534.8798 665.959
+  531.5188 663.0781 522.8762 655.876 523.3564 652.515
+  523.8365 649.154 525.277 629.9482 525.277 629.9482
+  525.277 629.9482 499.3492 598.7389 498.8691 595.3779
+  498.3889 592.0169 498.3889 587.6956 498.3889 584.3346
+  498.3889 580.9736 495.9882 569.9303 494.5478 563.6884
+  493.1074 557.4466 489.7463 548.804 488.3059 545.443
+  486.8655 542.082 467.6597 500.3095 467.1796 496.9485
+  466.6995 493.5875 491.6669 469.1002 493.5875 458.0569
+  495.5081 447.0136 494.5478 434.0497 493.5875 432.1291
+  492.6272 430.2086 494.5478 413.4035 494.5478 411.0028
+  494.5478 408.6021 487.8258 394.1978 486.3853 391.7971
+  484.9449 389.3964 483.5045 386.9956 483.5045 385.0751
+  483.5045 383.1545 482.0641 380.2736 479.6633 376.9126
+  477.2626 373.5516 475.342 368.27 475.342 368.27
 endline
-endscrap
 
-scrap galact4-1p -projection plan -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-point 69.55 82.88 station -name 11
-point 69.55 82.88 station -name 10
-point 75.74 45.39 station -name 9
-point 44.78 -0.88 station -name 8
-point 22.76 -23.72 station -name 7
-point -49.85 -137.97 station -name 6
-point -48.72 -58.78 station -name 5
-point -75.74 -21.56 station -name 4
-point -22.67 93.51 station -name 3
-point -12.07 137.97 station -name 2
-point 57.92 80.83 station -name 1
+point 622.6753 601.435 station -name 11
+point 622.6753 601.435 station -name 10
+point 628.8653 563.945 station -name 9
+point 597.9053 517.675 station -name 8
+point 575.8853 494.835 station -name 7
+point 503.2753 380.585 station -name 6
+point 504.4053 459.775 station -name 5
+point 477.3853 496.995 station -name 4
+point 530.4553 612.065 station -name 3
+point 541.0553 656.525 station -name 2
+point 611.0453 599.385 station -name 1
 endscrap
+
diff --git a/data/M16/1997/tamoka/tamoka-p.th2 b/data/M16/1997/tamoka/tamoka-p.th2
index 0126abe1..8f0a5945 100644
--- a/data/M16/1997/tamoka/tamoka-p.th2
+++ b/data/M16/1997/tamoka/tamoka-p.th2
@@ -2,8 +2,23 @@ encoding  utf-8
 ##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000
 ##XTHERION## xth_me_area_zoom_to 100
 
+scrap tamoka-1p -projection plan -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
 
-scrap tamoka-1p -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300] -projection plan
+line wall -subtype invisible
+  -11.8836 -57.2571
+  4.1494 -45.4069
+endline
+
+line wall -subtype invisible
+  -35.8518 -32.5225
+  -22.4467 -50.0549
+endline
+
+line wall 
+  -22.4467 -50.0549
+  -15.0045 -49.0947
+  -13.1639 -48.5745 -11.8836 -57.2571 -11.8836 -57.2571
+endline
 
 line pit 
   6.96 12.0952
@@ -104,14 +119,17 @@ line wall
   -15.7347 -2.7821
   -15.7347 -2.7821 -22.7635 -6.6159 -23.4024 -7.8938
   -24.0414 -9.1717 -27.8753 -14.2836 -27.4493 -17.0526
-  -27.0233 -19.8214 -27.4493 -24.7202 -27.4493 -24.7202
+  -27.0233 -19.8214 -35.8518 -32.5225 -35.8518 -32.5225
 endline
 
 line wall 
-  -5.8506 -37.4069
-  12.6798 -36.555
-  12.6798 -36.555 20.9865 -37.4069 24.6073 -36.555
-  28.2282 -35.7031 33.34 -32.9341 33.979 -28.2483
+  4.1494 -45.4069
+  10.5622 -45.1121
+  14.4616 -44.9328
+  19.4536 -44.7033
+  22.6798 -44.555
+  22.6798 -44.555 26.1851 -37.8446 29.8059 -36.9927
+  33.4268 -36.1408 33.34 -32.9341 33.979 -28.2483
   34.618 -23.5624 33.766 -13.9778 33.553 -12.6999
   33.34 -11.4219 22.6904 2.2096 22.6904 2.2096
   16.5314 6.3593
@@ -122,6 +140,6 @@ endline
 point -7.4 -8.82 station -name 3
 point -7.4 -8.82 station -name 2
 point 7.4 8.82 station -name 1
-point 38.1272 -26.7626 u:label_MY -attr lvl 2 -attr text "Ta Moka" -align r -scale xs
+point 38.1272 -26.7626 u:label_MY -align r -attr lvl 2 -attr text "Ta Moka" -scale xs
 endscrap
 
diff --git a/data/M16/1997/window/window-p.th2 b/data/M16/1997/window/window-p.th2
new file mode 100644
index 00000000..a6db63e9
--- /dev/null
+++ b/data/M16/1997/window/window-p.th2
@@ -0,0 +1,145 @@
+encoding  utf-8
+##XTHERION## xth_me_area_adjust 0 0 500.000000 1000.000000
+##XTHERION## xth_me_area_zoom_to 100
+
+scrap window-1p -projection plan -scale [0.0 0.0 500 1000.0 -250 -500 250 500]
+
+point 223.7818 508.7394 u:label_MY -align l -attr text Window -attr lvl 3
+line border -close on -id window-1p_u_smallblocks_MY_1 -visibility off
+  253.4707 629.2061
+  249.2445 614.4554
+  269.3326 598.2521
+  284.1631 585.5403
+  303.4958 572.5636
+  326.6989 620.5044
+  335.2603 629.2438 326.834 629.0917 314.8945 630.0744
+  304.7939 630.9058 263.8766 639.0191 258.8848 639.6286
+endline
+
+area u:smallblocks_MY -attr scale 1.4
+  window-1p_u_smallblocks_MY_1
+endarea
+
+line border -close on -id window-1p_u_smallblocks_MY_2 -visibility off
+  236.4936 479.3432
+  255.2966 473.517
+  278.072 466.3665
+  287.8708 478.8136
+  288.9301 485.4343
+  293.9619 536.8114
+  301.1123 560.3814
+  300.5826 567.5318
+  274.0996 587.1292
+  265.0953 594.5445
+  242.6268 609.2732
+  241.7019 596.4216
+  240.6901 568.3496
+  240.6901 568.3496 247.5051 556.6724 248.1416 553.3595
+  249.7018 545.2381 246.0275 540.477 246.0275 539.7246
+  246.0275 538.6653 247.6165 518.5381 246.2924 516.1547
+  244.9682 513.7712 237.2881 495.233 237.2881 495.233
+endline
+
+area u:smallblocks_MY -attr scale 1.4
+  window-1p_u_smallblocks_MY_2
+endarea
+
+line border -close on -id window-1p_u_smallblocks_MY_3 -visibility off
+  234.6398 473.517
+  232.786 463.1886
+  212.1292 441.4725
+  184.322 427.1716
+  177.9661 420.286
+  201.536 411.8114
+  208.1568 419.4915
+  211.8644 419.2267
+  209.2161 410.7521
+  236.4936 405.4555
+  257.6801 433.2627
+  271.7161 457.892
+  274.6292 460.5403
+endline
+
+area u:smallblocks_MY -attr scale 1.4
+  window-1p_u_smallblocks_MY_3
+endarea
+
+line border -close on -id window-1p_u_smallblocks_MY_4 -visibility off
+  223.7818 385.3284
+  231.9848 400.2851
+  193.3263 406.7797
+  174.5233 415.2542
+  130.0318 385.858
+  130.0318 385.858 124.2055 373.9407 123.6759 372.6165
+  123.1462 371.2924 118.3792 353.8136 118.3792 353.8136
+  141.6843 332.3623
+  141.6843 332.3623 182.7331 343.2203 185.911 342.4259
+  189.089 341.6314 213.1886 346.928 216.1017 345.0742
+  219.0148 343.2203 233.8453 335.0106 233.8453 335.0106
+  247.8814 338.9831
+  256.3559 338.9831
+  272.7754 359.6398
+  250.7945 383.4746
+endline
+
+area u:smallblocks_MY -attr scale 1.4
+  window-1p_u_smallblocks_MY_4
+endarea
+
+point 202.8602 408.1038 gradient -orientation 30.0
+point 256.8856 469.2797 gradient -orientation 30.0
+point 283.644 583.5017 gradient -orientation 30.0
+line contour 
+  243.857 614.4665
+  256.5689 600.6953 304.0254 570.4449 304.0254 570.4449
+endline
+
+line contour 
+  235.1695 476.6949
+  251.589 469.2797 279.1314 462.3941 279.1314 462.3941
+endline
+
+line contour 
+  173.1992 418.4322
+  191.7373 407.3093 237.2881 402.5424 237.2881 402.5424
+endline
+
+line wall 
+  264.4229 654.0424
+  264.4229 654.0424 255.9291 647.5428 253.3056 642.2442
+  245.7036 626.8903 237.5285 599.4585 236.741 595.5207
+  235.6817 590.2241 237.7581 577.6298 236.6988 569.1552
+  235.6394 560.6806 246.822 548.7288 246.822 548.7288
+  246.822 548.7288 244.7034 529.661 244.7034 525.4237
+  244.7034 521.1864 231.9915 492.5847 234.1102 487.2881
+  236.2288 481.9915 230.9322 466.1017 227.7542 460.8051
+  224.5763 455.5085 219.2797 451.2712 209.7458 444.9153
+  200.2119 438.5593 192.7966 436.4407 188.5593 432.2034
+  184.322 427.9661 126.0593 386.6526 125.0 380.2966
+  123.9407 373.9407 115.4661 364.4068 115.4661 356.9915
+  115.4661 349.5763 140.8898 330.5085 140.8898 330.5085
+  140.8898 330.5085 168.4322 337.9237 180.0847 336.8644
+  191.7373 335.8051 201.2712 348.5169 217.161 336.8644
+  233.0508 325.2119 238.3475 334.7458 252.1186 334.7458
+  265.8898 334.7458 276.4831 337.9237 274.3644 345.339
+  272.2458 352.7542 277.5424 362.2881 277.5424 362.2881
+  270.1271 367.5847
+  253.178 384.5339
+  223.7817 385.3284
+  237.2881 402.5424
+  237.2881 402.5424 246.822 413.1356 248.9407 416.3136
+  251.0593 419.4915 265.8898 448.0932 272.2458 454.4492
+  278.6017 460.8051 289.1949 473.517 289.1949 478.8136
+  289.1949 484.1102 295.5508 476.6949 293.4322 504.2373
+  291.3136 531.7797 305.0847 569.9153 305.0847 569.9153
+  305.0847 569.9153 315.2477 592.8495 324.5048 610.2633
+endline
+
+point 260.63 342.01 station -name 1
+point 166.46 360.83 station -name 2
+point 183.15 366.18 station -name 3
+point 279.13 487.76 station -name 4
+point 270.08 564.84 station -name 5
+point 333.54 657.99 station -name 6
+endscrap
+
diff --git a/data/M16/1997/window/window.th b/data/M16/1997/window/window.th
index f70b7986..b2c2eb82 100644
--- a/data/M16/1997/window/window.th
+++ b/data/M16/1997/window/window.th
@@ -1,6 +1,12 @@
 
 survey window -title "System Migovec"
 
+input window-p.th2
+
+map m-all-p -projection plan
+    window-1p
+endmap
+
 input window-e.th2
 
 map m-all-e -projection extended
diff --git a/data/M16/1999/dinsdale/dinsdale-p.th2 b/data/M16/1999/dinsdale/dinsdale-p.th2
new file mode 100644
index 00000000..08f12efb
--- /dev/null
+++ b/data/M16/1999/dinsdale/dinsdale-p.th2
@@ -0,0 +1,309 @@
+encoding  utf-8
+##XTHERION## xth_me_area_adjust 0 0 500.000000 1000.000000
+##XTHERION## xth_me_area_zoom_to 100
+
+scrap DELETE-ME-survey-legs-dinsdale-p -projection plan -scale [0.0 0.0 500 1000.0 -250 -500 250 500]
+
+line survey 
+  171.69 609.61
+  164.29 604.41
+endline
+
+line survey 
+  164.29 604.41
+  196.65 586.14
+endline
+
+line survey 
+  196.65 586.14
+  216.18 595.51
+endline
+
+line survey 
+  216.18 595.51
+  245.79 588.43
+endline
+
+line survey 
+  245.79 588.43
+  272.01 600.39
+endline
+
+line survey 
+  272.01 600.39
+  283.27 597.95
+endline
+
+line survey 
+  283.27 597.95
+  295.47 592.13
+endline
+
+line survey 
+  295.47 592.13
+  302.64 590.0
+endline
+
+line survey 
+  302.64 590.0
+  311.54 594.49
+endline
+
+line survey 
+  311.54 594.49
+  335.71 575.28
+endline
+
+line survey 
+  335.71 575.28
+  326.42 550.55
+endline
+
+line survey 
+  326.42 550.55
+  313.9 537.72
+endline
+
+line survey 
+  313.9 537.72
+  306.89 535.59
+endline
+
+line survey 
+  306.89 535.59
+  319.41 508.11
+endline
+
+line survey 
+  319.41 508.11
+  301.77 503.86
+endline
+
+line survey 
+  301.77 503.86
+  321.06 480.39
+endline
+
+line survey 
+  321.06 480.39
+  302.95 440.55
+endline
+
+line survey 
+  302.95 440.55
+  302.32 415.43
+endline
+
+line survey 
+  302.32 415.43
+  302.32 415.43
+endline
+
+line survey 
+  302.32 415.43
+  280.75 406.93
+endline
+
+line survey 
+  280.75 406.93
+  280.75 406.93
+endline
+
+line survey 
+  280.75 406.93
+  263.66 407.95
+endline
+
+line survey 
+  263.66 407.95
+  263.66 407.95
+endline
+
+line survey 
+  263.66 407.95
+  250.75 396.46
+endline
+
+line survey 
+  250.75 396.46
+  250.75 396.46
+endline
+
+line survey 
+  250.75 396.46
+  238.46 390.39
+endline
+
+point 171.69 609.61 station-name -align tr -scale xs -text 1
+point 164.29 604.41 station-name -align tr -scale xs -text 2
+point 196.65 586.14 station-name -align tr -scale xs -text 3
+point 216.18 595.51 station-name -align tr -scale xs -text 4
+point 245.79 588.43 station-name -align tr -scale xs -text 5
+point 272.01 600.39 station-name -align tr -scale xs -text 6
+point 283.27 597.95 station-name -align tr -scale xs -text 7
+point 295.47 592.13 station-name -align tr -scale xs -text 8
+point 302.64 590.0 station-name -align tr -scale xs -text 9
+point 311.54 594.49 station-name -align tr -scale xs -text 10
+point 335.71 575.28 station-name -align tr -scale xs -text 11
+point 326.42 550.55 station-name -align tr -scale xs -text 12
+point 313.9 537.72 station-name -align tr -scale xs -text 13
+point 306.89 535.59 station-name -align tr -scale xs -text 14
+point 319.41 508.11 station-name -align tr -scale xs -text 15
+point 301.77 503.86 station-name -align tr -scale xs -text 16
+point 321.06 480.39 station-name -align tr -scale xs -text 17
+point 302.95 440.55 station-name -align tr -scale xs -text 18
+point 302.32 415.43 station-name -align tr -scale xs -text 20
+point 280.75 406.93 station-name -align tr -scale xs -text 22
+point 263.66 407.95 station-name -align tr -scale xs -text 24
+point 250.75 396.46 station-name -align tr -scale xs -text 26
+point 238.46 390.39 station-name -align tr -scale xs -text 27
+endscrap
+
+
+scrap dinsdale-1p -projection plan -scale [0.0 0.0 500 1000.0 -250 -500 250 500]
+
+point 289.4597 501.3241 u:label_MY -align l -attr lvl 1 -attr text Dinsdale
+line wall 
+  243.817 388.7589
+  250.933 395.3131
+  250.933 395.3131 257.1127 399.2457 257.8618 399.9947
+  258.6108 400.7438 266.4759 405.7999 267.4122 406.1744
+  268.3485 406.5489 272.0938 406.3617 273.9664 405.7999
+  275.8391 405.2381 279.2098 405.2381 279.2098 405.2381
+  279.2098 405.2381 296.2508 408.6089 297.1871 408.6089
+  298.1234 408.6089 302.805 414.6013 302.805 414.6013
+  302.805 414.6013 306.1757 420.0319 306.5503 420.781
+  306.9248 421.53 307.6739 437.8219 307.6739 437.8219
+  307.8611 446.4361
+  307.8611 446.4361 316.288 460.8553 316.6625 462.1662
+  317.037 463.477 319.4714 469.6567 319.846 470.5931
+  320.2205 471.5294 322.2804 484.076 322.2804 484.076
+  322.2804 484.076 316.6625 490.6302 315.9134 491.3793
+  315.1644 492.1283 312.1682 500.1807 312.1682 500.1807
+  313.6663 503.9259
+  320.9696 508.4203
+  320.9696 508.4203 321.9059 514.4127 321.3441 515.349
+  320.7823 516.2853 314.9771 525.4612 314.6026 526.7721
+  314.2281 528.0829 312.3554 531.2664 312.3554 531.2664
+  315.9134 533.139
+  315.9134 533.139 316.8498 532.9518 317.2243 534.2626
+  317.5988 535.5735 317.9733 537.2588 317.9733 537.2588
+  317.9733 537.2588 320.0332 540.6296 321.1568 541.5659
+  322.2804 542.5022 328.4601 549.0564 328.6473 549.9928
+  328.8346 550.9291 334.6398 554.6743 334.6398 556.9215
+  334.6398 559.1687 334.827 564.412 335.3888 565.9101
+  335.9506 567.4082 337.2615 570.779 337.2615 572.6516
+  337.2615 574.5243 337.636 576.7714 337.2615 577.5205
+  336.8869 578.2695 324.7148 588.9435 323.0294 590.6289
+  321.3441 592.3143 313.479 597.1831 313.479 597.1831
+  308.6102 594.7487
+  303.9286 592.6888
+  303.9286 592.6888 299.0597 593.6251 298.1234 593.9997
+  297.1871 594.3742 294.0036 595.8723 293.2546 596.6214
+  292.5055 597.3704 290.8201 599.4303 290.0711 599.6176
+  289.322 599.8048 287.2621 598.6812 287.2621 598.6812
+  283.1423 601.1157
+  274.1537 605.2355
+  274.1537 605.2355 271.3447 605.2355 270.7829 604.4864
+  270.2212 603.7374 268.3485 601.1157 268.3485 601.1157
+  268.3485 601.1157 256.7382 598.1195 255.6146 597.7449
+  254.491 597.3704 249.6222 595.8723 249.6222 595.8723
+  249.6222 595.8723 247.1877 594.1869 246.4387 593.6251
+  245.6896 593.0633 240.259 594.5614 238.5736 595.1232
+  236.8883 595.685 216.4765 597.7449 214.7912 597.1831
+  213.1058 596.6214 207.6752 593.2506 207.6752 593.2506
+  199.9974 592.3143
+  194.0049 591.0034
+  184.08 598.1195
+  184.08 598.1195 180.3347 599.243 179.5856 600.1793
+  178.8366 601.1157 173.5932 606.3591 173.5932 606.3591
+endline
+
+line wall 
+  158.0503 604.6737
+  158.0503 604.6737 156.9268 603.9246 157.6758 602.6138
+  158.4249 601.3029 159.1739 600.9284 159.5485 599.8048
+  159.923 598.6812 163.481 596.4341 163.481 596.4341
+  163.481 596.4341 171.7206 597.3704 172.4696 596.4341
+  173.2187 595.4978 180.7092 592.3143 180.7092 592.3143
+  180.7092 592.3143 183.5182 591.5652 184.2672 591.0034
+  185.0163 590.4416 187.0762 588.3818 188.5743 587.0709
+  190.0724 585.7601 199.9974 582.9511 201.6827 584.262
+  203.3681 585.5728 204.3044 588.0072 206.1771 589.1308
+  208.0497 590.2544 216.8511 592.5015 217.9746 592.5015
+  219.0982 592.5015 220.9709 593.6251 224.5289 592.127
+  228.0869 590.6289 243.2552 585.1983 244.7533 585.3855
+  246.2514 585.5728 248.1241 586.1346 250.184 587.2582
+  252.2439 588.3818 270.5957 595.1232 270.5957 595.1232
+  270.5957 595.1232 272.4683 598.3067 273.7792 598.494
+  275.09 598.6812 277.1499 599.6176 278.4607 598.3067
+  279.7716 596.9959 279.0225 598.1195 280.5206 596.2468
+  282.0187 594.3742 284.8277 593.0633 286.1386 592.8761
+  287.4494 592.6888 290.2583 594.5615 292.131 592.6888
+  294.0036 590.8162 293.4418 591.1907 294.1909 590.6289
+  294.9399 590.0671 296.2508 588.7563 297.7489 588.7563
+  299.247 588.7563 303.554 587.4454 303.554 587.4454
+  308.4229 589.6926
+  308.4229 589.6926 312.9172 592.127 314.7899 590.0671
+  316.6625 588.0072 331.8308 577.3332 331.8308 576.0224
+  331.8308 574.7115 329.3964 570.4045 329.0219 569.0936
+  328.6473 567.7828 326.962 560.6668 326.2129 558.4196
+  325.4639 556.1724 325.6511 554.8616 324.3403 552.8017
+  323.0294 550.7418 318.5351 548.1201 318.5351 548.1201
+  318.5351 548.1201 312.73 542.8767 312.73 541.9404
+  312.73 541.0041 311.9809 538.9442 311.9809 538.9442
+  311.9809 538.9442 311.4191 535.3862 309.1719 537.0716
+  306.9248 538.7569 304.8649 540.255 304.3031 539.506
+  303.7413 538.7569 301.3069 536.3225 301.4941 534.8244
+  301.6814 533.3263 301.4941 531.2664 302.805 529.9556
+  304.1158 528.6447 308.0484 524.8995 308.6102 523.4013
+  309.1719 521.9032 311.2319 517.9707 311.2319 515.349
+  311.2319 512.7273 313.8535 510.8547 312.9172 509.5438
+  311.9809 508.233 306.9248 506.5476 306.1757 506.5476
+  305.4267 506.5476 300.7451 507.6712 299.8088 505.4241
+  298.8725 503.1769 299.4342 499.9934 299.4342 499.9934
+  312.73 482.9524
+  312.3554 473.9638
+  308.4229 463.2898
+  308.4229 463.2898 305.2394 456.1738 304.8649 454.1139
+  304.4904 452.054 301.3069 443.4399 301.3069 443.4399
+  299.6215 424.1517
+  297.9361 420.781
+  297.9361 420.781 291.5692 417.4102 291.1947 416.6612
+  290.8201 415.9121 281.8315 411.2305 281.8315 411.2305
+  277.899 410.1069
+  271.7193 410.6687
+  271.7193 410.6687 264.9778 412.1669 263.8542 411.9796
+  262.7306 411.7923 259.9217 408.2343 259.9217 408.2343
+  259.9217 408.2343 252.8057 400.5565 251.8693 399.9947
+  250.933 399.4329 250.184 399.4329 249.2476 398.8712
+  248.3113 398.3094 244.0043 396.9985 243.4425 396.624
+  242.8807 396.2495 240.259 394.7514 240.259 394.7514
+  236.3265 393.6278
+endline
+
+point 171.69 609.61 station -name 1
+point 164.29 604.41 station -name 2
+point 196.65 586.14 station -name 3
+point 216.18 595.51 station -name 4
+point 245.79 588.43 station -name 5
+point 272.01 600.39 station -name 6
+point 283.27 597.95 station -name 7
+point 295.47 592.13 station -name 8
+point 302.64 590.0 station -name 9
+point 311.54 594.49 station -name 10
+point 335.71 575.28 station -name 11
+point 326.42 550.55 station -name 12
+point 313.9 537.72 station -name 13
+point 306.89 535.59 station -name 14
+point 319.41 508.11 station -name 15
+point 301.77 503.86 station -name 16
+point 321.06 480.39 station -name 17
+point 302.95 440.55 station -name 18
+point 302.32 415.43 station -name 20
+point 280.75 406.93 station -name 22
+point 263.66 407.95 station -name 24
+point 250.75 396.46 station -name 26
+point 238.46 390.39 station -name 27
+endscrap
+
diff --git a/data/M16/1999/dinsdale/dinsdale.th b/data/M16/1999/dinsdale/dinsdale.th
index b0c601bc..369acc04 100644
--- a/data/M16/1999/dinsdale/dinsdale.th
+++ b/data/M16/1999/dinsdale/dinsdale.th
@@ -1,6 +1,12 @@
 
 survey dinsdale -title "System Migovec"
 
+input dinsdale-p.th2
+
+map m-all-p -projection plan
+    dinsdale-1p
+endmap
+
 input dinsdale-e.th2
 
 map m-all-e -projection extended
diff --git a/data/M16/1999/hydrant/hydrant-p.th2 b/data/M16/1999/hydrant/hydrant-p.th2
new file mode 100644
index 00000000..d02e95a7
--- /dev/null
+++ b/data/M16/1999/hydrant/hydrant-p.th2
@@ -0,0 +1,238 @@
+encoding  utf-8
+##XTHERION## xth_me_area_adjust 0 0 500.000000 1000.000000
+##XTHERION## xth_me_area_zoom_to 100
+##XTHERION## xth_me_image_insert {-289.231660 1 1.0} {1021.325595 {}} "/Users/AchilleTalon/Desktop/Screen%20Shot%202021-01-27%20at%2009.41.12.png" 0 {}
+
+
+scrap hydrant-1p -projection plan -scale [0.0 0.0 500 1000.0 -250 -500 250 500]
+
+line pit 
+  199.9974 466.8478
+  199.9974 466.8478 215.1657 457.6719 227.5251 457.6719
+endline
+
+line wall -subtype invisible
+  246.4387 429.2078
+  268.9103 435.5748
+endline
+
+line wall -subtype invisible
+  216.4766 433.7022
+  235.952 433.7022
+endline
+
+line wall 
+  268.9103 435.5748
+  268.9103 435.5748 272.281 440.8182 274.5282 442.3163
+  276.7754 443.8144 276.0263 443.4398 281.6442 445.687
+  287.2621 447.9342 292.5055 448.3087 292.5055 448.3087
+  301.4941 456.1738
+  302.9923 459.17
+  302.9923 459.17 302.9923 460.6681 302.9923 462.5407
+  302.9923 464.4133 300.3706 470.4058 300.3706 470.4058
+  300.3706 470.4058 298.1234 472.6529 299.6215 474.9001
+  301.1196 477.1473 310.4828 486.5104 310.4828 486.5104
+  310.4828 486.5104 319.0969 494.001 319.4714 495.4991
+  319.846 496.9972 320.2205 502.2406 320.2205 503.3641
+  320.2205 504.4877 325.4639 519.0943 325.4639 520.5924
+  325.4639 522.0905 326.2129 529.2065 326.2129 529.2065
+  327.3365 538.5697
+  332.2054 538.9442
+  336.3252 537.8206
+endline
+
+line wall 
+  235.952 433.7022
+  240.0717 435.9493
+  240.0717 435.9493 243.4425 436.6984 244.9406 436.3238
+  246.4387 435.9493 247.1878 435.5748 246.8132 433.7021
+  246.4387 431.8295 246.4387 429.2078 246.4387 429.2078
+endline
+
+line wall 
+  186.7017 454.8629
+  186.7017 454.8629 191.6698 449.779 195.677 449.8947
+  198.8829 449.9871 201.9532 449.9317 202.619 449.4323
+  204.1172 448.3087 210.1096 444.5634 210.1096 444.5634
+  214.6039 442.6908
+  214.6039 442.6908 216.102 443.4398 216.8511 440.8182
+  217.6001 438.1965 216.4766 433.7022 216.4766 433.7022
+endline
+
+line wall 
+  315.3517 552.4272
+  315.3517 552.4272 311.9809 541.9404 310.4828 538.9442
+  308.9847 535.948 304.4904 533.7008 303.7413 531.8282
+  302.9923 529.9556 301.8687 531.4537 301.4941 527.3339
+  301.1196 523.2141 300.7451 521.716 300.7451 519.8433
+  300.7451 517.9707 304.1158 509.7311 302.6177 507.4839
+  301.1196 505.2368 295.5017 497.7463 294.3781 495.8736
+  293.2546 494.001 293.6291 495.4991 292.5055 492.5029
+  291.3819 489.5067 280.8952 478.6454 280.8952 476.7727
+  280.8952 474.9001 281.2697 474.151 280.8952 471.9039
+  280.5206 469.6567 281.2697 466.6605 281.2697 466.6605
+  281.2697 466.6605 282.0188 465.5369 279.7716 465.1624
+  277.5244 464.7879 273.7792 465.1624 273.7792 465.1624
+  273.7792 465.1624 271.532 464.0388 271.1575 462.5407
+  270.783 461.0426 253.1802 453.5521 253.1802 453.5521
+  253.1802 453.5521 251.6821 452.803 249.0604 451.6794
+  246.4387 450.5559 240.0717 449.8068 237.8246 449.8068
+  235.5774 449.8068 229.9595 450.1813 229.9595 450.1813
+  229.9595 450.1813 228.8359 453.1775 228.4614 454.6757
+  228.0869 456.1738 225.8397 457.2973 230.334 459.17
+  234.8284 461.0426 243.817 465.1624 245.3151 465.9115
+  246.8132 466.6605 247.5623 466.6605 248.6859 468.9077
+  249.8094 471.1548 250.5585 471.9039 251.3075 473.0275
+  252.0566 474.151 253.9292 478.6454 253.9292 478.6454
+  252.0566 482.7652
+  243.817 483.5142
+  218.7237 485.3869
+  218.7237 485.3869 216.4766 484.2633 215.7275 482.3906
+  214.9784 480.518 216.102 479.3944 212.3568 478.6454
+  208.6115 477.8963 204.4917 476.7727 204.4917 476.7727
+  204.4917 476.7727 202.6191 476.7727 201.87 474.151
+  201.1209 471.5294 200.7464 470.4058 200.7464 468.9077
+  200.7464 467.4096 197.0011 463.2898 197.0011 463.2898
+  186.7017 454.8629
+endline
+
+point 320.91 514.88 station -name 7
+point 313.03 495.75 station -name 8
+point 289.09 471.34 station -name 9
+point 295.08 459.29 station -name 10
+point 279.88 456.46 station -name 12
+point 274.06 460.0 station -name 13
+point 230.2 439.92 station -name 14
+point 196.89 454.41 station -name 16
+point 239.8 478.74 station -name 17
+endscrap
+
+
+scrap hydrant-2p -projection plan -scale [0 0 96 0 0 0 200 0 inch]
+
+line wall -subtype invisible
+  368.1599 562.5394
+  460.7324 685.3953
+endline
+
+point 501.1059 655.3644 u:label_MY -align r -attr text "Gauntlet Gulf" -attr lvl 1
+line wall 
+  425.4626 689.1295
+  415.7249 682.7625
+  413.4777 676.7701
+  413.4777 676.7701 412.7286 673.3994 412.7286 671.5267
+  412.7286 669.6541 412.3541 667.7815 411.6051 666.2833
+  410.856 664.7852 399.6202 654.673 398.4966 653.5494
+  397.373 652.4259 392.1297 647.1825 390.6316 644.5608
+  389.1334 641.9391 379.7703 623.9618 379.0212 622.0892
+  378.2722 620.2165 364.0401 591.7525 364.0401 591.7525
+  364.0401 591.7525 361.793 584.6365 359.5458 582.3893
+  357.2987 580.1422 343.4412 573.7752 343.4412 573.7752
+  337.0742 556.547
+  330.3327 554.6743
+  319.4714 555.0489
+  316.1007 552.8017
+endline
+
+line wall 
+  460.7324 685.3953
+  461.099 689.2376 458.7954 696.9946 458.7954 696.9946
+  458.0464 707.4813
+  456.1738 714.9719
+endline
+
+line wall 
+  337.8233 537.4461
+  337.8233 537.4461 359.1713 547.5583 359.5458 549.0564
+  359.9203 550.5545 368.1599 562.5394 368.1599 562.5394
+endline
+
+point 446.34 767.17 station -name 1
+point 447.13 688.19 station -name 2
+point 385.71 625.51 station -name 3
+point 358.07 561.81 station -name 4
+point 348.46 557.24 station -name 5
+point 323.9 546.06 station -name 6
+
+endscrap
+
+
+scrap hydrant-3p -projection plan -scale [0 0 96 0 0 0 200 0 inch]
+
+line wall 
+  199.9974 466.8478
+  199.9974 466.8478 193.8393 463.2016 188.7578 462.1789
+  184.1419 461.2499 180.7745 463.1406 176.8706 459.4453
+  171.5699 454.4277 172.131 442.3091 171.0805 436.9703
+  170.5298 434.1717 172.9126 431.5402 174.2585 429.0254
+  175.876 426.003 179.0135 423.8072 180.0847 420.5508
+  181.7408 415.5167 180.5261 409.9598 180.6144 404.661
+  180.6409 403.0723 180.9149 401.4544 180.6144 399.8941
+  180.2548 398.0268 179.515 396.2027 178.4958 394.5975
+  176.554 391.5393 173.5348 389.317 171.0805 386.6525
+  169.3023 384.7221 166.9918 383.1565 165.7839 380.8263
+  165.0348 379.3811 165.035 377.6572 164.7246 376.0593
+  164.3149 373.9509 164.6769 371.5981 163.6653 369.7034
+  161.7239 366.0675 157.4353 364.2771 154.661 361.2288
+  151.9512 358.2513 149.6895 354.8944 147.2458 351.6949
+  145.1024 348.8888 143.2034 345.8879 140.8898 343.2203
+  138.5995 340.5796 136.1321 338.0759 133.4746 335.8051
+  131.6489 334.2451 129.7738 332.6853 127.6483 331.5678
+  124.8311 330.0866 120.8749 330.6601 118.6441 328.3898
+  117.4701 327.1951 117.5122 325.2342 117.0551 323.6229
+  116.2136 320.6566 116.0966 317.4754 114.9364 314.6186
+  114.1617 312.711 113.124 310.863 111.7585 309.322
+  109.0884 306.3088 104.3412 305.3315 102.2246 301.9068
+  101.7513 301.141 101.907 300.1334 101.6949 299.2585
+  101.0892 296.7602 100.4252 294.2697 99.5763 291.8432
+  98.8183 289.6768 98.1517 287.429 96.928 285.4873
+  94.528 281.6792 90.8657 278.8305 87.9237 275.4237
+  85.22 272.2928 82.6652 269.0357 79.9788 265.8898
+  75.1037 260.181 69.9408 254.7191 65.1483 248.9407
+  63.1416 246.5211 61.9602 243.2347 59.322 241.5254
+  56.2674 239.5463 48.7288 238.8771 48.7288 238.8771
+endline
+
+line wall 
+  54.5 222.8686
+  54.5 222.8686 65.772 228.342 70.9195 231.8729
+  77.0153 236.0543 82.7422 240.848 87.8686 246.1737
+  94.2367 252.7893 99.4424 260.4451 104.8178 267.8898
+  106.681 270.4703 108.1068 273.3649 110.1144 275.8347
+  111.2427 277.2228 113.1538 278.025 113.8771 279.661
+  115.1641 282.5721 112.3069 286.803 114.4068 289.1949
+  116.3029 291.3548 120.3148 289.4903 122.8814 290.7839
+  125.8934 292.3021 128.4183 294.8678 130.2966 297.6695
+  131.9766 300.1754 133.303 303.132 133.4746 306.1441
+  133.6402 309.0512 131.2049 311.7108 131.3559 314.6186
+  131.4631 316.6824 132.2143 318.8072 133.4746 320.4449
+  136.4913 324.3652 141.7318 325.9088 145.6568 328.9195
+  157.3874 337.9175 168.2623 347.9794 179.5551 357.5212
+  181.8516 359.4617 184.6653 360.921 186.4407 363.3475
+  187.796 365.1998 188.3045 367.5464 189.089 369.7034
+  190.1006 372.4847 190.8279 375.3616 191.7373 378.178
+  193.9674 385.0849 198.0551 391.5989 198.6229 398.8347
+  199.1269 405.2586 196.1046 411.4928 195.4449 417.9025
+  194.9927 422.2967 193.0981 427.1178 194.9153 431.1441
+  200.6795 443.916 227.5251 457.6719 227.5251 457.6719
+endline
+
+point 160.7521 457.6271 u:label_MY -align l -attr text Hydrant -attr lvl 1
+point 229.65 478.66 station -name 20
+
+
+point 229.65 478.66 station-name -align tr -scale xs -text 20
+point 177.2 435.28 station -name 21
+point 185.94 407.56 station -name 22
+point 188.62 399.06 station -name 25
+point 169.72 370.39 station -name 26
+point 158.78 351.02 station -name 28
+point 125.16 322.28 station -name 29
+point 125.39 298.74 station -name 30
+point 109.88 299.13 station -name 31
+point 96.73 278.43 station -name 32
+point 69.8 246.85 station -name 33
+point 52.87 232.83 station -name 34
+
+endscrap
+
diff --git a/data/M16/1999/hydrant/hydrant.th b/data/M16/1999/hydrant/hydrant.th
index 5267678f..dedc1f15 100644
--- a/data/M16/1999/hydrant/hydrant.th
+++ b/data/M16/1999/hydrant/hydrant.th
@@ -1,6 +1,17 @@
 
 survey hydrant -title "System Migovec"
 
+input hydrant-p.th2
+
+map m-all-p -projection plan
+    hydrant-2p
+    hydrant-1p
+    break
+    hydrant-3p
+endmap
+
+join hydrant-2p hydrant-1p
+
 input hydrant-e.th2
 
 map m-all-e -projection extended
diff --git a/data/M16/1999/hydrant2/hydrant2-p.th2 b/data/M16/1999/hydrant2/hydrant2-p.th2
new file mode 100644
index 00000000..df121cb1
--- /dev/null
+++ b/data/M16/1999/hydrant2/hydrant2-p.th2
@@ -0,0 +1,101 @@
+encoding  utf-8
+##XTHERION## xth_me_area_adjust 0 0 500.000000 1000.000000
+##XTHERION## xth_me_area_zoom_to 100
+
+scrap hydrant2-1p -projection plan -scale [0.0 0.0 500 1000.0 -250 -500 250 500]
+
+point 265.3602 425.053 u:label_MY -align br -attr text R.S. -attr lvl 2
+point 204.714 530.3231 u:label_MY -align l -attr text R.C. -attr lvl 2
+line rock-border -close on
+  236.4936 517.4788
+  229.608 516.9492
+  228.2839 510.858
+  235.6992 506.0911
+  238.6123 509.5339
+  239.6716 512.447
+endline
+
+line rock-border -close on
+  245.233 510.0636
+  247.6165 502.1187
+  247.6165 502.1187 249.7352 503.4428 250.7945 503.9725
+  251.8538 504.5021 252.9131 507.6801 252.9131 508.7394
+  252.9131 509.7987 252.6483 511.9174 252.6483 511.9174
+  250.5297 513.5064
+endline
+
+line rock-border -close on
+  240.7309 500.5297
+  240.7309 500.5297 233.8453 500.7945 233.8453 499.4703
+  233.8453 498.1462 233.5805 494.7034 233.5805 494.7034
+  233.5805 494.7034 238.6123 490.4661 239.6716 490.7309
+  240.7309 490.9958 240.9958 491.5254 241.2606 492.5847
+  241.5254 493.6441 241.5254 495.233 241.5254 496.2924
+  241.5254 497.3517 240.7309 500.5297 240.7309 500.5297
+endline
+
+line rock-border -close on
+  256.8856 492.5847
+  250.0 488.6123
+  249.2055 485.4343
+  253.178 481.4619
+  258.7394 483.5805
+  258.7394 483.5805 259.7987 485.964 259.7987 487.0233
+  259.7987 488.0826 256.8856 492.5847 256.8856 492.5847
+endline
+
+line pit 
+  269.3326 474.3114
+  253.7076 476.6949
+  253.7076 476.6949 247.6165 475.9004 244.4386 473.517
+  241.2606 471.1335 239.142 462.6589 239.142 462.6589
+endline
+
+line pit 
+  224.3114 520.1271
+  243.3792 524.6292
+  243.3792 524.6292 249.4703 530.4555 249.7352 531.5148
+  250.0 532.5742 251.0593 536.8114 251.0593 538.9301
+  251.0593 541.0487 250.2648 546.6102 249.7352 548.1992
+  249.2055 549.7881 246.0275 556.9386 246.0275 556.9386
+endline
+
+line wall 
+  261.3877 566.4725
+  261.3877 566.4725 256.3559 561.9703 255.2966 560.911
+  254.2373 559.8517 253.4428 558.2627 252.1186 557.4682
+  250.7945 556.6737 250.5297 555.6144 247.6165 556.6737
+  244.7034 557.7331 240.4661 558.7924 238.3475 559.322
+  236.2288 559.8517 226.1653 553.2309 226.1653 553.2309
+  226.1653 553.2309 224.0466 552.1716 222.9873 551.9068
+  221.928 551.6419 217.9555 543.1674 217.4258 541.5784
+  216.8962 539.9894 219.2797 527.5424 219.8093 525.6886
+  220.339 523.8347 225.3708 519.5975 226.1653 517.214
+  226.9597 514.8305 233.5805 492.5847 233.5805 492.5847
+  233.5805 492.5847 230.1377 488.3475 233.0508 484.9047
+  235.964 481.4619 237.8178 471.1335 237.553 469.0148
+  237.2881 466.8962 246.0275 439.6186 246.0275 439.6186
+  246.0275 439.6186 251.589 436.1758 251.0593 435.1165
+  250.5297 434.0572 251.8538 430.6144 251.8538 430.6144
+  251.8538 430.6144 270.1271 431.6737 271.1864 432.7331
+  272.2458 433.7924 276.2182 438.0297 276.2182 438.0297
+  279.3962 446.7691
+  279.3962 446.7691 279.661 452.8602 278.6017 454.4492
+  277.5424 456.0381 268.0085 476.1653 268.803 479.6081
+  269.5975 483.0508 263.2415 490.2013 262.1822 491.5254
+  261.1229 492.8496 257.6801 499.4703 257.9449 501.3242
+  258.2097 503.178 252.1186 518.0085 251.3242 519.8623
+  250.5297 521.7161 250.5297 527.0127 251.3242 528.072
+  252.1186 529.1314 256.0911 538.6653 256.0911 538.6653
+  264.3008 540.7839
+  266.9492 547.9343
+  270.6568 557.9979
+  270.6568 557.9979
+endline
+
+point 262.32 555.71 station -name 2
+point 270.43 566.34 station -name 1
+point 229.57 545.31 station -name rotting_communism
+point 262.72 433.66 station -name 4
+endscrap
+
diff --git a/data/M16/1999/hydrant2/hydrant2.th b/data/M16/1999/hydrant2/hydrant2.th
index 32a995ec..ba8399eb 100644
--- a/data/M16/1999/hydrant2/hydrant2.th
+++ b/data/M16/1999/hydrant2/hydrant2.th
@@ -1,6 +1,12 @@
 
 survey hydrant2 -title "System Migovec"
 
+input hydrant2-p.th2
+
+map m-all-p -projection plan
+    hydrant2-1p
+endmap
+
 input hydrant2-e.th2
 
 map m-all-e -projection extended
diff --git a/data/M16/1999/offhyd/offhyd-p.th2 b/data/M16/1999/offhyd/offhyd-p.th2
new file mode 100644
index 00000000..9ba6650d
--- /dev/null
+++ b/data/M16/1999/offhyd/offhyd-p.th2
@@ -0,0 +1,144 @@
+encoding  utf-8
+##XTHERION## xth_me_area_adjust 0 0 500.000000 1000.000000
+##XTHERION## xth_me_area_zoom_to 100
+
+scrap DELETE-ME-survey-legs-offhyd-p -projection plan -scale [0.0 0.0 500 1000.0 -250 -500 250 500]
+
+line survey 
+  135.16 422.13
+  117.36 371.81
+endline
+
+line survey 
+  148.46 444.72
+  135.16 422.13
+endline
+
+line survey 
+  189.09 467.8
+  148.46 444.72
+endline
+
+line survey 
+  129.57 375.59
+  109.17 366.69
+endline
+
+line survey 
+  159.88 425.2
+  129.57 375.59
+endline
+
+line survey 
+  159.88 425.2
+  189.09 467.8
+endline
+
+point 135.16 422.13 station-name -align tr -scale xs -text 2
+point 117.36 371.81 station-name -align tr -scale xs -text 1
+point 148.46 444.72 station-name -align tr -scale xs -text 3
+point 189.09 467.8 station-name -align tr -scale xs -text 4
+point 129.57 375.59 station-name -align tr -scale xs -text 6
+point 109.17 366.69 station-name -align tr -scale xs -text 5
+point 159.88 425.2 station-name -align tr -scale xs -text 7
+endscrap
+
+
+scrap offhyd-1p -projection plan -scale [0.0 0.0 500 1000.0 -250 -500 250 500]
+
+line wall 
+  128.2755 434.6385
+  128.2755 434.6385 126.2249 428.0163 126.0283 424.5263
+  125.6219 417.3135 125.1504 410.0454 123.5939 402.9909
+  123.2111 401.2561 122.7237 399.5133 121.9085 397.9348
+  120.4533 395.1172 117.7813 393.056 116.2906 390.257
+  114.824 387.5034 114.3374 384.3226 113.1071 381.4556
+  112.1714 379.2751 109.3482 377.3907 109.9236 375.0887
+  110.6607 372.1396 114.3361 370.1209 117.36 369.81
+  121.1073 369.4247 125.1734 371.5579 127.7137 374.3396
+  130.3759 377.2548 130.3919 381.7745 131.4589 385.5754
+  132.5148 389.3367 133.0938 393.2185 134.0806 396.9985
+  135.0336 400.6489 136.1127 404.2671 137.2641 407.8598
+  139.0595 413.4619 140.4854 419.2412 143.0693 424.5262
+  144.7348 427.9327 149.249 434.0767 149.249 434.0767
+endline
+
+point 135.16 422.13 station -name 2
+point 117.36 371.81 station -name 1
+point 148.46 444.72 station -name 3
+endscrap
+
+
+scrap offhyd-2p -projection plan -scale [0 0 96 0 0 0 200 0 inch]
+
+line wall 
+  156.9268 433.5149
+  156.5523 432.7658 155.2414 429.0206 153.7433 427.3352
+  152.2452 425.6498 147.0018 419.8447 145.3164 416.0994
+  143.6311 412.3541 131.6462 391.5679 131.2717 391.0061
+  130.8972 390.4443 124.9047 382.5792 122.6576 381.2684
+  120.4104 379.9575 112.3581 378.6467 111.4218 377.8976
+  110.4854 377.1486 103.5567 374.9014 103.744 373.9651
+  103.9312 373.0288 105.0548 360.8567 107.8638 360.2949
+  110.6727 359.7331 116.8524 361.2312 117.6014 361.9803
+  118.3505 362.7293 131.0844 371.1562 132.957 372.2797
+  134.8297 373.4033 141.9457 376.2123 142.5075 377.3359
+  143.0693 378.4594 144.3801 381.4556 145.3164 385.0137
+  146.2527 388.5717 155.9905 405.4254 156.7395 406.3617
+  157.1493 406.8739 164.0032 416.3519 170.1285 424.8334
+  175.2005 431.8566 179.7729 438.1965 179.7729 438.1965
+endline
+
+point 189.09 467.8 station -name 4
+point 129.57 375.59 station -name 6
+point 109.17 366.69 station -name 5
+point 159.88 425.2 station -name 7
+endscrap
+
+
+scrap offhyd-3p -projection plan -scale [0 0 96 0 0 0 200 0 inch]
+
+line border -close on -id offhyd-3p_blocks_1 -visibility off
+  291.0074 578.644
+  356.1751 594.7487
+  392.83 605.04
+  399.2457 621.3401
+  387.2608 666.6579
+  387.6353 678.6427
+  383.8901 693.6238
+  345.0125 639.7275
+endline
+
+area u:smallblocks_MY -attr scale 0.9
+  offhyd-3p_blocks_1
+endarea
+
+point 390.83 605.04 station -name 8
+point 300.75 633.31 station -name 9
+line survey 
+  390.83 605.04
+  300.75 633.31
+endline
+
+point 390.83 605.04 station-name -align tr -scale xs -text 8
+point 300.75 633.31 station-name -align tr -scale xs -text 9
+line wall -subtype invisible
+  384.6391 701.1144
+  291.0074 578.644
+endline
+
+line wall 
+  291.0074 578.644
+  295.7163 577.1235 304.2086 581.8057 316.8401 582.8777
+  336.0491 584.5078 350.013 591.5535 367.7854 594.3742
+  374.3655 595.4186 380.7829 597.3114 387.2608 598.8685
+  390.2637 599.5903 394.2122 598.7945 396.2495 601.1157
+  400.5602 606.0271 398.5849 614.0568 398.4966 620.591
+  398.4131 626.7699 397.1148 632.8892 395.875 638.9429
+  393.7484 649.3265 388.2927 659.0754 387.6353 669.6541
+  387.4372 672.842 389.0427 675.9524 388.9534 679.1452
+  388.7448 686.6052 384.6391 701.1144 384.6391 701.1144
+endline
+
+endscrap
+
diff --git a/data/M16/1999/offhyd/offhyd.th b/data/M16/1999/offhyd/offhyd.th
index 7cab3af1..7410d923 100644
--- a/data/M16/1999/offhyd/offhyd.th
+++ b/data/M16/1999/offhyd/offhyd.th
@@ -1,6 +1,15 @@
 
 survey offhyd -title "System Migovec"
 
+input offhyd-p.th2
+
+map m-all-p -projection plan
+    offhyd-1p
+    break
+    offhyd-2p
+    offhyd-3p
+endmap
+
 input offhyd-e.th2
 
 map m-all-e -projection extended
diff --git a/data/M16/1999/spiny/spiny-p.th2 b/data/M16/1999/spiny/spiny-p.th2
new file mode 100644
index 00000000..2ed8bd5d
--- /dev/null
+++ b/data/M16/1999/spiny/spiny-p.th2
@@ -0,0 +1,127 @@
+encoding  utf-8
+##XTHERION## xth_me_area_adjust 0 0 500.000000 1000.000000
+##XTHERION## xth_me_area_zoom_to 100
+
+scrap DELETE-ME-survey-legs-spiny-p -projection plan -scale [0.0 0.0 500 1000.0 -250 -500 250 500]
+
+line survey 
+  342.44 586.34
+  298.35 587.44
+endline
+
+line survey 
+  298.35 587.44
+  272.6 555.0
+endline
+
+line survey 
+  272.6 555.0
+  272.6 555.0
+endline
+
+line survey 
+  272.6 555.0
+  237.17 523.58
+endline
+
+line survey 
+  237.17 523.58
+  223.86 507.99
+endline
+
+line survey 
+  223.86 507.99
+  240.47 476.18
+endline
+
+line survey 
+  240.47 476.18
+  231.02 433.43
+endline
+
+line survey 
+  231.02 433.43
+  169.53 417.52
+endline
+
+line survey 
+  169.53 417.52
+  157.56 412.56
+endline
+
+point 342.44 586.34 station-name -align tr -scale xs -text 1
+point 298.35 587.44 station-name -align tr -scale xs -text 2
+point 272.6 555.0 station-name -align tr -scale xs -text 4
+point 237.17 523.58 station-name -align tr -scale xs -text 5
+point 223.86 507.99 station-name -align tr -scale xs -text 6
+point 240.47 476.18 station-name -align tr -scale xs -text 7
+point 231.02 433.43 station-name -align tr -scale xs -text 8
+point 169.53 417.52 station-name -align tr -scale xs -text 9
+point 157.56 412.56 station-name -align tr -scale xs -text 10
+endscrap
+
+
+scrap spiny-1p -projection plan -scale [0.0 0.0 500 1000.0 -250 -500 250 500]
+
+point 134.5339 425.053 u:label_MY -align l -attr lvl 2 -attr text "Spiny Norman"
+line wall 
+  165.3536 408.2343
+  165.3536 408.2343 166.1027 412.3541 167.4135 412.7286
+  168.7244 413.1032 173.7805 415.3503 174.7168 415.7249
+  175.6531 416.0994 179.0685 416.9911 185.2036 417.972
+  191.3386 418.9529 206.9261 419.8447 211.6077 420.781
+  216.2893 421.7173 228.2741 428.2715 228.8359 429.2078
+  229.3977 430.1441 231.6449 432.5786 232.3939 432.9531
+  233.143 433.3276 240.0717 453.3648 240.259 454.6757
+  240.4463 455.9865 239.1354 458.2337 239.1354 459.7318
+  239.1354 461.2299 241.0081 469.0949 241.1953 469.6567
+  241.3826 470.2185 242.9386 474.0107 241.7571 478.6454
+  240.5756 483.2801 231.2704 493.8137 231.2704 495.3118
+  231.2704 496.8099 229.0232 508.6075 229.585 509.3566
+  230.1468 510.1056 232.2067 511.2292 232.7685 511.9783
+  233.3303 512.7273 240.0717 523.7759 241.7571 524.3377
+  243.4425 524.8995 257.1127 535.948 258.4236 536.697
+  259.7344 537.4461 261.9816 538.1952 263.6669 540.0678
+  265.3523 541.9404 266.8504 544.9366 267.974 546.2475
+  269.0976 547.5583 274.1537 551.4909 275.09 552.0526
+  276.0263 552.6144 289.322 566.0974 289.5093 567.7828
+  289.6966 569.4682 295.689 579.7676 295.689 579.7676
+endline
+
+line wall 
+  282.5805 595.685
+  282.5805 595.685 280.9744 591.4182 279.7716 588.7563
+  278.5688 586.0944 275.09 581.8275 275.2773 579.7676
+  275.4645 577.7077 272.8428 569.4682 272.6556 567.97
+  272.4683 566.4719 266.8504 555.2361 265.9141 554.2998
+  264.9778 553.3635 257.1127 550.18 255.8019 549.0564
+  254.491 547.9329 247.375 546.9965 247.0005 546.0602
+  246.626 545.1239 242.8807 539.1315 242.3189 538.1952
+  241.7571 537.2588 239.0331 528.4186 235.17 523.58
+  231.3069 518.7414 220.0345 511.6037 218.911 510.4802
+  217.7874 509.3566 219.66 489.6939 220.4091 488.9449
+  221.1581 488.1958 236.1392 476.7727 236.1392 475.0874
+  236.1392 473.402 234.2666 466.4733 233.5175 464.2261
+  232.7685 461.9789 226.5888 439.8818 225.8397 438.9455
+  225.0907 438.0092 221.8794 436.4617 217.9746 434.8257
+  214.0699 433.1898 203.1808 430.5187 202.2445 429.7696
+  201.3082 429.0206 183.2019 424.0158 176.7767 423.5899
+  170.3515 423.164 165.5409 425.088 164.4173 424.9008
+  163.2937 424.7135 159.1373 424.0745 156.9268 422.8409
+  154.7163 421.6072 152.8569 419.1409 151.4961 417.7848
+  150.1353 416.4286 149.6555 415.8492 148.6872 414.7885
+  147.7189 413.7279 146.3294 412.5899 145.691 411.4178
+  145.0525 410.2457 144.7547 408.0471 144.7547 408.0471
+endline
+
+point 342.44 586.34 station -name 1
+point 298.35 587.44 station -name 2
+point 272.6 555.0 station -name 4
+point 237.17 523.58 station -name 5
+point 223.86 507.99 station -name 6
+point 240.47 476.18 station -name 7
+point 231.02 433.43 station -name 8
+point 169.53 417.52 station -name 9
+point 157.56 412.56 station -name 10
+endscrap
+
diff --git a/data/M16/1999/spiny/spiny.th b/data/M16/1999/spiny/spiny.th
index 8c48da0d..5ebedf32 100644
--- a/data/M16/1999/spiny/spiny.th
+++ b/data/M16/1999/spiny/spiny.th
@@ -1,6 +1,14 @@
 
 survey spiny -title "System Migovec"
 
+
+input spiny-p.th2
+
+map m-all-p -projection plan
+    spiny-1p
+endmap
+
+
 input spiny-e.th2
 
 map m-all-e -projection extended
diff --git a/data/M16/M16-p.thm b/data/M16/M16-p.thm
index a829f471..3f14f289 100644
--- a/data/M16/M16-p.thm
+++ b/data/M16/M16-p.thm
@@ -38,6 +38,8 @@ map m-all-p -projection plan -title "M16"
 		m-all-p@brezno
 		m-all-p@goodbag
 		m-all-p@baddybag
+		m-all-p@spiny
+		m-all-p@dinsdale
 	endmap
 
 	map m-galaktika-p -projection plan
@@ -46,7 +48,12 @@ map m-all-p -projection plan -title "M16"
 		m-all-p@tamoka
 		m-all-p@galact1
 		m-all-p@galact2
-		m-all-p@galact3 # Galaktika chamber proper
+		m-all-p@window
+		m-all-p@galact3
+		m-all-p@galact4 # Galaktika chamber proper
+		m-all-p@offhyd
+		m-all-p@hydrant
+		m-all-p@hydrant2
 	endmap
 
 	map m-hotel_tolminka-p -projection plan
diff --git a/data/M16/M16.th b/data/M16/M16.th
index b107b6c9..8e13cc37 100644
--- a/data/M16/M16.th
+++ b/data/M16/M16.th
@@ -140,6 +140,12 @@ survey M16 -title "M16 part of System Migovec" -attr cadastral_n 6001
 	
 	join hotline-1p@hotline lostcity-1p@lostcity
 	join baddybag-3p@baddybag goodbag-1p@goodbag
+	join window-1p@window galact3-1p@galact3
+	join tamoka-1p@tamoka hydrant-2p@hydrant
+	join hydrant-3p@hydrant hydrant2-1p@hydrant2
+	join offhyd-1p@offhyd hydrant-1p@hydrant
+	join offhyd-2p@offhyd hydrant-1p@hydrant
+	join offhyd-3p@offhyd hydrant-2p@hydrant
 
 	join hotel-1p@hotel sajeta-3p@sajeta
 	join coldfeet-1p@coldfeet god-1p@god
@@ -304,6 +310,8 @@ survey M16 -title "M16 part of System Migovec" -attr cadastral_n 6001
 	join skalar2-1p@skalar2 skalar-1p@skalar
 	join obelix-1p@obelix skalar2-1p@skalar2
 	join getafix-1p@getafix obelix-1p@obelix
+	join spiny-1p@spiny brezno-3p@brezno
+	join spiny-1p@spiny dinsdale-1p@dinsdale
 
 	
 	
diff --git a/data/vrtnarija/2014/AJA/AJA.th b/data/vrtnarija/2014/AJA/AJA.th
index 221c814c..271b7e76 100644
--- a/data/vrtnarija/2014/AJA/AJA.th
+++ b/data/vrtnarija/2014/AJA/AJA.th
@@ -1,5 +1,5 @@
 
-survey AJA -title "AJA"
+survey AJA -title "AJA?!"
 
 input AJA-e.th2
 
diff --git a/layouts/base-p.thl b/layouts/base-p.thl
index efb24166..c2cf817a 100644
--- a/layouts/base-p.thl
+++ b/layouts/base-p.thl
@@ -196,33 +196,49 @@ layout base-p
 		enddef;
 
 		def a_u_smallblocks_MY (expr p) =
-		  T:=identity;
-		  pickup PenD;
-		  path q, qq; q = bbox p;
-		  picture tmp_pic;
-		  uu := max(u, (xpart urcorner q - xpart llcorner q)/100, (ypart urcorner q - ypart llcorner q)/100);
-		  tmp_pic := image(
-		    for i = xpart llcorner q step 0.4uu until xpart urcorner q:
-		      for j = ypart llcorner q step 0.4uu until ypart urcorner q:
-		        k := (4+normaldeviate)/5;
+    T:=identity;
+    pickup PenD;
+    save S,sc;
+    string S;
+    numeric sc;
+    
+    if known ATTR_scale:
+      sc :=scantokens(ATTR_scale);
+    else: sc:=1;
+    fi;
 
-		        qq := punked (((-.17uu,.07uu)--(-.17uu,-.07uu)--(0,-.12uu)--(.17uu,-.08uu)--(.15uu,.06uu)--(0,.13uu)--cycle)
-		       randomized (uu/9))
-		         rotated uniformdeviate(360)
-		         scaled k
-		         shifted ((i,j) randomized 0.25uu);
+    %if S='xs' : sc:=0.5;
+    %elseif S='s' : sc:=0.7;
+    %elseif S=''l' : sc:=1.4;
+    %elseif S='xl' : sc:=2
+    %else: sc:=1;
+    %fi;
 
-		  if xpart (p intersectiontimes qq) < 0:
-		    thclean qq;
-		    thdraw qq withcolor(0.3,0.3,0.3);
-		  fi;
-		      endfor;
-		    endfor;
-		  );
-		  clip tmp_pic to p;
-		  drawoptions();
-		  draw tmp_pic;
-		enddef;
+    path q, qq; q = bbox p;
+    picture tmp_pic;
+    uu := max(u, (xpart urcorner q - xpart llcorner q)/100, (ypart urcorner q - ypart llcorner q)/100);
+    tmp_pic := image(
+      for i = xpart llcorner q step 0.4uu*sc until xpart urcorner q:
+        for j = ypart llcorner q step 0.4uu*sc until ypart urcorner q:
+          k := (4+normaldeviate)/5;
+
+          qq := punked (((-.17uu*sc,.07uu*sc)--(-.17uu*sc,-.07uu*sc)--(0,-.12uu*sc)--(.17uu*sc,-.08uu*sc)--(.15uu*sc,.06uu*sc)--(0,.13uu*sc)--cycle)
+         randomized (uu/9))
+           rotated uniformdeviate(360)
+           scaled k
+           shifted ((i,j) randomized 0.25uu);
+
+    if xpart (p intersectiontimes qq) < 0:
+      thclean qq;
+      thdraw qq withcolor(0.3,0.3,0.3);
+    fi;
+        endfor;
+      endfor;
+    );
+    clip tmp_pic to p;
+    drawoptions();
+    draw tmp_pic;
+  enddef;
 		
 		
 		#_____________________________________________________________
diff --git a/layouts/detailed-p.thl b/layouts/detailed-p.thl
index 090624ce..2e7885f1 100644
--- a/layouts/detailed-p.thl
+++ b/layouts/detailed-p.thl
@@ -22,7 +22,7 @@ layout detailed
   legend on
   map-header -5 95 ne
   statistics topo-length off
-  fonts-setup 6 10 14 21 28
+  fonts-setup 6 7 10 12 14
   symbol-hide point label
 
 code metapost 
@@ -104,6 +104,15 @@ code metapost
       thdraw (0,-.28u)--(0,0.15u) withcolor (0,0.7,0.9);
     enddef;
 
+    def p_waterflow_permanent_MY (expr P,R,S,A)=
+    U:=(.2u,.2u);
+      T:=identity aligned A rotated R scaled S shifted P;
+      pickup PenD;
+      thdraw (-.07u,.28u)--(.07u,.28u)--(0,0.43u)--cycle;
+    thfill (-.07u,.28u)--(.07u,.28u)--(0,0.43u)--cycle;      
+    thdraw (-0.04u,0.29u)..(.04u,.2u)..(-0.05u,0.1u)..(.05u,0)..(-0.05u,-0.1u)..(0,-0.2u);
+    enddef;
+
     def p_station_fixed_MY (expr pos)=
     T:=identity shifted pos;
     pickup PenD;
@@ -691,6 +700,7 @@ enddef;
    
    ## points
     # redefinitions 
+    initsymbol("p_waterflow_permanent_MY");
     initsymbol("p_pillar_MY");
     initsymbol("p_stalagmite_MY");
     initsymbol("p_stalactite_MY");