diff --git a/assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_(2).jpg b/assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_2.jpg
similarity index 100%
rename from assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_(2).jpg
rename to assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_2.jpg
diff --git a/assets/layers/fitness_station/Ansan_Park_(beind_the_city_hall)_022.jpg b/assets/layers/fitness_station/Ansan_Park_beind_the_city_hall_022.jpg
similarity index 100%
rename from assets/layers/fitness_station/Ansan_Park_(beind_the_city_hall)_022.jpg
rename to assets/layers/fitness_station/Ansan_Park_beind_the_city_hall_022.jpg
diff --git a/assets/layers/fitness_station/fitness_station.json b/assets/layers/fitness_station/fitness_station.json
index c9c52b1c1..b30c5db34 100644
--- a/assets/layers/fitness_station/fitness_station.json
+++ b/assets/layers/fitness_station/fitness_station.json
@@ -270,7 +270,7 @@
             "en": "This fitness station has a cross-trainer."
           },
           "icon": {
-            "path": "./assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_(2).jpg",
+            "path": "./assets/layers/fitness_station/07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_2.jpg",
             "class": "large"
           }
         },
@@ -280,7 +280,7 @@
             "en": "This fitness station has an air walker."
           },
           "icon": {
-            "path": "./assets/layers/fitness_station/Ansan_Park_(beind_the_city_hall)_022.jpg",
+            "path": "./assets/layers/fitness_station/Ansan_Park_beind_the_city_hall_022.jpg",
             "class": "large"
           }
         },
@@ -306,6 +306,41 @@
         }
       ],
       "multiAnswer": true
