diff --git a/Docs/Themes/cyclofix.md b/Docs/Themes/cyclofix.md
index 84ec8170a..643de8cee 100644
--- a/Docs/Themes/cyclofix.md
+++ b/Docs/Themes/cyclofix.md
@@ -303,7 +303,7 @@ The question is `What are the opening hours of {title()}?`
The question is `What is the phone number of {title()}?`
*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set
- - *{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_
+ -
*{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_
This tagrendering has labels
`contact`
@@ -313,8 +313,8 @@ This tagrendering has labels
The question is `What is the email address of {title()}?`
*{email}* is shown if `email` is set
- -
*{contact:email}* is shown if with contact:email~.+. _This option cannot be chosen as answer_
- -
*{operator:email}* is shown if with operator:email~.+. _This option cannot be chosen as answer_
+ -
*{contact:email}* is shown if with contact:email~.+. _This option cannot be chosen as answer_
+ -
*{operator:email}* is shown if with operator:email~.+. _This option cannot be chosen as answer_
This tagrendering has labels
`contact`
@@ -324,7 +324,7 @@ This tagrendering has labels
The question is `What is the website of {title()}?`
*{website}* is shown if `website` is set
- -
*{contact:website}* is shown if with contact:website~.+. _This option cannot be chosen as answer_
+ -
*{contact:website}* is shown if with contact:website~.+. _This option cannot be chosen as answer_
This tagrendering has labels
`contact`
@@ -346,9 +346,9 @@ The question is `What type of items are repaired here?`
- *Mobile phones are repaired here* is shown if with service:mobile_phone:repair=yes. Unselecting this answer will add service:mobile_phone:repair=no
- *Computers are repaired here* is shown if with service:computer:repair=yes. Unselecting this answer will add service:computer:repair=no
- *Bicycles are repaired here* is shown if with service:bicycle:repair=yes. Unselecting this answer will add service:bicycle:repair=no
- -
*Electronic devices are repaired here* is shown if with service:electronics:repair=yes. Unselecting this answer will add service:electronics:repair=no
- -
*Furniture is repaired here* is shown if with service:furniture:repair=yes. Unselecting this answer will add service:furniture:repair=no
- -
*Clothes are repaired here* is shown if with service:clothes:repair=yes. Unselecting this answer will add service:clothes:repair=no
+ -
*Electronic devices are repaired here* is shown if with service:electronics:repair=yes. Unselecting this answer will add service:electronics:repair=no
+ -
*Furniture is repaired here* is shown if with service:furniture:repair=yes. Unselecting this answer will add service:furniture:repair=no
+ -
*Clothes are repaired here* is shown if with service:clothes:repair=yes. Unselecting this answer will add service:clothes:repair=no
### leftover-questions
@@ -440,7 +440,7 @@ This tagrendering is only visible in the popup if the following condition is met
The question is `What is the website of {title()}?`
*{website}* is shown if `website` is set
- -
*{contact:website}* is shown if with contact:website~.+. _This option cannot be chosen as answer_
+ -
*{contact:website}* is shown if with contact:website~.+. _This option cannot be chosen as answer_
This tagrendering has labels
`contact`
@@ -450,8 +450,8 @@ This tagrendering has labels
The question is `What is the email address of {title()}?`
*{email}* is shown if `email` is set
- -
*{contact:email}* is shown if with contact:email~.+. _This option cannot be chosen as answer_
- -
*{operator:email}* is shown if with operator:email~.+. _This option cannot be chosen as answer_
+ -
*{contact:email}* is shown if with contact:email~.+. _This option cannot be chosen as answer_
+ -
*{operator:email}* is shown if with operator:email~.+. _This option cannot be chosen as answer_
This tagrendering has labels
`contact`
@@ -461,7 +461,7 @@ This tagrendering has labels
The question is `What is the phone number of {title()}?`
*{link(&LBRACEphone&RBRACE,tel:&LBRACEphone&RBRACE,,,,)}* is shown if `phone` is set
- -
*{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_
+ -
*{link(&LBRACEcontact:phone&RBRACE,tel:&LBRACEcontact:phone&RBRACE,,,,)}* is shown if with contact:phone~.+. _This option cannot be chosen as answer_
This tagrendering has labels
`contact`
@@ -479,9 +479,9 @@ This tagrendering is only visible in the popup if the following condition is met
The question is `Which methods of payment are accepted here?`
- -
*Cash is accepted here* is shown if with payment:cash=yes. Unselecting this answer will add payment:cash=no
- -
*Payment cards are accepted here* is shown if with payment:cards=yes. Unselecting this answer will add payment:cards=no
- -
*Payment by QR-code is possible here* is shown if with payment:qr_code=yes. Unselecting this answer will add payment:qr_code=no
+ -
*Cash is accepted here* is shown if with payment:cash=yes. Unselecting this answer will add payment:cash=no
+ -
*Payment cards are accepted here* is shown if with payment:cards=yes. Unselecting this answer will add payment:cards=no
+ -
*Payment by QR-code is possible here* is shown if with payment:qr_code=yes. Unselecting this answer will add payment:qr_code=no
This tagrendering is only visible in the popup if the following condition is met: shop~.+
@@ -489,11 +489,11 @@ This tagrendering is only visible in the popup if the following condition is met
The question is `Which methods of payment are accepted here?`
- -
*Cash is accepted here* is shown if with payment:cash=yes. Unselecting this answer will add payment:cash=no
- -
*Payment cards are accepted here* is shown if with payment:cards=yes. Unselecting this answer will add payment:cards=no
- -
*Payment by QR-code is possible here* is shown if with payment:qr_code=yes. Unselecting this answer will add payment:qr_code=no
- -
*Payment is done using a dedicated app* is shown if with payment:app=yes. Unselecting this answer will add payment:app=no
- -
*Payment is done using a membership card* is shown if with payment:membership_card=yes. Unselecting this answer will add payment:membership_card=no
+ -
*Cash is accepted here* is shown if with payment:cash=yes. Unselecting this answer will add payment:cash=no
+ -
*Payment cards are accepted here* is shown if with payment:cards=yes. Unselecting this answer will add payment:cards=no
+ -
*Payment by QR-code is possible here* is shown if with payment:qr_code=yes. Unselecting this answer will add payment:qr_code=no
+ -
*Payment is done using a dedicated app* is shown if with payment:app=yes. Unselecting this answer will add payment:app=no
+ -
*Payment is done using a membership card* is shown if with payment:membership_card=yes. Unselecting this answer will add payment:membership_card=no
### bicycle-types
@@ -775,48 +775,48 @@ The question is `How much vehicles can be charged here at the same time?`
The question is `Which charging connections are available here?`
- -
*Schuko wall plug without ground pin (CEE7/4 type F)* is shown if with socket:schuko=1. Unselecting this answer will add socket:schuko=
- -
*Schuko wall plug without ground pin (CEE7/4 type F)* is shown if with socket:schuko~.+ & socket:schuko!=1. _This option cannot be chosen as answer_
- -
*European wall plug with ground pin (CEE7/4 type E)* is shown if with socket:typee=1. Unselecting this answer will add socket:typee=
- -
*European wall plug with ground pin (CEE7/4 type E)* is shown if with socket:typee~.+ & socket:typee!=1. _This option cannot be chosen as answer_
- -
*Chademo* is shown if with socket:chademo=1. Unselecting this answer will add socket:chademo=
- -
*Chademo* is shown if with socket:chademo~.+ & socket:chademo!=1. _This option cannot be chosen as answer_
- -
*Type 1 with cable (J1772)* is shown if with socket:type1_cable=1. Unselecting this answer will add socket:type1_cable=
- -
*Type 1 with cable (J1772)* is shown if with socket:type1_cable~.+ & socket:type1_cable!=1. _This option cannot be chosen as answer_
- -
*Type 1 without cable (J1772)* is shown if with socket:type1=1. Unselecting this answer will add socket:type1=
- -
*Type 1 without cable (J1772)* is shown if with socket:type1~.+ & socket:type1!=1. _This option cannot be chosen as answer_
- -
*Type 1 CCS (aka Type 1 Combo)* is shown if with socket:type1_combo=1. Unselecting this answer will add socket:type1_combo=
- -
*Type 1 CCS (aka Type 1 Combo)* is shown if with socket:type1_combo~.+ & socket:type1_combo!=1. _This option cannot be chosen as answer_
- -
*Tesla Supercharger* is shown if with socket:tesla_supercharger=1. Unselecting this answer will add socket:tesla_supercharger=
- -
*Tesla Supercharger* is shown if with socket:tesla_supercharger~.+ & socket:tesla_supercharger!=1. _This option cannot be chosen as answer_
- -
*Type 2 (mennekes)* is shown if with socket:type2=1. Unselecting this answer will add socket:type2=
- -
*Type 2 (mennekes)* is shown if with socket:type2~.+ & socket:type2!=1. _This option cannot be chosen as answer_
- -
*Type 2 CCS (mennekes)* is shown if with socket:type2_combo=1. Unselecting this answer will add socket:type2_combo=
- -
*Type 2 CCS (mennekes)* is shown if with socket:type2_combo~.+ & socket:type2_combo!=1. _This option cannot be chosen as answer_
- -
*Type 2 with cable (mennekes)* is shown if with socket:type2_cable=1. Unselecting this answer will add socket:type2_cable=
- -
*Type 2 with cable (mennekes)* is shown if with socket:type2_cable~.+ & socket:type2_cable!=1. _This option cannot be chosen as answer_
- -
*Tesla Supercharger CCS (a branded type2_css)* is shown if with socket:tesla_supercharger_ccs=1. Unselecting this answer will add socket:tesla_supercharger_ccs=
- -
*Tesla Supercharger CCS (a branded type2_css)* is shown if with socket:tesla_supercharger_ccs~.+ & socket:tesla_supercharger_ccs!=1. _This option cannot be chosen as answer_
- -
*Tesla Supercharger (destination)* is shown if with socket:tesla_destination=1. Unselecting this answer will add socket:tesla_destination=
- -
*Tesla Supercharger (destination)* is shown if with socket:tesla_destination~.+ & socket:tesla_destination!=1 & _country=us. _This option cannot be chosen as answer_
- -
*Tesla supercharger (destination) (A Type 2 with cable branded as tesla)* is shown if with socket:tesla_destination=1. Unselecting this answer will add socket:tesla_destination=
- -
*Tesla supercharger (destination) (A Type 2 with cable branded as tesla)* is shown if with socket:tesla_destination~.+ & socket:tesla_destination!=1 & _country!=us. _This option cannot be chosen as answer_
- -
*USB to charge phones and small electronics* is shown if with socket:USB-A=1. Unselecting this answer will add socket:USB-A=
- -
*USB to charge phones and small electronics* is shown if with socket:USB-A~.+ & socket:USB-A!=1. _This option cannot be chosen as answer_
- -
*Bosch Active Connect with 3 pins and cable* is shown if with socket:bosch_3pin=1. Unselecting this answer will add socket:bosch_3pin=
- -
*Bosch Active Connect with 3 pins and cable* is shown if with socket:bosch_3pin~.+ & socket:bosch_3pin!=1. _This option cannot be chosen as answer_
- -
*Bosch Active Connect with 5 pins and cable* is shown if with socket:bosch_5pin=1. Unselecting this answer will add socket:bosch_5pin=
- -
*Bosch Active Connect with 5 pins and cable* is shown if with socket:bosch_5pin~.+ & socket:bosch_5pin!=1. _This option cannot be chosen as answer_
- -
*BS1363 (Type G)* is shown if with socket:bs1363=1. Unselecting this answer will add socket:bs1363=
- -
*BS1363 (Type G)* is shown if with socket:bs1363~.+ & socket:bs1363!=1. _This option cannot be chosen as answer_
- -
*NEMA 5-15 (Type B)* is shown if with socket:nema5_15=1. Unselecting this answer will add socket:nema5_15=
- -
*NEMA 5-15 (Type B)* is shown if with socket:nema5_15~.+ & socket:nema5_15!=1. _This option cannot be chosen as answer_
- -
*SEV 1011 T23 (Type J)* is shown if with socket:sev1011_t23=1. Unselecting this answer will add socket:sev1011_t23=
- -
*SEV 1011 T23 (Type J)* is shown if with socket:sev1011_t23~.+ & socket:sev1011_t23!=1. _This option cannot be chosen as answer_
- -
*AS3112 (Type I)* is shown if with socket:as3112=1. Unselecting this answer will add socket:as3112=
- -
*AS3112 (Type I)* is shown if with socket:as3112~.+ & socket:as3112!=1. _This option cannot be chosen as answer_
- -
*NEMA 5-20 (Type B)* is shown if with socket:nema_5_20=1. Unselecting this answer will add socket:nema_5_20=
- -
*NEMA 5-20 (Type B)* is shown if with socket:nema_5_20~.+ & socket:nema_5_20!=1. _This option cannot be chosen as answer_
+ -
*Schuko wall plug without ground pin (CEE7/4 type F)* is shown if with socket:schuko=1. Unselecting this answer will add socket:schuko=
+ -
*Schuko wall plug without ground pin (CEE7/4 type F)* is shown if with socket:schuko~.+ & socket:schuko!=1. _This option cannot be chosen as answer_
+ -
*European wall plug with ground pin (CEE7/4 type E)* is shown if with socket:typee=1. Unselecting this answer will add socket:typee=
+ -
*European wall plug with ground pin (CEE7/4 type E)* is shown if with socket:typee~.+ & socket:typee!=1. _This option cannot be chosen as answer_
+ -
*Chademo* is shown if with socket:chademo=1. Unselecting this answer will add socket:chademo=
+ -
*Chademo* is shown if with socket:chademo~.+ & socket:chademo!=1. _This option cannot be chosen as answer_
+ -
*Type 1 with cable (J1772)* is shown if with socket:type1_cable=1. Unselecting this answer will add socket:type1_cable=
+ -
*Type 1 with cable (J1772)* is shown if with socket:type1_cable~.+ & socket:type1_cable!=1. _This option cannot be chosen as answer_
+ -
*Type 1 without cable (J1772)* is shown if with socket:type1=1. Unselecting this answer will add socket:type1=
+ -
*Type 1 without cable (J1772)* is shown if with socket:type1~.+ & socket:type1!=1. _This option cannot be chosen as answer_
+ -
*Type 1 CCS (aka Type 1 Combo)* is shown if with socket:type1_combo=1. Unselecting this answer will add socket:type1_combo=
+ -
*Type 1 CCS (aka Type 1 Combo)* is shown if with socket:type1_combo~.+ & socket:type1_combo!=1. _This option cannot be chosen as answer_
+ -
*Tesla Supercharger* is shown if with socket:tesla_supercharger=1. Unselecting this answer will add socket:tesla_supercharger=
+ -
*Tesla Supercharger* is shown if with socket:tesla_supercharger~.+ & socket:tesla_supercharger!=1. _This option cannot be chosen as answer_
+ -
*Type 2 (mennekes)* is shown if with socket:type2=1. Unselecting this answer will add socket:type2=
+ -
*Type 2 (mennekes)* is shown if with socket:type2~.+ & socket:type2!=1. _This option cannot be chosen as answer_
+ -
*Type 2 CCS (mennekes)* is shown if with socket:type2_combo=1. Unselecting this answer will add socket:type2_combo=
+ -
*Type 2 CCS (mennekes)* is shown if with socket:type2_combo~.+ & socket:type2_combo!=1. _This option cannot be chosen as answer_
+ -
*Type 2 with cable (mennekes)* is shown if with socket:type2_cable=1. Unselecting this answer will add socket:type2_cable=
+ -
*Type 2 with cable (mennekes)* is shown if with socket:type2_cable~.+ & socket:type2_cable!=1. _This option cannot be chosen as answer_
+ -
*Tesla Supercharger CCS (a branded type2_css)* is shown if with socket:tesla_supercharger_ccs=1. Unselecting this answer will add socket:tesla_supercharger_ccs=
+ -
*Tesla Supercharger CCS (a branded type2_css)* is shown if with socket:tesla_supercharger_ccs~.+ & socket:tesla_supercharger_ccs!=1. _This option cannot be chosen as answer_
+ -
*Tesla Supercharger (destination)* is shown if with socket:tesla_destination=1. Unselecting this answer will add socket:tesla_destination=
+ -
*Tesla Supercharger (destination)* is shown if with socket:tesla_destination~.+ & socket:tesla_destination!=1 & _country=us. _This option cannot be chosen as answer_
+ -
*Tesla supercharger (destination) (A Type 2 with cable branded as tesla)* is shown if with socket:tesla_destination=1. Unselecting this answer will add socket:tesla_destination=
+ -
*Tesla supercharger (destination) (A Type 2 with cable branded as tesla)* is shown if with socket:tesla_destination~.+ & socket:tesla_destination!=1 & _country!=us. _This option cannot be chosen as answer_
+ -
*USB to charge phones and small electronics* is shown if with socket:USB-A=1. Unselecting this answer will add socket:USB-A=
+ -
*USB to charge phones and small electronics* is shown if with socket:USB-A~.+ & socket:USB-A!=1. _This option cannot be chosen as answer_
+ -
*Bosch Active Connect with 3 pins and cable* is shown if with socket:bosch_3pin=1. Unselecting this answer will add socket:bosch_3pin=
+ -
*Bosch Active Connect with 3 pins and cable* is shown if with socket:bosch_3pin~.+ & socket:bosch_3pin!=1. _This option cannot be chosen as answer_
+ -
*Bosch Active Connect with 5 pins and cable* is shown if with socket:bosch_5pin=1. Unselecting this answer will add socket:bosch_5pin=
+ -
*Bosch Active Connect with 5 pins and cable* is shown if with socket:bosch_5pin~.+ & socket:bosch_5pin!=1. _This option cannot be chosen as answer_
+ -
*BS1363 (Type G)* is shown if with socket:bs1363=1. Unselecting this answer will add socket:bs1363=
+ -
*BS1363 (Type G)* is shown if with socket:bs1363~.+ & socket:bs1363!=1. _This option cannot be chosen as answer_
+ -
*NEMA 5-15 (Type B)* is shown if with socket:nema5_15=1. Unselecting this answer will add socket:nema5_15=
+ -
*NEMA 5-15 (Type B)* is shown if with socket:nema5_15~.+ & socket:nema5_15!=1. _This option cannot be chosen as answer_
+ -
*SEV 1011 T23 (Type J)* is shown if with socket:sev1011_t23=1. Unselecting this answer will add socket:sev1011_t23=
+ -
*SEV 1011 T23 (Type J)* is shown if with socket:sev1011_t23~.+ & socket:sev1011_t23!=1. _This option cannot be chosen as answer_
+ -
*AS3112 (Type I)* is shown if with socket:as3112=1. Unselecting this answer will add socket:as3112=
+ -
*AS3112 (Type I)* is shown if with socket:as3112~.+ & socket:as3112!=1. _This option cannot be chosen as answer_
+ -
*NEMA 5-20 (Type B)* is shown if with socket:nema_5_20=1. Unselecting this answer will add socket:nema_5_20=
+ -
*NEMA 5-20 (Type B)* is shown if with socket:nema_5_20~.+ & socket:nema_5_20!=1. _This option cannot be chosen as answer_
### plugs-amount-socket:schuko
@@ -1726,7 +1726,7 @@ This tagrendering has labels
The question is `When is this charging station opened?`
*