diff --git a/okapi/core/Okapi.php b/okapi/core/Okapi.php
index ed28c1d9f..6ae4a6e11 100644
--- a/okapi/core/Okapi.php
+++ b/okapi/core/Okapi.php
@@ -335,6 +335,7 @@ public static function get_allowed_base_urls()
             case 'OCRO':
                 $urls = array(
                     "http://www.opencaching.ro/okapi/",
+                    "https://www.opencaching.ro/okapi/",
                 );
                 break;
             case 'OCUK':
@@ -346,7 +347,7 @@ public static function get_allowed_base_urls()
             case 'OCUS':
                 $urls = array(
                     "http://www.opencaching.us/okapi/",
-                    "http://opencaching.us/okapi/",
+                    "https://www.opencaching.us/okapi/",
                 );
                 break;
             default:
@@ -928,20 +929,24 @@ public static function xmlmap2_dumps(&$obj)
         #
 
         # common types of all OC sites
+        'Other'        => ['oc.de' => 1, 'oc.pl' => 1],
         'Traditional'  => ['oc.de' => 2, 'oc.pl' => 2],
         'Multi'        => ['oc.de' => 3, 'oc.pl' => 3],
-        'Quiz'         => ['oc.de' => 7, 'oc.pl' => 7],
         'Virtual'      => ['oc.de' => 4, 'oc.pl' => 4],
-        'Event'        => ['oc.de' => 6, 'oc.pl' => 6],
         'Webcam'       => ['oc.de' => 5, 'oc.pl' => 5],
-        'Moving'       => ['oc.de' => 9, 'oc.pl' => 8],
-        'Other'        => ['oc.de' => 1, 'oc.pl' => 1],
+        'Event'        => ['oc.de' => 6, 'oc.pl' => 6],
+        'Quiz'         => ['oc.de' => 7, 'oc.pl' => 7],
+        'Moving'       => ['oc.de' => 9, 'oc.pl' => 9],
 
         # local types
-        'Podcast'      => ['oc.pl' => 9],
-        'Own'          => ['oc.pl' => 10],
         'Math/Physics' => ['oc.de' => 8, 'mapto' => ['name' => 'Quiz', 'acodes' => ['A16']]],
+        'Podcast'      => [],
         'Drive-In'     => ['oc.de' => 10, 'mapto' => ['name' => 'Traditional', 'acodes' => ['A19']]],
+        'Own'          => ['oc.pl' => 11],
+        'BIT Cache'    => ['oc.pl' => 12],
+        'Guestbook'    => ['oc.pl' => 13],
+        'Benchmark'    => ['oc.pl' => 14],
+        'Challenge'    => ['oc.pl' => 15],
     );
 
     /** Return all types of this OC site which are exposed by OKAPI. **/
diff --git a/okapi/services/caches/geocache/docs.xml b/okapi/services/caches/geocache/docs.xml
index 960838dc4..02ae9fea0 100644
--- a/okapi/services/caches/geocache/docs.xml
+++ b/okapi/services/caches/geocache/docs.xml
@@ -164,13 +164,20 @@
                 <p>More types are in use at some installations:</p>
                 <ul>
                     <li><b>Own</b>, a moving geocache which is carried by the owner,</li>
-                    <li><b>Podcast</b>, a geocache with attached MP3 file(s). The MP3
-                        data is not accessible via OKAPI. This type is only in use
-                        at Opencaching.US.</li>
+                    <li><b>BIT cache</b>, a laminated label with log password,</li>
+                    <li><b>Guestbook</b>, a real world guestbook also used as a logbook,</li>
+                    <li><b>Benchmark</b>, a geodetic benchmark,</li>
+                    <li><b>Challenge</b>, logging requires the geocacher to meet some sort 
+                        of goal or task,</li>
+                    <li><b><s>Podcast</s></b>, a geocache with attached MP3 file(s). 
+                        <i>This cache type no longer exists and it's reference is kept
+                        for compatibility reasons.</i></li>
                     <li>(Types may be added or removed. Your application MUST be
                         prepared for any new types and may handle them as "Other".)</li>
                 </ul>
-                <p>There are even more types, but OKAPI maps them to common types
+                <p>Opencaching cache types are documented 
+                <a href="https://wiki.opencaching.eu/index.php?title=Cache_types" target="_blank">here</a></p>
+                <p>There are may be more types, but OKAPI maps them to common types
                 (and eventually some attributes), so you won't see them in OKAPI data.</p>
             </li>
             <li>