+    },
+    {
+      "id": "operator",
+      "question": {
+        "en": "Who maintains this fitness station?"
+      },
+      "freeform": {
+        "key": "operator",
+        "placeholder": {
+          "en": "Operator of the fitness station"
+        },
+        "type": "string"
+      },
+      "render": {
+        "en": "The fitness station is maintained by {operator}."
+      }
+    },
+    {
+      "id": "opening_hours",
+      "question": {
+        "en": "When is this fitness station opened?"
+      },
+      "freeform": {
+        "key": "opening_hours",
+        "type": "opening_hours"
+      },
+      "render": "{opening_hours_table()}",
+      "mappings": [
+        {
+          "if": "opening_hours=24/7",
+          "then": {
+            "en": "24/7"
+          }
+        }
+      ]
     }
   ],
   "presets": [
diff --git a/assets/layers/fitness_station/license_info.json b/assets/layers/fitness_station/license_info.json
index b48b6fad3..35d43e95e 100644
--- a/assets/layers/fitness_station/license_info.json
+++ b/assets/layers/fitness_station/license_info.json
@@ -1,6 +1,6 @@
 [
   {
-    "path": "07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_(2).jpg",
+    "path": "07-12-2016,_Fitness_trail,_Parque_da_Alfarrobeira,_Albufeira_2.jpg",
     "license": "CC-BY-SA",
     "authors": [
       "Kolforn"
@@ -20,7 +20,7 @@
     ]
   },
   {
-    "path": "Ansan_Park_(beind_the_city_hall)_022.jpg",
+    "path": "Ansan_Park_beind_the_city_hall_022.jpg",
     "license": "CC-BY-SA",
     "authors": [
       "Piotrus"
diff --git a/assets/themes/sports/sport.svg b/assets/themes/sports/sport.svg
index ce0fa5d17..426e7c645 100644
--- a/assets/themes/sports/sport.svg
+++ b/assets/themes/sports/sport.svg
@@ -1,11 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg">
- <path d="m128 64c0 35.346-28.654 64-64 64s-64-28.654-64-64 28.654-64 64-64 64 28.654 64 64" fill="#9bbe55" stroke-width=".2"/>
- <g transform="translate(-1009.8 436.95)">
-  <path d="m1118.6-370.45a44.983 44.542 0 0 1-44.983 44.542 44.983 44.542 0 0 1-44.983-44.542 44.983 44.542 0 0 1 44.983-44.542 44.983 44.542 0 0 1 44.983 44.542" fill-opacity=".2"/>
-  <g transform="matrix(3.7795 0 0 3.7795 1277 -1165)">
-   <path d="m-42.319 209.13a11.405 11.405 0 0 1-11.405 11.405 11.405 11.405 0 0 1-11.405-11.405 11.405 11.405 0 0 1 11.405-11.405 11.405 11.405 0 0 1 11.405 11.405" fill="#fff"/>
-   <path d="m-42.031 209.08c0-0.27566 0.07876-4.2924-2.2841-6.8916-0.11814-0.23628-0.59071-1.1814-2.2053-2.3234-1.0633-0.82698-2.1659-1.4177-2.2841-1.4964-0.11814-0.0788-2.0872-1.1026-4.45-1.1026-0.1969 0-0.35442 0-0.55132 0.0394-1.8115-0.0394-3.4655 0.43318-4.6863 0.98451-1.2602 0.55132-2.0872 1.1026-2.1659 1.1814-1.3389 0.74823-3.8987 3.7411-4.0956 5.3557-0.82699 1.0239-1.4965 5.7102 0 8.5455 1.0633 3.938 5.0013 5.907 5.3163 6.0646 0.1969 0.11814 2.3234 1.4571 4.9619 1.4571h0.35442c0.23628 0.0394 0.43318 0.0394 0.66947 0.0394 2.8354 0 7.0885-2.0084 7.9548-3.5836 2.4416-1.8115 3.7018-6.3796 3.4655-8.2699m-17.367 5.9464c-1.142-1.8115-1.7721-4.2137-1.9296-4.765 0.35442-0.55132 2.1265-3.1504 3.111-3.938 0.55132 0.11814 2.9535 0.55132 5.1982 0.94513 0.27566 0.74822 1.5358 3.938 1.8903 5.1982-0.3938 0.47257-1.9296 2.2447-3.4261 3.623-1.6146 0.0394-4.3318-0.90574-4.8438-1.0633m14.177-12.799c0 0.15752-0.03938 0.78761-0.35442 1.5358-0.5907-0.31505-2.0872-0.94513-4.1743-1.0633-0.31504-0.47257-1.4965-2.0872-3.3473-3.1898 0.23628-0.51194 0.59071-1.1026 0.82699-1.2996 0.07876 0 0.15752-0.0394 0.31504-0.0394 0.98451 0 2.7172 0.66946 2.8748 0.70884 0.15752 0.0788 3.2686 1.7327 3.8593 3.3473m-16.54 7.6398c-1.3389-0.23628-2.1659-0.63009-2.4022-0.78761-0.51194-1.8115-0.07876-3.7805-0.03938-4.0562 0.51194-0.86637 1.8903-3.1504 2.8354-3.5836 0.94513-0.19691 2.1659 0.0394 2.6385 0.15752-0.03938 0.63008-0.11814 2.4022 0.11814 4.2925-1.0239 0.86636-2.7172 3.3473-3.1504 3.9774m7.8367-12.011c0.31504 0.0394 0.74823 0.0788 1.0633 0.1969-0.31504 0.3938-0.63009 0.98451-0.74823 1.2996-0.63009 0.11814-2.9535 0.55132-4.8044 1.7327-0.35442-0.0788-1.4965-0.35442-2.5597-0.27566 0.27566-0.51194 0.66947-0.86637 0.70885-0.90575 0.11814-0.11814 2.9141-2.0872 6.3402-2.0478m7.5216 15.004c-0.47256 0-2.2447-0.11815-4.1743-0.59071-0.35442-1.2996-1.6146-4.4894-1.8903-5.2376 1.2208-1.7327 2.4022-3.3473 2.7172-3.8199 2.2447 0.15752 3.8199 0.98451 4.1349 1.142 1.2996 2.0872 1.5752 4.2137 1.6146 4.5681-0.70885 2.1659-2.0478 3.623-2.4022 3.938m-18.548-5.1588c0.03938 0.51195 0.11814 1.0239 0.27566 1.5358-0.11814 0.35443-0.23628 0.70885-0.27566 1.0633-0.11814-0.90574-0.11814-1.8115 0-2.5991m5.8283 11.223-0.15752 0.23628 0.15752-0.23628c-0.98451-0.47257-1.7327-1.5752-2.0478-2.0084 0.59071-0.5907 1.3389-1.142 1.6146-1.3389 0.63009 0.23628 3.2686 1.1026 4.9619 1.1026 0.27566 0.3938 1.2208 1.5752 2.3628 2.5203-0.70885 0.70885-1.7327 1.0239-1.9296 1.1026-2.6779 0.0788-4.9619-1.3783-4.9619-1.3783m6.419 1.3389c0.35442-0.1969 0.74823-0.47256 1.0633-0.82699 0.51194-0.0788 2.7172-0.43318 4.6863-1.8902 0.11814 0 0.35442 0.0394 0.5907 0.0394-1.2208 1.142-4.1349 2.4416-6.3402 2.6779m6.0646-3.308c0.70885-1.8509 0.66947-3.2686 0.63008-3.7018 0.3938-0.3938 1.7327-1.8115 2.481-3.9774 0.3938 0.0788 0.66947 0.15753 0.78761 0.23629 0.03938 0.15752 0.11814 0.51194 0.07876 1.0633-0.31504 1.969-1.3389 4.9619-3.1898 6.2615-0.1969 0.11814-0.51194 0.15752-0.78761 0.11814" fill="#555" stroke-width=".2067"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 500 500"
+   id="svg14"
+   sodipodi:docname="sport.svg"
+   width="500"
+   height="500"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs18" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2066"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="2.8710938"
+     inkscape:cx="-17.268661"
+     inkscape:cy="216.03852"
+     inkscape:window-x="2149"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg14" />
+  <g
+     id="g859"
+     transform="scale(3.90625)">
+    <path
+       d="M 128,64 C 128,99.346 99.346,128 64,128 28.654,128 0,99.346 0,64 0,28.654 28.654,0 64,0 c 35.346,0 64,28.654 64,64"
+       fill="#9bbe55"
+       stroke-width="0.2"
+       id="path2" />
+    <g
+       transform="translate(-1009.8,436.95)"
+       id="g12">
+      <path
+         d="m 1118.6,-370.45 a 44.983,44.542 0 0 1 -44.983,44.542 44.983,44.542 0 0 1 -44.983,-44.542 44.983,44.542 0 0 1 44.983,-44.542 44.983,44.542 0 0 1 44.983,44.542"
+         fill-opacity="0.2"
+         id="path4" />
+      <g
+         transform="matrix(3.7795,0,0,3.7795,1277,-1165)"
+         id="g10">
+        <path
+           d="m -42.319,209.13 a 11.405,11.405 0 0 1 -11.405,11.405 11.405,11.405 0 0 1 -11.405,-11.405 11.405,11.405 0 0 1 11.405,-11.405 11.405,11.405 0 0 1 11.405,11.405"
+           fill="#ffffff"
+           id="path6" />
+        <path
+           d="m -42.031,209.08 c 0,-0.27566 0.07876,-4.2924 -2.2841,-6.8916 -0.11814,-0.23628 -0.59071,-1.1814 -2.2053,-2.3234 -1.0633,-0.82698 -2.1659,-1.4177 -2.2841,-1.4964 -0.11814,-0.0788 -2.0872,-1.1026 -4.45,-1.1026 -0.1969,0 -0.35442,0 -0.55132,0.0394 -1.8115,-0.0394 -3.4655,0.43318 -4.6863,0.98451 -1.2602,0.55132 -2.0872,1.1026 -2.1659,1.1814 -1.3389,0.74823 -3.8987,3.7411 -4.0956,5.3557 -0.82699,1.0239 -1.4965,5.7102 0,8.5455 1.0633,3.938 5.0013,5.907 5.3163,6.0646 0.1969,0.11814 2.3234,1.4571 4.9619,1.4571 h 0.35442 c 0.23628,0.0394 0.43318,0.0394 0.66947,0.0394 2.8354,0 7.0885,-2.0084 7.9548,-3.5836 2.4416,-1.8115 3.7018,-6.3796 3.4655,-8.2699 m -17.367,5.9464 c -1.142,-1.8115 -1.7721,-4.2137 -1.9296,-4.765 0.35442,-0.55132 2.1265,-3.1504 3.111,-3.938 0.55132,0.11814 2.9535,0.55132 5.1982,0.94513 0.27566,0.74822 1.5358,3.938 1.8903,5.1982 -0.3938,0.47257 -1.9296,2.2447 -3.4261,3.623 -1.6146,0.0394 -4.3318,-0.90574 -4.8438,-1.0633 m 14.177,-12.799 c 0,0.15752 -0.03938,0.78761 -0.35442,1.5358 -0.5907,-0.31505 -2.0872,-0.94513 -4.1743,-1.0633 -0.31504,-0.47257 -1.4965,-2.0872 -3.3473,-3.1898 0.23628,-0.51194 0.59071,-1.1026 0.82699,-1.2996 0.07876,0 0.15752,-0.0394 0.31504,-0.0394 0.98451,0 2.7172,0.66946 2.8748,0.70884 0.15752,0.0788 3.2686,1.7327 3.8593,3.3473 m -16.54,7.6398 c -1.3389,-0.23628 -2.1659,-0.63009 -2.4022,-0.78761 -0.51194,-1.8115 -0.07876,-3.7805 -0.03938,-4.0562 0.51194,-0.86637 1.8903,-3.1504 2.8354,-3.5836 0.94513,-0.19691 2.1659,0.0394 2.6385,0.15752 -0.03938,0.63008 -0.11814,2.4022 0.11814,4.2925 -1.0239,0.86636 -2.7172,3.3473 -3.1504,3.9774 m 7.8367,-12.011 c 0.31504,0.0394 0.74823,0.0788 1.0633,0.1969 -0.31504,0.3938 -0.63009,0.98451 -0.74823,1.2996 -0.63009,0.11814 -2.9535,0.55132 -4.8044,1.7327 -0.35442,-0.0788 -1.4965,-0.35442 -2.5597,-0.27566 0.27566,-0.51194 0.66947,-0.86637 0.70885,-0.90575 0.11814,-0.11814 2.9141,-2.0872 6.3402,-2.0478 m 7.5216,15.004 c -0.47256,0 -2.2447,-0.11815 -4.1743,-0.59071 -0.35442,-1.2996 -1.6146,-4.4894 -1.8903,-5.2376 1.2208,-1.7327 2.4022,-3.3473 2.7172,-3.8199 2.2447,0.15752 3.8199,0.98451 4.1349,1.142 1.2996,2.0872 1.5752,4.2137 1.6146,4.5681 -0.70885,2.1659 -2.0478,3.623 -2.4022,3.938 m -18.548,-5.1588 c 0.03938,0.51195 0.11814,1.0239 0.27566,1.5358 -0.11814,0.35443 -0.23628,0.70885 -0.27566,1.0633 -0.11814,-0.90574 -0.11814,-1.8115 0,-2.5991 m 5.8283,11.223 -0.15752,0.23628 0.15752,-0.23628 c -0.98451,-0.47257 -1.7327,-1.5752 -2.0478,-2.0084 0.59071,-0.5907 1.3389,-1.142 1.6146,-1.3389 0.63009,0.23628 3.2686,1.1026 4.9619,1.1026 0.27566,0.3938 1.2208,1.5752 2.3628,2.5203 -0.70885,0.70885 -1.7327,1.0239 -1.9296,1.1026 -2.6779,0.0788 -4.9619,-1.3783 -4.9619,-1.3783 m 6.419,1.3389 c 0.35442,-0.1969 0.74823,-0.47256 1.0633,-0.82699 0.51194,-0.0788 2.7172,-0.43318 4.6863,-1.8902 0.11814,0 0.35442,0.0394 0.5907,0.0394 -1.2208,1.142 -4.1349,2.4416 -6.3402,2.6779 m 6.0646,-3.308 c 0.70885,-1.8509 0.66947,-3.2686 0.63008,-3.7018 0.3938,-0.3938 1.7327,-1.8115 2.481,-3.9774 0.3938,0.0788 0.66947,0.15753 0.78761,0.23629 0.03938,0.15752 0.11814,0.51194 0.07876,1.0633 -0.31504,1.969 -1.3389,4.9619 -3.1898,6.2615 -0.1969,0.11814 -0.51194,0.15752 -0.78761,0.11814"
+           fill="#555555"
+           stroke-width="0.2067"
+           id="path8" />
+      </g>
+    </g>
   </g>
- </g>
 </svg>