diff --git a/data/vrtnarija/2010/kamikaze/kamikaze-e.th2 b/data/vrtnarija/2010/kamikaze/kamikaze-e.th2
index f745e1a9..62cd171c 100644
--- a/data/vrtnarija/2010/kamikaze/kamikaze-e.th2
+++ b/data/vrtnarija/2010/kamikaze/kamikaze-e.th2
@@ -1,180 +1,257 @@
 encoding  utf-8
-##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000
+##XTHERION## xth_me_area_adjust -605.0 -245.0 606.0 243.0
 ##XTHERION## xth_me_area_zoom_to 100
 
+
+
 scrap DELETE-ME-survey-legs-e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-line survey 
+
+line survey
   -369.64 109.02
-  -342.82 111.30
+  -342.82 111.3
 endline
-line survey 
+
+line survey
   -404.03 81.14
   -369.64 109.02
 endline
-line survey 
+
+line survey
   -443.34 18.23
   -404.03 81.14
 endline
-line survey 
+
+line survey
   -443.34 -35.87
   -443.34 18.23
 endline
-line survey 
+
+line survey
   -457.98 -29.65
   -443.34 -35.87
 endline
-line survey 
-  -471.50 -41.85
+
+line survey
+  -471.5 -41.85
   -457.98 -29.65
 endline
-line survey 
-  -471.50 -54.13
-  -471.50 -41.85
+
+line survey
+  -471.5 -54.13
+  -471.5 -41.85
 endline
-line survey 
+
+line survey
   -435.32 -64.45
-  -471.50 -54.13
+  -471.5 -54.13
 endline
-line survey 
+
+line survey
   -389.51 -69.25
   -435.32 -64.45
 endline
-line survey 
+
+line survey
   -389.51 -73.58
   -389.51 -69.25
 endline
-line survey 
+
+line survey
   -389.51 -62.09
   -389.51 -73.58
 endline
-line survey 
+
+line survey
   -318.13 -68.39
   -389.51 -62.09
 endline
-line survey 
+
+line survey
   -313.68 -80.59
   -318.13 -68.39
 endline
-line survey 
+
+line survey
   -258.62 -84.45
   -313.68 -80.59
 endline
-line survey 
-  -224.70 -73.43
+
+line survey
+  -224.7 -73.43
   -258.62 -84.45
 endline
-line survey 
+
+line survey
   -190.01 -77.05
-  -224.70 -73.43
+  -224.7 -73.43
 endline
-line survey 
+
+line survey
   -190.01 -83.35
   -190.01 -77.05
 endline
-line survey 
-  -147.10 -79.57
+
+line survey
+  -147.1 -79.57
   -190.01 -83.35
 endline
-line survey 
-  -129.70 -79.57
-  -147.10 -79.57
+
+line survey
+  -129.7 -79.57
+  -147.1 -79.57
 endline
-line survey 
+
+line survey
   -56.41 -84.69
-  -129.70 -79.57
+  -129.7 -79.57
 endline
-line survey 
+
+line survey
   -45.17 -86.73
   -56.41 -84.69
 endline
-line survey 
+
+line survey
   -20.45 -87.13
   -45.17 -86.73
 endline
-line survey 
+
+line survey
   24.17 -85.55
   -20.45 -87.13
 endline
-line survey 
+
+line survey
   51.58 -100.75
   24.17 -85.55
 endline
-line survey 
+
+line survey
   51.58 -97.68
   51.58 -100.75
 endline
-line survey 
+
+line survey
   81.62 -108.62
   51.58 -97.68
 endline
-line survey 
-  132.81 -111.30
+
+line survey
+  132.81 -111.3
   81.62 -108.62
 endline
-line survey 
-  137.30 -111.30
-  132.81 -111.30
+
+line survey
+  137.3 -111.3
+  132.81 -111.3
 endline
-line survey 
+
+line survey
   184.78 -95.87
-  137.30 -111.30
+  137.3 -111.3
 endline