diff --git a/okapi/static/tilemap/large_inner_benchmark.png b/okapi/static/tilemap/large_inner_benchmark.png
new file mode 100644
index 000000000..ea8804aeb
Binary files /dev/null and b/okapi/static/tilemap/large_inner_benchmark.png differ
diff --git a/okapi/static/tilemap/large_inner_bitcache.png b/okapi/static/tilemap/large_inner_bitcache.png
new file mode 100644
index 000000000..424bf526e
Binary files /dev/null and b/okapi/static/tilemap/large_inner_bitcache.png differ
diff --git a/okapi/static/tilemap/large_inner_challenge.png b/okapi/static/tilemap/large_inner_challenge.png
new file mode 100644
index 000000000..d77e2b44c
Binary files /dev/null and b/okapi/static/tilemap/large_inner_challenge.png differ
diff --git a/okapi/static/tilemap/large_inner_guestbook.png b/okapi/static/tilemap/large_inner_guestbook.png
new file mode 100644
index 000000000..443e74284
Binary files /dev/null and b/okapi/static/tilemap/large_inner_guestbook.png differ
diff --git a/okapi/static/tilemap/legend_benchmark.png b/okapi/static/tilemap/legend_benchmark.png
new file mode 100644
index 000000000..eed99449a
Binary files /dev/null and b/okapi/static/tilemap/legend_benchmark.png differ
diff --git a/okapi/static/tilemap/legend_bitcache.png b/okapi/static/tilemap/legend_bitcache.png
new file mode 100644
index 000000000..c1de3556d
Binary files /dev/null and b/okapi/static/tilemap/legend_bitcache.png differ
diff --git a/okapi/static/tilemap/legend_challenge.png b/okapi/static/tilemap/legend_challenge.png
new file mode 100644
index 000000000..bcd722ef3
Binary files /dev/null and b/okapi/static/tilemap/legend_challenge.png differ
diff --git a/okapi/static/tilemap/legend_guestbook.png b/okapi/static/tilemap/legend_guestbook.png
new file mode 100644
index 000000000..520d7d0f2
Binary files /dev/null and b/okapi/static/tilemap/legend_guestbook.png differ
diff --git a/okapi/static/tilemap/medium_benchmark.png b/okapi/static/tilemap/medium_benchmark.png
new file mode 100644
index 000000000..d892b2c36
Binary files /dev/null and b/okapi/static/tilemap/medium_benchmark.png differ
diff --git a/okapi/static/tilemap/medium_bitcache.png b/okapi/static/tilemap/medium_bitcache.png
new file mode 100644
index 000000000..1c507897e
Binary files /dev/null and b/okapi/static/tilemap/medium_bitcache.png differ
diff --git a/okapi/static/tilemap/medium_challenge.png b/okapi/static/tilemap/medium_challenge.png
new file mode 100644
index 000000000..e16feef62
Binary files /dev/null and b/okapi/static/tilemap/medium_challenge.png differ
diff --git a/okapi/static/tilemap/medium_guestbook.png b/okapi/static/tilemap/medium_guestbook.png
new file mode 100644
index 000000000..9af259d10
Binary files /dev/null and b/okapi/static/tilemap/medium_guestbook.png differ
diff --git a/okapi/static/tilemap/tiny_benchmark.png b/okapi/static/tilemap/tiny_benchmark.png
new file mode 100644
index 000000000..bcad9c681
Binary files /dev/null and b/okapi/static/tilemap/tiny_benchmark.png differ
diff --git a/okapi/static/tilemap/tiny_bitcache.png b/okapi/static/tilemap/tiny_bitcache.png
new file mode 100644
index 000000000..3ed43670d
Binary files /dev/null and b/okapi/static/tilemap/tiny_bitcache.png differ
diff --git a/okapi/static/tilemap/tiny_challenge.png b/okapi/static/tilemap/tiny_challenge.png
new file mode 100644
index 000000000..0004194ce
Binary files /dev/null and b/okapi/static/tilemap/tiny_challenge.png differ
diff --git a/okapi/static/tilemap/tiny_guestbook.png b/okapi/static/tilemap/tiny_guestbook.png
new file mode 100644
index 000000000..877b7badb
Binary files /dev/null and b/okapi/static/tilemap/tiny_guestbook.png differ
diff --git a/okapi/static/tilemap/tiny_own.png b/okapi/static/tilemap/tiny_own.png
new file mode 100644
index 000000000..7ccc6dc1a
Binary files /dev/null and b/okapi/static/tilemap/tiny_own.png differ
diff --git a/okapi/static/tilemap/tiny_webcam.png b/okapi/static/tilemap/tiny_webcam.png
new file mode 100644
index 000000000..ce6b61eee
Binary files /dev/null and b/okapi/static/tilemap/tiny_webcam.png differ