-line survey 
+
+line survey
   214.07 -86.97
   184.78 -95.87
 endline
-line survey 
+
+line survey
   244.42 -88.54
   214.07 -86.97
 endline
-line survey 
+
+line survey
   281.86 -76.34
   244.42 -88.54
 endline
-line survey 
-  351.67 -55.00
+
+line survey
+  351.67 -55.0
   281.86 -76.34
 endline
-line survey 
-  471.50 6.02
-  351.67 -55.00
+
+line survey
+  471.5 6.02
+  351.67 -55.0
 endline
+
 endscrap
 
+
+
 scrap kamikaze-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
+
 point -342.82 111.30 station -name 35
+
 point -369.64 109.02 station -name 34
+
 point -404.03 81.14 station -name 33
+
 point -443.34 18.23 station -name 32
+
 point -443.34 -35.87 station -name 31
+
 point -457.98 -29.65 station -name 30
+
 point -471.50 -41.85 station -name 29
+
 point -471.50 -54.13 station -name 28
+
 point -435.32 -64.45 station -name 27
+
 point -389.51 -69.25 station -name 26
+
 point -389.51 -73.58 station -name 25
+
 point -389.51 -62.09 station -name 24
+
 point -318.13 -68.39 station -name 23
+
 point -313.68 -80.59 station -name 22
+
 point -258.62 -84.45 station -name 21
+
 point -224.70 -73.43 station -name 20
+
 point -190.01 -77.05 station -name 19
+
 point -190.01 -83.35 station -name 18
+
 point -147.10 -79.57 station -name 17
+
 point -129.70 -79.57 station -name 16
+
 point -56.41 -84.69 station -name 15
+
 point -45.17 -86.73 station -name 14
+
 point -20.45 -87.13 station -name 13
+
 point 24.17 -85.55 station -name 12
+
 point 51.58 -100.75 station -name 11
+
 point 51.58 -97.68 station -name 10
+
 point 81.62 -108.62 station -name 9
+
 point 132.81 -111.30 station -name 8
+
 point 137.30 -111.30 station -name 7
+
 point 184.78 -95.87 station -name 6
+
 point 214.07 -86.97 station -name 5
+
 point 244.42 -88.54 station -name 4
+
 point 281.86 -76.34 station -name 3
+
 point 351.67 -55.00 station -name 2
+
 point 471.50 6.02 station -name 1
+
 endscrap
+
+
diff --git a/data/vrtnarija/2010/rolling/rolling-e.th2 b/data/vrtnarija/2010/rolling/rolling-e.th2
index 54216fd4..229a0fc3 100644
--- a/data/vrtnarija/2010/rolling/rolling-e.th2
+++ b/data/vrtnarija/2010/rolling/rolling-e.th2
@@ -1,40 +1,63 @@
 encoding  utf-8
-##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000
+##XTHERION## xth_me_area_adjust 0 0 532.000000 448.000000
 ##XTHERION## xth_me_area_zoom_to 100
 
-scrap DELETE-ME-survey-legs-e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-line survey 
-  115.05 76.22
-  -9.94 4.09
-endline
-line survey 
-  -9.94 4.09
-  -70.31 15.83
+scrap rolling-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
+
+point 353.879 210.118 u:label_MY -attr text "Rolling Stones" -attr lvl 3 -attr align br
+line rock-border -close on
+  261.8326 238.2189
+  280.3803 232.0363
+  280.3803 255.589
 endline
-line survey 
-  -9.94 4.09
-  -40.66 -22.60
+
+line rock-border -close on
+  235.9037 238.3617
+  259.7508 240.717
+  247.3856 259.2647
 endline
-line survey 
-  -77.75 -37.64
-  -115.05 -76.22
+
+line rock-border -close on
+  254.5329 238.057
+  240.4013 226.2806
+  255.1218 213.621
+  268.6646 223.9253
 endline
-line survey 
-  -77.75 -37.64
-  -40.66 -22.60
+
+line wall 
+  150.7212 179.0335
+  150.7212 179.0335 161.5465 179.8662 160.7138 176.119
+  159.881 172.3717 142.8104 165.71 136.9814 165.2937
+  131.1524 164.8773 115.7472 149.8885 114.9145 141.145
+  114.0818 132.4015 132.8178 124.9071 147.8067 126.9888
+  159.0483 144.0595
+  159.0483 144.0595 186.9442 172.7881 192.7732 173.6208
+  198.6022 174.4535 214.4237 178.6171 221.9182 187.777
+  229.4126 196.9368 254.0224 212.6424 260.5975 211.572
+  278.5009 208.6575 276.1247 232.9455 290.489 236.7968
+  304.8533 240.6481 300.6097 226.0817 323.5093 237.7398
+  331.806 241.9636 384.8148 273.5169 384.8148 273.5169
 endline
-line survey 
-  -40.66 -22.60
-  -77.34 -38.19
+
+line wall 
+  359.7987 314.076
+  359.7987 314.076 303.1078 278.1264 287.2862 277.2937
+  271.4647 276.461 228.1505 297.1045 204.8476 298.9442
+  173.2045 301.4424 144.0595 260.6394 154.8848 239.8216
+  160.4254 229.1665 247.7323 231.4945 239.4052 230.6617
+  238.3643 230.5576 234.0481 229.105 232.4364 226.1155
+  228.8548 219.4718 224.454 226.8824 222.2184 219.7094
+  220.7797 215.0934 211.5853 218.2594 210.8354 211.155
+  210.2714 205.8113 202.4108 209.9327 199.1227 203.4944
+  197.7129 195.7862 176.5353 199.435 176.5353 199.435
 endline
-endscrap
 
-scrap rolling-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-point -9.94 4.09 station -name 5
-point 115.05 76.22 station -name 7
-point -70.31 15.83 station -name 6
-point -40.66 -22.60 station -name 1
-point -115.05 -76.22 station -name 4
-point -77.75 -37.64 station -name 3
-point -77.34 -38.19 station -name 2
+point 254.06 232.09 station -name 5
+point 379.05 304.22 station -name 7
+point 193.69 243.83 station -name 6
+point 223.34 205.4 station -name 1
+point 148.95 151.78 station -name 4
+point 186.25 190.36 station -name 3
+point 186.66 189.81 station -name 2
 endscrap
+
diff --git a/data/vrtnarija/2010/surprise/surprise-e.th2 b/data/vrtnarija/2010/surprise/surprise-e.th2
index 0efd9525..9fe6a850 100644
--- a/data/vrtnarija/2010/surprise/surprise-e.th2
+++ b/data/vrtnarija/2010/surprise/surprise-e.th2
@@ -1,60 +1,61 @@
 encoding  utf-8
-##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000
+##XTHERION## xth_me_area_adjust 0 0 614.000000 334.000000
 ##XTHERION## xth_me_area_zoom_to 100
 
-scrap DELETE-ME-survey-legs-e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-line survey 
-  154.34 -0.12
-  173.26 18.15
-endline
-line survey 
-  154.34 -0.12
-  124.34 -0.67
-endline
-line survey 
-  124.34 -0.67
-  35.41 21.54
-endline
-line survey 
-  35.41 21.54
-  -26.96 33.66
-endline
-line survey 
-  35.41 21.54
-  -19.07 -13.82
-endline
-line survey 
-  -19.07 -13.82
-  -139.23 -9.65
+scrap surprise-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
+
+line rock-border -close on
+  341.4498 200.5242
+  346.4164 193.0744
+  358.2119 199.9033
 endline
-line survey 
-  -19.07 -13.82
-  -44.51 -29.72
+
+line rock-border -close on
+  329.0335 193.0744
+  337.7249 198.0409
+  325.9294 203.6282
 endline
-line survey 
-  -44.51 -29.72
-  -66.84 -33.66
+
+line rock-border -close on
+  339.1809 182.8149
+  347.2849 189.9655
+  334.4137 192.8258
 endline
-line survey 
-  -66.84 -33.66
-  -133.36 -9.49
+
+line wall 
+  476.7881 193.0744
+  476.7881 193.0744 447.6097 191.2119 438.9182 195.5576
+  430.2268 199.9033 378.6989 216.0446 365.6617 222.8736
+  352.6245 229.7026 310.2271 237.3213 295.9483 238.563
+  281.6695 239.8046 267.0658 218.5827 259.0887 218.6086
+  244.1375 218.657 235.8979 200.9943 251.0364 199.9033
+  256.2906 199.5247 284.3346 194.9368 291.1636 193.6952
+  297.9926 192.4535 341.6113 189.6433 333.3792 188.7286
+  288.6803 183.7621 309.4173 184.9391 285.5762 166.3792
+  276.6436 159.4253 268.6533 191.0592 203.0074 168.2416
+  186.8271 162.6176 133.4758 185.6245 133.4758 185.6245
 endline
-line survey 
-  -133.36 -9.49
-  -173.26 -17.99
+
+line wall 
+  134.3293 144.3587
+  134.3293 144.3587 163.3022 156.6503 173.8379 152.2604
+  184.3735 147.8706 237.9296 126.7993 247.5873 126.7993
+  257.2449 126.7993 287.6102 156.3673 293.2416 145.2367
+  296.0444 139.6971 338.896 187.3792 346.7978 183.8673
+  354.6995 180.3554 422.3031 161.9181 430.2048 161.9181
+  438.1065 161.9181 467.0795 164.552 467.0795 164.552
 endline
-endscrap
 
-scrap surprise-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
-point 173.26 18.15 station -name 12
-point 154.34 -0.12 station -name 11
-point 124.34 -0.67 station -name 10
-point 35.41 21.54 station -name 8
-point -26.96 33.66 station -name 9
-point -19.07 -13.82 station -name 6
-point -139.23 -9.65 station -name 7
-point -44.51 -29.72 station -name 5
-point -66.84 -33.66 station -name 4
-point -133.36 -9.49 station -name 3
-point -173.26 -17.99 station -name 1
+point 480.26 186.15 station -name 12
+point 461.34 167.88 station -name 11
+point 431.34 167.33 station -name 10
+point 342.41 189.54 station -name 8
+point 280.04 201.66 station -name 9
+point 287.93 154.18 station -name 6
+point 167.77 158.35 station -name 7
+point 262.49 138.28 station -name 5
+point 240.16 134.34 station -name 4
+point 173.64 158.51 station -name 3
+point 133.74 150.01 station -name 1
 endscrap
+
diff --git a/data/vrtnarija/2010/wonderland/wonderland-e.th2 b/data/vrtnarija/2010/wonderland/wonderland-e.th2
index bc37a0d7..059603b0 100644
--- a/data/vrtnarija/2010/wonderland/wonderland-e.th2
+++ b/data/vrtnarija/2010/wonderland/wonderland-e.th2
@@ -2,9 +2,20 @@ encoding  utf-8
 ##XTHERION## xth_me_area_adjust 0 0 1004.000000 1282.000000
 ##XTHERION## xth_me_area_zoom_to 100
 
-
 scrap wonderland-1e -projection extended -scale [0.0 0.0 500 1000.0 0.0 0.0 150 300]
 
+point 455.1338 736.316 extra -from 2
+line rock-border -close on
+  395.2775 687.8332
+  381.7978 670.1411
+  413.3909 669.7198
+endline
+
+line wall 
+  378.5936 657.9674
+  395.8645 669.3409 413.6676 659.0566 413.6676 659.0566
+endline
+
 line rock-border -close on
   661.8778 1069.7597
   646.7533 1060.877
@@ -192,6 +203,11 @@ line rock-border -close on
 endline
 
 line wall 
+  423.3473 669.0942
+  418.7137 674.9915 425.0323 688.4712 425.0323 688.4712
+  425.0323 688.4712 428.4022 689.3137 438.9332 697.7386
+  449.4643 706.1634 462.5227 714.167 467.5777 719.2219
+  467.5777 719.2219 479.7936 744.9176 482.3211 758.8185
   468.8671 781.2188
   467.509 787.6695 459.3607 809.3983 453.9285 811.0959
   448.4963 812.7934 431.5207 817.8861 415.9031 813.1329
@@ -217,8 +233,11 @@ line wall
   333.741 758.8109 376.8591 760.848 378.2172 763.2246
   379.5752 765.6012 376.5196 785.2929 378.2172 788.3485
   379.9147 791.4041 383.6494 797.8549 399.2669 785.9719
-  414.8845 774.089 438.9899 755.4158 443.7431 753.3787
-  448.4963 751.3416 452.5704 749.9836 452.5704 749.9836
+  414.8845 774.089 424.2589 768.5341 429.0121 766.4971
+  433.7653 764.46 439.8521 756.4555 439.8521 756.4555
+  439.8521 756.4555 439.9626 751.4107 438.6989 748.462
+  437.4352 745.5133 408.5229 719.7964 400.8171 719.8475
+  392.7695 719.9009 357.2125 696.8961 354.685 694.7899
 endline
 
 line wall 
@@ -243,18 +262,18 @@ line wall -id cheetzim
   423.0064 1044.3121 422.0461 1068.7994 422.0461 1068.7994
 endline
 
-point 501.0624 1090.2057 station -name 9
-point 642.2024 1082.8057 station -name 10
-point 455.7424 1047.9257 station -name 8
-point 442.6124 998.9457 station -name 7
-point 375.2824 813.9857 station -name 5
-point 730.3324 958.0857 station -name 13
-point 776.8624 972.3357 station -name 12
-point 695.4924 1048.1657 station -name 11
-point 343.6724 777.6157 station -name 6
-point 310.1824 810.5257 station -name 4
-point 371.6224 798.6357 station -name 3
-point 457.0124 767.5357 station -name 2
-point 372.0124 688.2457 station -name 1
+point 501.062 1090.21 station -name 9
+point 642.202 1082.81 station -name 10
+point 455.742 1047.93 station -name 8
+point 442.612 998.946 station -name 7
+point 375.282 813.986 station -name 5
+point 730.332 958.086 station -name 13
+point 776.862 972.336 station -name 12
+point 695.492 1048.17 station -name 11
+point 343.672 777.616 station -name 6
+point 310.182 810.526 station -name 4
+point 371.622 798.636 station -name 3
+point 457.012 767.536 station -name 2
+point 372.012 688.246 station -name 1
 endscrap
 
diff --git a/data/vrtnarija/vrtnarija-e.thm b/data/vrtnarija/vrtnarija-e.thm
index 5f1bdf96..54705f1c 100644
--- a/data/vrtnarija/vrtnarija-e.thm
+++ b/data/vrtnarija/vrtnarija-e.thm
@@ -37,6 +37,8 @@ endmap
 
 map m-cheetah-e -projection extended
 	m-all-e@wonderland
+	m-all-e@rolling
+	m-all-e@surprise
 endmap
 
 map m-beyond-consort-e -projection extended
diff --git a/data/vrtnarija/vrtnarija.th b/data/vrtnarija/vrtnarija.th
index bcd5cc73..1528d08b 100644
--- a/data/vrtnarija/vrtnarija.th
+++ b/data/vrtnarija/vrtnarija.th
@@ -426,6 +426,8 @@ survey vrtnarija -title "Vrtnarija"
 	join sidewinder-1e@sidewinder blackknight-2e@blackknight
 	join stalemate-1e@stalemate whitebishop-1e@whitebishop
 	join sidewinder-1e@sidewinder crack_in_time-1e@crack_in_time
+	join rolling-1e@rolling wonderland-1e@wonderland
+	join surprise-1e@surprise rolling-1e@rolling
 	
 	
 	###__________2011____________###