diff --git a/build.py b/build.py
index 82e3ed4..831d692 100755
--- a/build.py
+++ b/build.py
@@ -9,7 +9,7 @@ from bs4 import BeautifulSoup
 
 from rougail import Rougail
 from rougail.config import get_rougail_config
-from rougail.output_console import RougailOutputConsole
+from rougail.output_display import RougailOutputDisplay
 from rougail.user_data_yaml import RougailUserDataYaml
 from rougail.output_doc import RougailOutputDoc
 
@@ -50,7 +50,8 @@ if __name__ == "__main__":
     inventory = RougailOutputDoc(config, rougailconfig=rougailconfig)
     inventory.load_formatter()
     inv_formatter = inventory.formatter
-    rougailconfig['step.output'] = 'console'
+    rougailconfig['step.output'] = 'display'
+    rougailconfig['display.console.max_width'] = 80
     summary = Path('summary_before.md')
     if summary.is_file():
         with summary.open('r') as sfh:
@@ -78,7 +79,10 @@ if __name__ == "__main__":
         doc += '\n' + inv_formatter.title('Structure', 2) + '\n\n'
         with tree.open() as fh:
             soup = BeautifulSoup(fh.read(), features="lxml")
-            doc += str(soup.find('p')) + "\n\n"
+            tree_content = str(soup.find('p'))
+        doc += tree_content + "\n\n"
+        with tree.open("w") as fh:
+            fh.write(tree_content)
     for f in Path(".").iterdir():
         if f.name.startswith('DISPLAY_'):
             filename = f.name[8:]
@@ -115,7 +119,7 @@ if __name__ == "__main__":
         doc += inv_doc
     if previous.is_file():
         rougailconfig["doc.contents"] = ["changelog"]
-        rougailconfig["doc.previous_json_file"] = str(previous)
+        rougailconfig["doc.changelog.previous_json_file"] = str(previous)
         inv_doc = inventory.run()[1]
         if inv_doc:
             doc += inv_formatter.title("Let's generate the changelog", 3)
@@ -130,7 +134,7 @@ if __name__ == "__main__":
         with previous.open('w') as fh:
             dump(loads(data), fh)
     #
-    rougailconfig['step.output'] = 'console'
+    rougailconfig['step.output'] = 'display'
     config = Path('config')
     if config.is_dir():
         doc += inv_formatter.title('User datas', 2)
@@ -153,8 +157,9 @@ if __name__ == "__main__":
                     rougailconfig['yaml.filename'] = [str(filename)]
                     data = RougailUserDataYaml(tiramisu_config, rougailconfig=rougailconfig)
                     ret = data.run()
-                    errors = rougail.user_datas(ret)
-                    export = RougailOutputConsole(tiramisu_config,
+                    errors = rougail.user_data(ret)
+                    rougailconfig['display.output_format'] = "console"
+                    export = RougailOutputDisplay(tiramisu_config,
                                                   rougailconfig=rougailconfig,
                                                   user_data_errors=errors['errors'],
                                                   user_data_warnings=errors['warnings'],
@@ -167,12 +172,19 @@ if __name__ == "__main__":
                         fh.write(cmd)
                     doc += f"```shell\n{cmd}\n```\n"
                     conv_data = '<pre>' + conv.convert(console, full=False) + "</pre>\n"
-                    doc += conv_data
                     with open(dirname / 'output_ro.html', 'w') as fh_output:
                         fh_output.write(conv_data)
+                    rougailconfig['display.output_format'] = "github"
+                    export = RougailOutputDisplay(tiramisu_config,
+                                                  rougailconfig=rougailconfig,
+                                                  user_data_errors=errors['errors'],
+                                                  user_data_warnings=errors['warnings'],
+                                                  )
+                    doc += export.run()[1]
                     if (dirname / 'invalid').is_file():
-                        errors2 = rougail.user_datas(ret, invalid_user_datas_error=True)
-                        export = RougailOutputConsole(tiramisu_config,
+                        errors2 = rougail.user_data(ret, invalid_user_data_error=True)
+                        rougailconfig['display.output_format'] = "console"
+                        export = RougailOutputDisplay(tiramisu_config,
                                                       rougailconfig=rougailconfig,
                                                       user_data_errors=errors2['errors'],
                                                       user_data_warnings=errors2['warnings'],
@@ -180,20 +192,27 @@ if __name__ == "__main__":
                         console = export.run()[1]
                         conv = Ansi2HTMLConverter(inline=True)
                         doc += inv_formatter.title('Output when invalid user datas is an error', 4)
-                        cmd2 = cmd + " --cli.invalid_user_datas_error"
+                        cmd2 = cmd + " --cli.invalid_user_data_error"
                         with (dirname / "cmd_invalid.txt").open("w") as fh:
                             fh.write(cmd2)
                         doc += f"```shell\n{cmd2}\n```\n"
                         conv_data = '<pre>' + conv.convert(console, full=False) + "</pre>\n"
-                        doc += conv_data
                         with open(dirname / 'output_invalid.html', 'w') as fh_output:
                             fh_output.write(conv_data)
+                        rougailconfig['display.output_format'] = "github"
+                        export = RougailOutputDisplay(tiramisu_config,
+                                                      rougailconfig=rougailconfig,
+                                                      user_data_errors=errors2['errors'],
+                                                      user_data_warnings=errors2['warnings'],
+                                                      )
+                        doc += export.run()[1]
                     if (dirname / 'read_write').is_file():
                         trougailconfig = rougailconfig.copy()
-                        trougailconfig["console.mandatory"] = False
+                        trougailconfig["display.mandatory"] = False
                         tiramisu_config.property.read_write()
-                        errors2 = rougail.user_datas(ret, invalid_user_datas_error=True)
-                        export = RougailOutputConsole(tiramisu_config,
+                        errors2 = rougail.user_data(ret, invalid_user_data_error=True)
+                        rougailconfig['display.output_format'] = "console"
+                        export = RougailOutputDisplay(tiramisu_config,
                                                       rougailconfig=trougailconfig,
                                                       user_data_errors=errors2['errors'],
                                                       user_data_warnings=errors2['warnings'],
@@ -206,9 +225,15 @@ if __name__ == "__main__":
                             fh.write(cmd2)
                         doc += f"```shell\n{cmd2}\n```\n"
                         conv_data = '<pre>' + conv.convert(console, full=False) + "</pre>\n"
-                        doc += conv_data
                         with open(dirname / 'output_rw.html', 'w') as fh_output:
                             fh_output.write(conv_data)
+                        trougailconfig['display.output_format'] = "github"
+                        export = RougailOutputDisplay(tiramisu_config,
+                                                      rougailconfig=trougailconfig,
+                                                      user_data_errors=errors2['errors'],
+                                                      user_data_warnings=errors2['warnings'],
+                                                      )
+                        doc += export.run()[1]
                         tiramisu_config.property.read_only()
     #
     summary = Path('summary_after.md')
diff --git a/build.sh b/build.sh
index 65591ca..6c9ffea 100755
--- a/build.sh
+++ b/build.sh
@@ -62,7 +62,7 @@ for i in $(ls -d "examples"/* | sort); do
         echo "$num"
         commit_id="v${VERSION}_$num"
         title=$(head -n 1 $i/README.md)
-        summary="[tutorial $commit_id)] $title"
+        summary="[tutorial $commit_id] $title"
         if [ -f $i/URL ]; then
             base_url_doc=$(cat $i/URL)
         fi
diff --git a/examples/000/SUBTITLE.md b/examples/000/SUBTITLE.md
deleted file mode 100644
index 34d0d9e..0000000
--- a/examples/000/SUBTITLE.md
+++ /dev/null
@@ -1 +0,0 @@
-Making a structure file
diff --git a/examples/001/SUBTITLE.md b/examples/001/SUBTITLE.md
deleted file mode 100644
index fb61c88..0000000
--- a/examples/001/SUBTITLE.md
+++ /dev/null
@@ -1 +0,0 @@
-Let's create our first "variable"
diff --git a/examples/002/README.md b/examples/002/README.md
index affa716..11e4286 100644
--- a/examples/002/README.md
+++ b/examples/002/README.md
@@ -1,9 +1 @@
 Describe the variable
-
-We can add a description to this first variable.
-
-This information is useful for:
-
-- documentation
-- error message
-- help user to known which value to set to this variable (for example with [the user data plugin Questionary](https://forge.cloud.silique.fr/stove/rougail-user-data-questionary)).
diff --git a/examples/003/README.md b/examples/003/README.md
index 12250ff..4a0beaf 100644
--- a/examples/003/README.md
+++ b/examples/003/README.md
@@ -1,7 +1 @@
 Set a default value
-
-Now we can define the default value of this variable.
-
-If the user doesn't touch this variable's value, the value is "No proxy"
-
-As user intervention is no more required, so the variable change it's default mode too (from "basic" to "standard").
diff --git a/examples/004/README.md b/examples/004/README.md
deleted file mode 100644
index 9a85396..0000000
--- a/examples/004/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Limits the possible values for the variable
-
-"Foo" should not be an option to the "proxy_mode" variable.
-
-Now the "proxy_mode" type is "choice", that means that there is a list of available values that can be selected.
-
-We say that the "proxy_mode" variable is constrained (by choices): this variable accept, in fact, only a list of choices.
diff --git a/examples/010/README.md b/examples/010/README.md
index 6afc5c2..d60c6b2 100644
--- a/examples/010/README.md
+++ b/examples/010/README.md
@@ -1 +1 @@
-Creating a new family
+A variable with a list of possible values
diff --git a/examples/010/SUBTITLE.md b/examples/010/SUBTITLE.md
deleted file mode 100644
index fed1939..0000000
--- a/examples/010/SUBTITLE.md
+++ /dev/null
@@ -1 +0,0 @@
-Group variables inside "families"
diff --git a/examples/010/TITLE.md b/examples/010/TITLE.md
new file mode 100644
index 0000000..d60c6b2
--- /dev/null
+++ b/examples/010/TITLE.md
@@ -0,0 +1 @@
+A variable with a list of possible values
diff --git a/examples/010/URL b/examples/010/URL
deleted file mode 100644
index 69173b8..0000000
--- a/examples/010/URL
+++ /dev/null
@@ -1 +0,0 @@
-https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/proxymode.html
diff --git a/examples/004/config/01/README.md b/examples/010/config/01/README.md
similarity index 100%
rename from examples/004/config/01/README.md
rename to examples/010/config/01/README.md
diff --git a/examples/004/config/01/config.yml b/examples/010/config/01/config.yml
similarity index 100%
rename from examples/004/config/01/config.yml
rename to examples/010/config/01/config.yml
diff --git a/examples/004/config/02/config.yml b/examples/010/config/02/config.yml
similarity index 100%
rename from examples/004/config/02/config.yml
rename to examples/010/config/02/config.yml
diff --git a/examples/004/config/03/config.yml b/examples/010/config/03/config.yml
similarity index 100%
rename from examples/004/config/03/config.yml
rename to examples/010/config/03/config.yml
diff --git a/examples/004/config/04/README.md b/examples/010/config/04/README.md
similarity index 100%
rename from examples/004/config/04/README.md
rename to examples/010/config/04/README.md
diff --git a/examples/004/config/04/config.yml b/examples/010/config/04/config.yml
similarity index 100%
rename from examples/004/config/04/config.yml
rename to examples/010/config/04/config.yml
diff --git a/examples/004/config/04/invalid b/examples/010/config/04/invalid
similarity index 100%
rename from examples/004/config/04/invalid
rename to examples/010/config/04/invalid
diff --git a/examples/004/structural_files/firefox/00-proxy.yml b/examples/010/structural_files/firefox/00-proxy.yml
similarity index 100%
rename from examples/004/structural_files/firefox/00-proxy.yml
rename to examples/010/structural_files/firefox/00-proxy.yml
diff --git a/examples/010/structural_files/firefox/10-manual.yml b/examples/010/structural_files/firefox/10-manual.yml
deleted file mode 100644
index 7626e80..0000000
--- a/examples/010/structural_files/firefox/10-manual.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-manual:
-  description: Manual proxy configuration
-  type: family
-...
diff --git a/examples/011/README.md b/examples/011/README.md
deleted file mode 100644
index 5ae0405..0000000
--- a/examples/011/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Or a sub family
-
-Inside a family, we can have variables or families.
-
-The "type" for family "manual" became unecessary because container an other family, so it's not a variable.
-The description can now be has family comment.
-
-In disabled attribute, it's better tu use relative path (we will see the reason in an other slide).
diff --git a/examples/011/structural_files/firefox/10-manual.yml b/examples/011/structural_files/firefox/10-manual.yml
deleted file mode 100644
index 5d6d2b0..0000000
--- a/examples/011/structural_files/firefox/10-manual.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-manual:  # Manual proxy configuration
-
-  http_proxy:
-    description: HTTP Proxy
-    type: family
-...
diff --git a/examples/012/README.md b/examples/012/README.md
deleted file mode 100644
index 56d9fbd..0000000
--- a/examples/012/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Putting a variable inside of a family or a sub family
diff --git a/examples/012/config/02/config.yml b/examples/012/config/02/config.yml
deleted file mode 100644
index 22422a2..0000000
--- a/examples/012/config/02/config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-manual:
-  http_proxy:
-    address: example.net
diff --git a/examples/012/structural_files/firefox/10-manual.yml b/examples/012/structural_files/firefox/10-manual.yml
deleted file mode 100644
index 316c6ce..0000000
--- a/examples/012/structural_files/firefox/10-manual.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-manual:  # Manual proxy configuration
-
-  http_proxy:  # HTTP Proxy
-
-    address:  # HTTP address
-...
diff --git a/examples/020/README.md b/examples/020/README.md
index d3326ec..6afc5c2 100644
--- a/examples/020/README.md
+++ b/examples/020/README.md
@@ -1 +1 @@
-A variable with type "domainname"
+Creating a new family
diff --git a/examples/020/TITLE.md b/examples/020/TITLE.md
index ee57e08..fed1939 100644
--- a/examples/020/TITLE.md
+++ b/examples/020/TITLE.md
@@ -1 +1 @@
-Constrainte the value of a variable with it's type
+Group variables inside "families"
diff --git a/examples/020/URL b/examples/020/URL
index 5a5e1ce..69173b8 100644
--- a/examples/020/URL
+++ b/examples/020/URL
@@ -1 +1 @@
-https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/disabled.html
+https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/proxymode.html
diff --git a/examples/020/config/02/config.yml b/examples/020/config/02/config.yml
deleted file mode 100644
index cbc9903..0000000
--- a/examples/020/config/02/config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-manual:
-  http_proxy:
-    address: 192.168.0.1
diff --git a/examples/020/config/03/config.yml b/examples/020/config/03/config.yml
deleted file mode 100644
index bdc052c..0000000
--- a/examples/020/config/03/config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-manual:
-  http_proxy:
-    address: not a valid domain name
diff --git a/examples/010/firefox.png b/examples/020/firefox.png
similarity index 100%
rename from examples/010/firefox.png
rename to examples/020/firefox.png
diff --git a/examples/010/firefox.xcf b/examples/020/firefox.xcf
similarity index 100%
rename from examples/010/firefox.xcf
rename to examples/020/firefox.xcf
diff --git a/examples/020/structural_files/firefox/10-manual.yml b/examples/020/structural_files/firefox/10-manual.yml
index 39f4cb2..7626e80 100644
--- a/examples/020/structural_files/firefox/10-manual.yml
+++ b/examples/020/structural_files/firefox/10-manual.yml
@@ -2,11 +2,7 @@
 ---
 version: 1.1
 
-manual:  # Manual proxy configuration
-
-  http_proxy:  # HTTP Proxy
-
-    address:
-      description: HTTP address
-      type: domainname
+manual:
+  description: Manual proxy configuration
+  type: family
 ...
diff --git a/examples/021/README.md b/examples/021/README.md
index 57a7fb3..5ae0405 100644
--- a/examples/021/README.md
+++ b/examples/021/README.md
@@ -1 +1,8 @@
-A variable with type's parameters
+Or a sub family
+
+Inside a family, we can have variables or families.
+
+The "type" for family "manual" became unecessary because container an other family, so it's not a variable.
+The description can now be has family comment.
+
+In disabled attribute, it's better tu use relative path (we will see the reason in an other slide).
diff --git a/examples/021/config b/examples/021/config
deleted file mode 120000
index f6f691c..0000000
--- a/examples/021/config
+++ /dev/null
@@ -1 +0,0 @@
-../020/config
\ No newline at end of file
diff --git a/examples/021/structural_files/firefox/10-manual.yml b/examples/021/structural_files/firefox/10-manual.yml
index 973e436..5d6d2b0 100644
--- a/examples/021/structural_files/firefox/10-manual.yml
+++ b/examples/021/structural_files/firefox/10-manual.yml
@@ -4,11 +4,7 @@ version: 1.1
 
 manual:  # Manual proxy configuration
 
-  http_proxy:  # HTTP Proxy
-
-    address:
-      description: HTTP address
-      type: domainname
-      params:
-        allow_ip: true
+  http_proxy:
+    description: HTTP Proxy
+    type: family
 ...
diff --git a/examples/022/README.md b/examples/022/README.md
index da8667a..56d9fbd 100644
--- a/examples/022/README.md
+++ b/examples/022/README.md
@@ -1 +1 @@
-A variable with type "port"
+Putting a variable inside of a family or a sub family
diff --git a/examples/022/config/01/config.yml b/examples/022/config/01/config.yml
index e3db924..ed97d53 100644
--- a/examples/022/config/01/config.yml
+++ b/examples/022/config/01/config.yml
@@ -1,5 +1 @@
 ---
-proxy_mode: Manual proxy configuration
-manual:
-  http_proxy:
-    address: example.net
diff --git a/examples/022/config/02/config.yml b/examples/022/config/02/config.yml
index 6e7c9dc..22422a2 100644
--- a/examples/022/config/02/config.yml
+++ b/examples/022/config/02/config.yml
@@ -1,6 +1,4 @@
 ---
-proxy_mode: Manual proxy configuration
 manual:
   http_proxy:
     address: example.net
-    port: 3128
diff --git a/examples/022/config/03/config.yml b/examples/022/config/03/config.yml
index d05944f..da3353a 100644
--- a/examples/022/config/03/config.yml
+++ b/examples/022/config/03/config.yml
@@ -1,6 +1,5 @@
 ---
-proxy_mode: Manual proxy configuration
 manual:
   http_proxy:
     address: example.net
-    port: 100000
+    port: 3128
diff --git a/examples/022/structural_files/firefox/10-manual.yml b/examples/022/structural_files/firefox/10-manual.yml
index 304fc84..316c6ce 100644
--- a/examples/022/structural_files/firefox/10-manual.yml
+++ b/examples/022/structural_files/firefox/10-manual.yml
@@ -6,14 +6,5 @@ manual:  # Manual proxy configuration
 
   http_proxy:  # HTTP Proxy
 
-    address:
-      description: HTTP address
-      type: domainname
-      params:
-        allow_ip: true
-
-    port:
-      description: HTTP Port
-      type: port
-      default: 8080
+    address:  # HTTP address
 ...
diff --git a/examples/023/README.md b/examples/023/README.md
deleted file mode 100644
index fe24996..0000000
--- a/examples/023/README.md
+++ /dev/null
@@ -1 +0,0 @@
-A variable with type "boolean"
diff --git a/examples/023/config/01/config.yml b/examples/023/config/01/config.yml
deleted file mode 100644
index 22422a2..0000000
--- a/examples/023/config/01/config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-manual:
-  http_proxy:
-    address: example.net
diff --git a/examples/023/config/02/config.yml b/examples/023/config/02/config.yml
deleted file mode 100644
index e4ecc47..0000000
--- a/examples/023/config/02/config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-manual:
-  http_proxy:
-    address: example.net
-  use_for_https: false
diff --git a/examples/023/structural_files/firefox/20-manual.yml b/examples/023/structural_files/firefox/20-manual.yml
deleted file mode 100644
index bbd0f25..0000000
--- a/examples/023/structural_files/firefox/20-manual.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-manual:
-
-  use_for_https: true  # Also use this proxy for HTTPS
-...
diff --git a/examples/030/README.md b/examples/030/README.md
index 553282f..d3326ec 100644
--- a/examples/030/README.md
+++ b/examples/030/README.md
@@ -1 +1 @@
-A disabled family
+A variable with type "domainname"
diff --git a/examples/030/TITLE.md b/examples/030/TITLE.md
index 5202295..ee57e08 100644
--- a/examples/030/TITLE.md
+++ b/examples/030/TITLE.md
@@ -1 +1 @@
-Define access to variable or family
+Constrainte the value of a variable with it's type
diff --git a/examples/030/URL b/examples/030/URL
new file mode 100644
index 0000000..5a5e1ce
--- /dev/null
+++ b/examples/030/URL
@@ -0,0 +1 @@
+https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/disabled.html
diff --git a/examples/030/config/01/config.yml b/examples/030/config/01/config.yml
index ed97d53..22422a2 100644
--- a/examples/030/config/01/config.yml
+++ b/examples/030/config/01/config.yml
@@ -1 +1,4 @@
 ---
+manual:
+  http_proxy:
+    address: example.net
diff --git a/examples/030/config/02/config.yml b/examples/030/config/02/config.yml
index 9b246a4..cbc9903 100644
--- a/examples/030/config/02/config.yml
+++ b/examples/030/config/02/config.yml
@@ -1,7 +1,4 @@
 ---
-proxy_mode: Manual proxy configuration
 manual:
   http_proxy:
-    address: http.proxy.net
-    port: 3128
-  use_for_https: false
+    address: 192.168.0.1
diff --git a/examples/020/config/02/invalid b/examples/030/config/02/invalid
similarity index 100%
rename from examples/020/config/02/invalid
rename to examples/030/config/02/invalid
diff --git a/examples/030/config/03/config.yml b/examples/030/config/03/config.yml
new file mode 100644
index 0000000..39895d1
--- /dev/null
+++ b/examples/030/config/03/config.yml
@@ -0,0 +1,4 @@
+---
+manual:
+  http_proxy:
+    address: not a valid domain name.com
diff --git a/examples/020/config/03/invalid b/examples/030/config/03/invalid
similarity index 100%
rename from examples/020/config/03/invalid
rename to examples/030/config/03/invalid
diff --git a/examples/030/structural_files/firefox/10-manual.yml b/examples/030/structural_files/firefox/10-manual.yml
index 596b79e..39f4cb2 100644
--- a/examples/030/structural_files/firefox/10-manual.yml
+++ b/examples/030/structural_files/firefox/10-manual.yml
@@ -2,20 +2,11 @@
 ---
 version: 1.1
 
-manual:
-  description: Manual proxy configuration
-  disabled: true
+manual:  # Manual proxy configuration
 
   http_proxy:  # HTTP Proxy
 
     address:
       description: HTTP address
       type: domainname
-      params:
-        allow_ip: true
-
-    port:
-      description: HTTP Port
-      type: port
-      default: 8080
 ...
diff --git a/examples/031/README.md b/examples/031/README.md
index eac87eb..57a7fb3 100644
--- a/examples/031/README.md
+++ b/examples/031/README.md
@@ -1 +1 @@
-A conditional disabled family
+A variable with type's parameters
diff --git a/examples/031/config/01/config.yml b/examples/031/config/01/config.yml
index ed97d53..22422a2 100644
--- a/examples/031/config/01/config.yml
+++ b/examples/031/config/01/config.yml
@@ -1 +1,4 @@
 ---
+manual:
+  http_proxy:
+    address: example.net
diff --git a/examples/031/config/02/config.yml b/examples/031/config/02/config.yml
index 9b246a4..cbc9903 100644
--- a/examples/031/config/02/config.yml
+++ b/examples/031/config/02/config.yml
@@ -1,7 +1,4 @@
 ---
-proxy_mode: Manual proxy configuration
 manual:
   http_proxy:
-    address: http.proxy.net
-    port: 3128
-  use_for_https: false
+    address: 192.168.0.1
diff --git a/examples/022/config/03/invalid b/examples/031/config/02/invalid
similarity index 100%
rename from examples/022/config/03/invalid
rename to examples/031/config/02/invalid
diff --git a/examples/031/config/03/config.yml b/examples/031/config/03/config.yml
new file mode 100644
index 0000000..39895d1
--- /dev/null
+++ b/examples/031/config/03/config.yml
@@ -0,0 +1,4 @@
+---
+manual:
+  http_proxy:
+    address: not a valid domain name.com
diff --git a/examples/030/structural_files/DISPLAY_10-manual.yml b/examples/031/config/03/invalid
similarity index 100%
rename from examples/030/structural_files/DISPLAY_10-manual.yml
rename to examples/031/config/03/invalid
diff --git a/examples/031/structural_files/firefox/10-manual.yml b/examples/031/structural_files/firefox/10-manual.yml
index 047ff8a..973e436 100644
--- a/examples/031/structural_files/firefox/10-manual.yml
+++ b/examples/031/structural_files/firefox/10-manual.yml
@@ -2,11 +2,7 @@
 ---
 version: 1.1
 
-manual:
-  description: Manual proxy configuration
-  disabled:
-    variable: _.proxy_mode
-    when_not: Manual proxy configuration
+manual:  # Manual proxy configuration
 
   http_proxy:  # HTTP Proxy
 
@@ -15,9 +11,4 @@ manual:
       type: domainname
       params:
         allow_ip: true
-
-    port:
-      description: HTTP Port
-      type: port
-      default: 8080
 ...
diff --git a/examples/032/README.md b/examples/032/README.md
index 7d9b8be..da8667a 100644
--- a/examples/032/README.md
+++ b/examples/032/README.md
@@ -1 +1 @@
-Copy HTTP manual proxy to HTTPS manual proxy
+A variable with type "port"
diff --git a/examples/020/config/01/config.yml b/examples/032/config/01/config.yml
similarity index 56%
rename from examples/020/config/01/config.yml
rename to examples/032/config/01/config.yml
index 22422a2..e3db924 100644
--- a/examples/020/config/01/config.yml
+++ b/examples/032/config/01/config.yml
@@ -1,4 +1,5 @@
 ---
+proxy_mode: Manual proxy configuration
 manual:
   http_proxy:
     address: example.net
diff --git a/examples/012/config/03/config.yml b/examples/032/config/02/config.yml
similarity index 62%
rename from examples/012/config/03/config.yml
rename to examples/032/config/02/config.yml
index da3353a..6e7c9dc 100644
--- a/examples/012/config/03/config.yml
+++ b/examples/032/config/02/config.yml
@@ -1,4 +1,5 @@
 ---
+proxy_mode: Manual proxy configuration
 manual:
   http_proxy:
     address: example.net
diff --git a/examples/032/config/03/config.yml b/examples/032/config/03/config.yml
new file mode 100644
index 0000000..d05944f
--- /dev/null
+++ b/examples/032/config/03/config.yml
@@ -0,0 +1,6 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: example.net
+    port: 100000
diff --git a/examples/031/structural_files/DISPLAY_10-manual.yml b/examples/032/config/03/invalid
similarity index 100%
rename from examples/031/structural_files/DISPLAY_10-manual.yml
rename to examples/032/config/03/invalid
diff --git a/examples/032/structural_files/firefox/10-manual.yml b/examples/032/structural_files/firefox/10-manual.yml
new file mode 100644
index 0000000..304fc84
--- /dev/null
+++ b/examples/032/structural_files/firefox/10-manual.yml
@@ -0,0 +1,19 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:  # Manual proxy configuration
+
+  http_proxy:  # HTTP Proxy
+
+    address:
+      description: HTTP address
+      type: domainname
+      params:
+        allow_ip: true
+
+    port:
+      description: HTTP Port
+      type: port
+      default: 8080
+...
diff --git a/examples/033/README.md b/examples/033/README.md
index 16d6e46..fe24996 100644
--- a/examples/033/README.md
+++ b/examples/033/README.md
@@ -1 +1 @@
-A conditional hidden family
+A variable with type "boolean"
diff --git a/examples/033/config/01/config.yml b/examples/033/config/01/config.yml
index 84547fa..22422a2 100644
--- a/examples/033/config/01/config.yml
+++ b/examples/033/config/01/config.yml
@@ -1,9 +1,4 @@
 ---
-proxy_mode: Manual proxy configuration
 manual:
   http_proxy:
-    address: http.proxy.net
-    port: 3128
-  use_for_https: false
-  https_proxy:
-    address: https.proxy.net
+    address: example.net
diff --git a/examples/033/config/02/config.yml b/examples/033/config/02/config.yml
index 7455217..e4ecc47 100644
--- a/examples/033/config/02/config.yml
+++ b/examples/033/config/02/config.yml
@@ -1,7 +1,5 @@
 ---
-proxy_mode: Manual proxy configuration
 manual:
   http_proxy:
-    address: http.proxy.net
-    port: 3128
-  use_for_https: true
+    address: example.net
+  use_for_https: false
diff --git a/examples/023/firefox.png b/examples/033/firefox.png
similarity index 100%
rename from examples/023/firefox.png
rename to examples/033/firefox.png
diff --git a/examples/023/firefox.xcf b/examples/033/firefox.xcf
similarity index 100%
rename from examples/023/firefox.xcf
rename to examples/033/firefox.xcf
diff --git a/examples/033/structural_files/firefox/20-manual.yml b/examples/033/structural_files/firefox/20-manual.yml
index f7295f0..bbd0f25 100644
--- a/examples/033/structural_files/firefox/20-manual.yml
+++ b/examples/033/structural_files/firefox/20-manual.yml
@@ -5,20 +5,4 @@ version: 1.1
 manual:
 
   use_for_https: true  # Also use this proxy for HTTPS
-
-  https_proxy:
-    description: HTTPS Proxy
-    hidden:
-      variable: _.use_for_https
-
-    address:
-      description: HTTPS address
-      type: domainname
-      params:
-        allow_ip: true
-
-    port:
-      description: HTTPS Port
-      type: port
-      default: 8080
 ...
diff --git a/examples/040/README.md b/examples/040/README.md
index 1be0e6e..553282f 100644
--- a/examples/040/README.md
+++ b/examples/040/README.md
@@ -1 +1 @@
-A calculated default value
+A disabled family
diff --git a/examples/030/SUBTITLE.md b/examples/040/SUBTITLE.md
similarity index 100%
rename from examples/030/SUBTITLE.md
rename to examples/040/SUBTITLE.md
diff --git a/examples/040/TITLE.md b/examples/040/TITLE.md
index d4769fe..5202295 100644
--- a/examples/040/TITLE.md
+++ b/examples/040/TITLE.md
@@ -1 +1 @@
-Calculated default value for a variable
+Define access to variable or family
diff --git a/examples/040/config/01/config.yml b/examples/040/config/01/config.yml
index 84547fa..ed97d53 100644
--- a/examples/040/config/01/config.yml
+++ b/examples/040/config/01/config.yml
@@ -1,9 +1 @@
 ---
-proxy_mode: Manual proxy configuration
-manual:
-  http_proxy:
-    address: http.proxy.net
-    port: 3128
-  use_for_https: false
-  https_proxy:
-    address: https.proxy.net
diff --git a/examples/030/config/02/README.md b/examples/040/config/02/README.md
similarity index 100%
rename from examples/030/config/02/README.md
rename to examples/040/config/02/README.md
diff --git a/examples/040/config/02/config.yml b/examples/040/config/02/config.yml
new file mode 100644
index 0000000..9b246a4
--- /dev/null
+++ b/examples/040/config/02/config.yml
@@ -0,0 +1,7 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: false
diff --git a/examples/088/config/mode b/examples/040/structural_files/DISPLAY_10-manual.yml
similarity index 100%
rename from examples/088/config/mode
rename to examples/040/structural_files/DISPLAY_10-manual.yml
diff --git a/examples/040/structural_files/firefox/10-manual.yml b/examples/040/structural_files/firefox/10-manual.yml
new file mode 100644
index 0000000..596b79e
--- /dev/null
+++ b/examples/040/structural_files/firefox/10-manual.yml
@@ -0,0 +1,21 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+  description: Manual proxy configuration
+  disabled: true
+
+  http_proxy:  # HTTP Proxy
+
+    address:
+      description: HTTP address
+      type: domainname
+      params:
+        allow_ip: true
+
+    port:
+      description: HTTP Port
+      type: port
+      default: 8080
+...
diff --git a/examples/041/README.md b/examples/041/README.md
new file mode 100644
index 0000000..eac87eb
--- /dev/null
+++ b/examples/041/README.md
@@ -0,0 +1 @@
+A conditional disabled family
diff --git a/examples/012/config/01/config.yml b/examples/041/config/01/config.yml
similarity index 100%
rename from examples/012/config/01/config.yml
rename to examples/041/config/01/config.yml
diff --git a/examples/031/config/02/README.md b/examples/041/config/02/README.md
similarity index 100%
rename from examples/031/config/02/README.md
rename to examples/041/config/02/README.md
diff --git a/examples/041/config/02/config.yml b/examples/041/config/02/config.yml
new file mode 100644
index 0000000..9b246a4
--- /dev/null
+++ b/examples/041/config/02/config.yml
@@ -0,0 +1,7 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: false
diff --git a/examples/100/namespace b/examples/041/structural_files/DISPLAY_10-manual.yml
similarity index 100%
rename from examples/100/namespace
rename to examples/041/structural_files/DISPLAY_10-manual.yml
diff --git a/examples/041/structural_files/firefox/10-manual.yml b/examples/041/structural_files/firefox/10-manual.yml
new file mode 100644
index 0000000..047ff8a
--- /dev/null
+++ b/examples/041/structural_files/firefox/10-manual.yml
@@ -0,0 +1,23 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+  description: Manual proxy configuration
+  disabled:
+    variable: _.proxy_mode
+    when_not: Manual proxy configuration
+
+  http_proxy:  # HTTP Proxy
+
+    address:
+      description: HTTP address
+      type: domainname
+      params:
+        allow_ip: true
+
+    port:
+      description: HTTP Port
+      type: port
+      default: 8080
+...
diff --git a/examples/042/README.md b/examples/042/README.md
new file mode 100644
index 0000000..29f3f94
--- /dev/null
+++ b/examples/042/README.md
@@ -0,0 +1 @@
+A hidden family
diff --git a/examples/032/SUBTITLE.md b/examples/042/SUBTITLE.md
similarity index 100%
rename from examples/032/SUBTITLE.md
rename to examples/042/SUBTITLE.md
diff --git a/examples/032/structural_files/firefox/20-manual.yml b/examples/042/structural_files/firefox/20-manual.yml
similarity index 82%
rename from examples/032/structural_files/firefox/20-manual.yml
rename to examples/042/structural_files/firefox/20-manual.yml
index 442fb2d..42f47c9 100644
--- a/examples/032/structural_files/firefox/20-manual.yml
+++ b/examples/042/structural_files/firefox/20-manual.yml
@@ -6,7 +6,9 @@ manual:
 
   use_for_https: true  # Also use this proxy for HTTPS
 
-  https_proxy:  # HTTPS Proxy
+  https_proxy:
+    description: HTTPS Proxy
+    hidden: true
 
     address:
       description: HTTPS address
diff --git a/examples/043/README.md b/examples/043/README.md
new file mode 100644
index 0000000..16d6e46
--- /dev/null
+++ b/examples/043/README.md
@@ -0,0 +1 @@
+A conditional hidden family
diff --git a/examples/033/config/01/README.md b/examples/043/config/01/README.md
similarity index 100%
rename from examples/033/config/01/README.md
rename to examples/043/config/01/README.md
diff --git a/examples/043/config/01/config.yml b/examples/043/config/01/config.yml
new file mode 100644
index 0000000..84547fa
--- /dev/null
+++ b/examples/043/config/01/config.yml
@@ -0,0 +1,9 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: false
+  https_proxy:
+    address: https.proxy.net
diff --git a/examples/033/config/02/README.md b/examples/043/config/02/README.md
similarity index 100%
rename from examples/033/config/02/README.md
rename to examples/043/config/02/README.md
diff --git a/examples/043/config/02/config.yml b/examples/043/config/02/config.yml
new file mode 100644
index 0000000..7455217
--- /dev/null
+++ b/examples/043/config/02/config.yml
@@ -0,0 +1,7 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: true
diff --git a/examples/040/structural_files/firefox/20-manual.yml b/examples/043/structural_files/firefox/20-manual.yml
similarity index 71%
rename from examples/040/structural_files/firefox/20-manual.yml
rename to examples/043/structural_files/firefox/20-manual.yml
index f25bcd9..f7295f0 100644
--- a/examples/040/structural_files/firefox/20-manual.yml
+++ b/examples/043/structural_files/firefox/20-manual.yml
@@ -13,11 +13,12 @@ manual:
 
     address:
       description: HTTPS address
-      default:
-        variable: __.http_proxy.address
+      type: domainname
+      params:
+        allow_ip: true
 
     port:
       description: HTTPS Port
-      default:
-        variable: __.http_proxy.port
+      type: port
+      default: 8080
 ...
diff --git a/examples/050/README.md b/examples/050/README.md
index e245b81..1be0e6e 100644
--- a/examples/050/README.md
+++ b/examples/050/README.md
@@ -1 +1 @@
-Family: a dynamic family
+A calculated default value
diff --git a/examples/050/TITLE.md b/examples/050/TITLE.md
index 5fface9..d4769fe 100644
--- a/examples/050/TITLE.md
+++ b/examples/050/TITLE.md
@@ -1 +1 @@
-Dynamic family
+Calculated default value for a variable
diff --git a/examples/050/URL b/examples/050/URL
deleted file mode 100644
index ef892f0..0000000
--- a/examples/050/URL
+++ /dev/null
@@ -1 +0,0 @@
-https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/dynfam.html
diff --git a/examples/050/config b/examples/050/config
deleted file mode 120000
index 3bac45d..0000000
--- a/examples/050/config
+++ /dev/null
@@ -1 +0,0 @@
-../018/config
\ No newline at end of file
diff --git a/examples/040/config/01/README.md b/examples/050/config/01/README.md
similarity index 100%
rename from examples/040/config/01/README.md
rename to examples/050/config/01/README.md
diff --git a/examples/050/config/01/config.yml b/examples/050/config/01/config.yml
new file mode 100644
index 0000000..84547fa
--- /dev/null
+++ b/examples/050/config/01/config.yml
@@ -0,0 +1,9 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: false
+  https_proxy:
+    address: https.proxy.net
diff --git a/examples/050/structural_files/firefox/20-manual.yml b/examples/050/structural_files/firefox/20-manual.yml
index fc35af3..f25bcd9 100644
--- a/examples/050/structural_files/firefox/20-manual.yml
+++ b/examples/050/structural_files/firefox/20-manual.yml
@@ -6,21 +6,18 @@ manual:
 
   use_for_https: true  # Also use this proxy for HTTPS
 
-  '{{ identifier }}_proxy':
-    description: '{{ identifier }} Proxy'
+  https_proxy:
+    description: HTTPS Proxy
     hidden:
       variable: _.use_for_https
-    dynamic:
-      - HTTPS
-      - SOCKS
 
     address:
-      description: '{{ identifier }} address'
+      description: HTTPS address
       default:
         variable: __.http_proxy.address
 
     port:
-      description: '{{ identifier }} port'
+      description: HTTPS Port
       default:
         variable: __.http_proxy.port
 ...
diff --git a/examples/051/README.md b/examples/051/README.md
deleted file mode 100644
index 78e2e1b..0000000
--- a/examples/051/README.md
+++ /dev/null
@@ -1 +0,0 @@
-A conditional disabled variable with dynamic identifier
diff --git a/examples/051/config b/examples/051/config
deleted file mode 120000
index 3bac45d..0000000
--- a/examples/051/config
+++ /dev/null
@@ -1 +0,0 @@
-../018/config
\ No newline at end of file
diff --git a/examples/060/README.md b/examples/060/README.md
index 3a47ef4..e245b81 100644
--- a/examples/060/README.md
+++ b/examples/060/README.md
@@ -1 +1 @@
-A conditional hidden family with Jinja
+Family: a dynamic family
diff --git a/examples/060/TITLE.md b/examples/060/TITLE.md
index 5282e00..5fface9 100644
--- a/examples/060/TITLE.md
+++ b/examples/060/TITLE.md
@@ -1 +1 @@
-Playing with Jinja
+Dynamic family
diff --git a/examples/060/URL b/examples/060/URL
index ac03324..ef892f0 100644
--- a/examples/060/URL
+++ b/examples/060/URL
@@ -1 +1 @@
-https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/calculation.html
+https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/dynfam.html
diff --git a/examples/060/config b/examples/060/config
deleted file mode 120000
index 3bac45d..0000000
--- a/examples/060/config
+++ /dev/null
@@ -1 +0,0 @@
-../018/config
\ No newline at end of file
diff --git a/examples/060/config/01/README.md b/examples/060/config/01/README.md
new file mode 100644
index 0000000..765a56e
--- /dev/null
+++ b/examples/060/config/01/README.md
@@ -0,0 +1,2 @@
+If "use_for_https" is false, HTTPS variables are visible in read only mode and in read write mode.
+
diff --git a/examples/060/config/01/config.yml b/examples/060/config/01/config.yml
new file mode 100644
index 0000000..84547fa
--- /dev/null
+++ b/examples/060/config/01/config.yml
@@ -0,0 +1,9 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: false
+  https_proxy:
+    address: https.proxy.net
diff --git a/examples/060/structural_files/firefox/20-manual.yml b/examples/060/structural_files/firefox/20-manual.yml
index f1f87d9..fc35af3 100644
--- a/examples/060/structural_files/firefox/20-manual.yml
+++ b/examples/060/structural_files/firefox/20-manual.yml
@@ -9,10 +9,7 @@ manual:
   '{{ identifier }}_proxy':
     description: '{{ identifier }} Proxy'
     hidden:
-      jinja: |-
-        {% if _.use_for_https %}
-          HTTPS is same has HTTP
-        {% endif %}
+      variable: _.use_for_https
     dynamic:
       - HTTPS
       - SOCKS
@@ -26,14 +23,4 @@ manual:
       description: '{{ identifier }} port'
       default:
         variable: __.http_proxy.port
-
-    version:
-      description: SOCKS host version used by proxy
-      choices:
-        - v4
-        - v5
-      default: v5
-      disabled:
-        type: identifier
-        when: HTTPS
 ...
diff --git a/examples/061/README.md b/examples/061/README.md
index 3723340..78e2e1b 100644
--- a/examples/061/README.md
+++ b/examples/061/README.md
@@ -1 +1 @@
-Jinja with a description
+A conditional disabled variable with dynamic identifier
diff --git a/examples/061/config b/examples/061/config
deleted file mode 120000
index 3bac45d..0000000
--- a/examples/061/config
+++ /dev/null
@@ -1 +0,0 @@
-../018/config
\ No newline at end of file
diff --git a/examples/061/config/01/README.md b/examples/061/config/01/README.md
new file mode 100644
index 0000000..765a56e
--- /dev/null
+++ b/examples/061/config/01/README.md
@@ -0,0 +1,2 @@
+If "use_for_https" is false, HTTPS variables are visible in read only mode and in read write mode.
+
diff --git a/examples/061/config/01/config.yml b/examples/061/config/01/config.yml
new file mode 100644
index 0000000..84547fa
--- /dev/null
+++ b/examples/061/config/01/config.yml
@@ -0,0 +1,9 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: false
+  https_proxy:
+    address: https.proxy.net
diff --git a/examples/061/structural_files/firefox/20-manual.yml b/examples/061/structural_files/firefox/20-manual.yml
index a298cb4..ae857ce 100644
--- a/examples/061/structural_files/firefox/20-manual.yml
+++ b/examples/061/structural_files/firefox/20-manual.yml
@@ -9,11 +9,7 @@ manual:
   '{{ identifier }}_proxy':
     description: '{{ identifier }} Proxy'
     hidden:
-      jinja: |-
-        {% if _.use_for_https %}
-          HTTPS is same has HTTP
-        {% endif %}
-      description: in HTTPS case if "_.use_for_https" is set to "true"
+      variable: _.use_for_https
     dynamic:
       - HTTPS
       - SOCKS
diff --git a/examples/062/config b/examples/062/config
deleted file mode 120000
index 3bac45d..0000000
--- a/examples/062/config
+++ /dev/null
@@ -1 +0,0 @@
-../018/config
\ No newline at end of file
diff --git a/examples/070/README.md b/examples/070/README.md
index c17fb19..3a47ef4 100644
--- a/examples/070/README.md
+++ b/examples/070/README.md
@@ -1 +1 @@
-A conditional disabled variable with type web_address
+A conditional hidden family with Jinja
diff --git a/examples/070/TITLE.md b/examples/070/TITLE.md
index f8bc264..5282e00 100644
--- a/examples/070/TITLE.md
+++ b/examples/070/TITLE.md
@@ -1 +1 @@
-Various variables
+Playing with Jinja
diff --git a/examples/070/URL b/examples/070/URL
new file mode 100644
index 0000000..ac03324
--- /dev/null
+++ b/examples/070/URL
@@ -0,0 +1 @@
+https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/calculation.html
diff --git a/examples/070/config/01/README.md b/examples/070/config/01/README.md
index 2e2d78a..765a56e 100644
--- a/examples/070/config/01/README.md
+++ b/examples/070/config/01/README.md
@@ -1 +1,2 @@
-We cannot configure "auto" if "proxy_mode" is not "Automatic proxy configuration URL".
+If "use_for_https" is false, HTTPS variables are visible in read only mode and in read write mode.
+
diff --git a/examples/070/config/01/config.yml b/examples/070/config/01/config.yml
index 1edbe91..84547fa 100644
--- a/examples/070/config/01/config.yml
+++ b/examples/070/config/01/config.yml
@@ -1,2 +1,9 @@
 ---
-auto: https://auto.proxy.net/wpad.dat
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: false
+  https_proxy:
+    address: https.proxy.net
diff --git a/examples/070/config/02/config.yml b/examples/070/config/02/config.yml
deleted file mode 100644
index 26df130..0000000
--- a/examples/070/config/02/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-proxy_mode: Automatic proxy configuration URL
diff --git a/examples/051/structural_files/firefox/20-manual.yml b/examples/070/structural_files/firefox/20-manual.yml
similarity index 86%
rename from examples/051/structural_files/firefox/20-manual.yml
rename to examples/070/structural_files/firefox/20-manual.yml
index ae857ce..f1f87d9 100644
--- a/examples/051/structural_files/firefox/20-manual.yml
+++ b/examples/070/structural_files/firefox/20-manual.yml
@@ -9,7 +9,10 @@ manual:
   '{{ identifier }}_proxy':
     description: '{{ identifier }} Proxy'
     hidden:
-      variable: _.use_for_https
+      jinja: |-
+        {% if _.use_for_https %}
+          HTTPS is same has HTTP
+        {% endif %}
     dynamic:
       - HTTPS
       - SOCKS
diff --git a/examples/071/README.md b/examples/071/README.md
new file mode 100644
index 0000000..3723340
--- /dev/null
+++ b/examples/071/README.md
@@ -0,0 +1 @@
+Jinja with a description
diff --git a/examples/071/config/01/README.md b/examples/071/config/01/README.md
new file mode 100644
index 0000000..765a56e
--- /dev/null
+++ b/examples/071/config/01/README.md
@@ -0,0 +1,2 @@
+If "use_for_https" is false, HTTPS variables are visible in read only mode and in read write mode.
+
diff --git a/examples/071/config/01/config.yml b/examples/071/config/01/config.yml
new file mode 100644
index 0000000..84547fa
--- /dev/null
+++ b/examples/071/config/01/config.yml
@@ -0,0 +1,9 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: false
+  https_proxy:
+    address: https.proxy.net
diff --git a/examples/071/structural_files/firefox/20-manual.yml b/examples/071/structural_files/firefox/20-manual.yml
new file mode 100644
index 0000000..a298cb4
--- /dev/null
+++ b/examples/071/structural_files/firefox/20-manual.yml
@@ -0,0 +1,40 @@
+%YAML 1.2
+---
+version: 1.1
+
+manual:
+
+  use_for_https: true  # Also use this proxy for HTTPS
+
+  '{{ identifier }}_proxy':
+    description: '{{ identifier }} Proxy'
+    hidden:
+      jinja: |-
+        {% if _.use_for_https %}
+          HTTPS is same has HTTP
+        {% endif %}
+      description: in HTTPS case if "_.use_for_https" is set to "true"
+    dynamic:
+      - HTTPS
+      - SOCKS
+
+    address:
+      description: '{{ identifier }} address'
+      default:
+        variable: __.http_proxy.address
+
+    port:
+      description: '{{ identifier }} port'
+      default:
+        variable: __.http_proxy.port
+
+    version:
+      description: SOCKS host version used by proxy
+      choices:
+        - v4
+        - v5
+      default: v5
+      disabled:
+        type: identifier
+        when: HTTPS
+...
diff --git a/examples/062/README.md b/examples/072/README.md
similarity index 100%
rename from examples/062/README.md
rename to examples/072/README.md
diff --git a/examples/072/config/01/README.md b/examples/072/config/01/README.md
new file mode 100644
index 0000000..765a56e
--- /dev/null
+++ b/examples/072/config/01/README.md
@@ -0,0 +1,2 @@
+If "use_for_https" is false, HTTPS variables are visible in read only mode and in read write mode.
+
diff --git a/examples/072/config/01/config.yml b/examples/072/config/01/config.yml
new file mode 100644
index 0000000..84547fa
--- /dev/null
+++ b/examples/072/config/01/config.yml
@@ -0,0 +1,9 @@
+---
+proxy_mode: Manual proxy configuration
+manual:
+  http_proxy:
+    address: http.proxy.net
+    port: 3128
+  use_for_https: false
+  https_proxy:
+    address: https.proxy.net
diff --git a/examples/062/structural_files/firefox/20-manual.yml b/examples/072/structural_files/firefox/20-manual.yml
similarity index 100%
rename from examples/062/structural_files/firefox/20-manual.yml
rename to examples/072/structural_files/firefox/20-manual.yml
diff --git a/examples/080/README.md b/examples/080/README.md
index 1266a43..c17fb19 100644
--- a/examples/080/README.md
+++ b/examples/080/README.md
@@ -1 +1 @@
-A conditional disabled variable with type domainname and parameters
+A conditional disabled variable with type web_address
diff --git a/examples/085/TITLE.md b/examples/080/TITLE.md
similarity index 100%
rename from examples/085/TITLE.md
rename to examples/080/TITLE.md
diff --git a/examples/080/config/01/README.md b/examples/080/config/01/README.md
new file mode 100644
index 0000000..2e2d78a
--- /dev/null
+++ b/examples/080/config/01/README.md
@@ -0,0 +1 @@
+We cannot configure "auto" if "proxy_mode" is not "Automatic proxy configuration URL".
diff --git a/examples/080/config/01/config.yml b/examples/080/config/01/config.yml
index ed97d53..1edbe91 100644
--- a/examples/080/config/01/config.yml
+++ b/examples/080/config/01/config.yml
@@ -1 +1,2 @@
 ---
+auto: https://auto.proxy.net/wpad.dat
diff --git a/examples/080/config/02/config.yml b/examples/080/config/02/config.yml
index 54956ea..26df130 100644
--- a/examples/080/config/02/config.yml
+++ b/examples/080/config/02/config.yml
@@ -1,4 +1,2 @@
 ---
 proxy_mode: Automatic proxy configuration URL
-auto: https://auto.proxy.net/wpad.dat
-no_proxy: 192.168.1.0/24
diff --git a/examples/070/config/03/config.yml b/examples/080/config/03/config.yml
similarity index 100%
rename from examples/070/config/03/config.yml
rename to examples/080/config/03/config.yml
diff --git a/examples/080/firefox.png b/examples/080/firefox.png
deleted file mode 100644
index 16f5931..0000000
Binary files a/examples/080/firefox.png and /dev/null differ
diff --git a/examples/070/structural_files/firefox/30-auto.yml b/examples/080/structural_files/firefox/30-auto.yml
similarity index 100%
rename from examples/070/structural_files/firefox/30-auto.yml
rename to examples/080/structural_files/firefox/30-auto.yml
diff --git a/examples/081/README.md b/examples/081/README.md
deleted file mode 100644
index 130d225..0000000
--- a/examples/081/README.md
+++ /dev/null
@@ -1 +0,0 @@
-A variable with multiple value
diff --git a/examples/082/README.md b/examples/082/README.md
deleted file mode 100644
index d83ef1b..0000000
--- a/examples/082/README.md
+++ /dev/null
@@ -1 +0,0 @@
-A non mandatory variable
diff --git a/examples/082/config b/examples/082/config
deleted file mode 120000
index 51b7987..0000000
--- a/examples/082/config
+++ /dev/null
@@ -1 +0,0 @@
-../031/config
\ No newline at end of file
diff --git a/examples/083/README.md b/examples/083/README.md
deleted file mode 100644
index ad6b7fb..0000000
--- a/examples/083/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Examples
diff --git a/examples/083/TITLE.md b/examples/083/TITLE.md
deleted file mode 100644
index 7512a0c..0000000
--- a/examples/083/TITLE.md
+++ /dev/null
@@ -1 +0,0 @@
-Extras informations for a variable
diff --git a/examples/083/config b/examples/083/config
deleted file mode 120000
index 51b7987..0000000
--- a/examples/083/config
+++ /dev/null
@@ -1 +0,0 @@
-../031/config
\ No newline at end of file
diff --git a/examples/090/README.md b/examples/090/README.md
index 4207bc8..1266a43 100644
--- a/examples/090/README.md
+++ b/examples/090/README.md
@@ -1 +1 @@
-A boolean variable
+A conditional disabled variable with type domainname and parameters
diff --git a/examples/081/config/02/config.yml b/examples/090/config/02/config.yml
similarity index 66%
rename from examples/081/config/02/config.yml
rename to examples/090/config/02/config.yml
index ccba4c0..54956ea 100644
--- a/examples/081/config/02/config.yml
+++ b/examples/090/config/02/config.yml
@@ -1,6 +1,4 @@
 ---
 proxy_mode: Automatic proxy configuration URL
 auto: https://auto.proxy.net/wpad.dat
-no_proxy:
-  - example.net
-  - 192.168.1.0/24
+no_proxy: 192.168.1.0/24
diff --git a/examples/090/firefox.png b/examples/090/firefox.png
index d368003..16f5931 100644
Binary files a/examples/090/firefox.png and b/examples/090/firefox.png differ
diff --git a/examples/090/firefox.xcf b/examples/090/firefox.xcf
index c362607..5cc54d7 100644
Binary files a/examples/090/firefox.xcf and b/examples/090/firefox.xcf differ
diff --git a/examples/080/structural_files/firefox/40-no_proxy.yml b/examples/090/structural_files/firefox/40-no_proxy.yml
similarity index 100%
rename from examples/080/structural_files/firefox/40-no_proxy.yml
rename to examples/090/structural_files/firefox/40-no_proxy.yml
diff --git a/examples/091/README.md b/examples/091/README.md
index 9215d09..130d225 100644
--- a/examples/091/README.md
+++ b/examples/091/README.md
@@ -1 +1 @@
-A choice variable
+A variable with multiple value
diff --git a/examples/081/TITLE.md b/examples/091/TITLE.md
similarity index 100%
rename from examples/081/TITLE.md
rename to examples/091/TITLE.md
diff --git a/examples/091/config/02/config.yml b/examples/091/config/02/config.yml
index aee4796..ccba4c0 100644
--- a/examples/091/config/02/config.yml
+++ b/examples/091/config/02/config.yml
@@ -1,3 +1,6 @@
 ---
-dns_over_https:
-  enable_dns_over_https: true
+proxy_mode: Automatic proxy configuration URL
+auto: https://auto.proxy.net/wpad.dat
+no_proxy:
+  - example.net
+  - 192.168.1.0/24
diff --git a/examples/081/config/03/config.yml b/examples/091/config/03/config.yml
similarity index 100%
rename from examples/081/config/03/config.yml
rename to examples/091/config/03/config.yml
diff --git a/examples/081/structural_files/firefox/40-no_proxy.yml b/examples/091/structural_files/firefox/40-no_proxy.yml
similarity index 100%
rename from examples/081/structural_files/firefox/40-no_proxy.yml
rename to examples/091/structural_files/firefox/40-no_proxy.yml
diff --git a/examples/092/README.md b/examples/092/README.md
index 972da98..d83ef1b 100644
--- a/examples/092/README.md
+++ b/examples/092/README.md
@@ -1 +1 @@
-A web_address variable 
+A non mandatory variable
diff --git a/examples/082/TITLE.md b/examples/092/TITLE.md
similarity index 100%
rename from examples/082/TITLE.md
rename to examples/092/TITLE.md
diff --git a/examples/092/config/02/config.yml b/examples/092/config/02/config.yml
index aee4796..ccba4c0 100644
--- a/examples/092/config/02/config.yml
+++ b/examples/092/config/02/config.yml
@@ -1,3 +1,6 @@
 ---
-dns_over_https:
-  enable_dns_over_https: true
+proxy_mode: Automatic proxy configuration URL
+auto: https://auto.proxy.net/wpad.dat
+no_proxy:
+  - example.net
+  - 192.168.1.0/24
diff --git a/examples/092/config/03/config.yml b/examples/092/config/03/config.yml
index 2497fc1..307e175 100644
--- a/examples/092/config/03/config.yml
+++ b/examples/092/config/03/config.yml
@@ -1,5 +1,3 @@
 ---
-dns_over_https:
-  enable_dns_over_https: true
-  provider: Custom
-  custom_dns_url: http://dns.net
+proxy_mode: Automatic proxy configuration URL
+auto: https://auto.proxy.net/wpad.dat
diff --git a/examples/082/structural_files/firefox/40-no_proxy.yml b/examples/092/structural_files/firefox/40-no_proxy.yml
similarity index 100%
rename from examples/082/structural_files/firefox/40-no_proxy.yml
rename to examples/092/structural_files/firefox/40-no_proxy.yml
diff --git a/examples/093/README.md b/examples/093/README.md
index c11c818..ad6b7fb 100644
--- a/examples/093/README.md
+++ b/examples/093/README.md
@@ -1 +1 @@
-A variable with custom validation
+Examples
diff --git a/examples/093/TITLE.md b/examples/093/TITLE.md
index 11c2e41..7512a0c 100644
--- a/examples/093/TITLE.md
+++ b/examples/093/TITLE.md
@@ -1 +1 @@
-Validators
+Extras informations for a variable
diff --git a/examples/093/config/02/config.yml b/examples/093/config/02/config.yml
index aee4796..ccba4c0 100644
--- a/examples/093/config/02/config.yml
+++ b/examples/093/config/02/config.yml
@@ -1,3 +1,6 @@
 ---
-dns_over_https:
-  enable_dns_over_https: true
+proxy_mode: Automatic proxy configuration URL
+auto: https://auto.proxy.net/wpad.dat
+no_proxy:
+  - example.net
+  - 192.168.1.0/24
diff --git a/examples/093/config/03/config.yml b/examples/093/config/03/config.yml
index 2497fc1..307e175 100644
--- a/examples/093/config/03/config.yml
+++ b/examples/093/config/03/config.yml
@@ -1,5 +1,3 @@
 ---
-dns_over_https:
-  enable_dns_over_https: true
-  provider: Custom
-  custom_dns_url: http://dns.net
+proxy_mode: Automatic proxy configuration URL
+auto: https://auto.proxy.net/wpad.dat
diff --git a/examples/083/structural_files/firefox/40-no_proxy.yml b/examples/093/structural_files/firefox/40-no_proxy.yml
similarity index 100%
rename from examples/083/structural_files/firefox/40-no_proxy.yml
rename to examples/093/structural_files/firefox/40-no_proxy.yml
diff --git a/examples/084/README.md b/examples/094/README.md
similarity index 100%
rename from examples/084/README.md
rename to examples/094/README.md
diff --git a/examples/081/config/01/config.yml b/examples/094/config/01/config.yml
similarity index 100%
rename from examples/081/config/01/config.yml
rename to examples/094/config/01/config.yml
diff --git a/examples/084/config/02/config.yml b/examples/094/config/02/config.yml
similarity index 100%
rename from examples/084/config/02/config.yml
rename to examples/094/config/02/config.yml
diff --git a/examples/084/config/03/config.yml b/examples/094/config/03/config.yml
similarity index 100%
rename from examples/084/config/03/config.yml
rename to examples/094/config/03/config.yml
diff --git a/examples/084/structural_files/firefox/40-no_proxy.yml b/examples/094/structural_files/firefox/40-no_proxy.yml
similarity index 100%
rename from examples/084/structural_files/firefox/40-no_proxy.yml
rename to examples/094/structural_files/firefox/40-no_proxy.yml
diff --git a/examples/085/README.md b/examples/095/README.md
similarity index 100%
rename from examples/085/README.md
rename to examples/095/README.md
diff --git a/examples/090/TITLE.md b/examples/095/TITLE.md
similarity index 100%
rename from examples/090/TITLE.md
rename to examples/095/TITLE.md
diff --git a/examples/084/config/01/config.yml b/examples/095/config/01/config.yml
similarity index 100%
rename from examples/084/config/01/config.yml
rename to examples/095/config/01/config.yml
diff --git a/examples/085/config/02/config.yml b/examples/095/config/02/config.yml
similarity index 100%
rename from examples/085/config/02/config.yml
rename to examples/095/config/02/config.yml
diff --git a/examples/085/config/03/config.yml b/examples/095/config/03/config.yml
similarity index 100%
rename from examples/085/config/03/config.yml
rename to examples/095/config/03/config.yml
diff --git a/examples/085/config/04/config.yml b/examples/095/config/04/config.yml
similarity index 100%
rename from examples/085/config/04/config.yml
rename to examples/095/config/04/config.yml
diff --git a/examples/085/firefox.png b/examples/095/firefox.png
similarity index 100%
rename from examples/085/firefox.png
rename to examples/095/firefox.png
diff --git a/examples/085/firefox.xcf b/examples/095/firefox.xcf
similarity index 100%
rename from examples/085/firefox.xcf
rename to examples/095/firefox.xcf
diff --git a/examples/085/structural_files/firefox/50-prompt_authentication.yml b/examples/095/structural_files/firefox/50-prompt_authentication.yml
similarity index 100%
rename from examples/085/structural_files/firefox/50-prompt_authentication.yml
rename to examples/095/structural_files/firefox/50-prompt_authentication.yml
diff --git a/examples/086/README.md b/examples/096/README.md
similarity index 100%
rename from examples/086/README.md
rename to examples/096/README.md
diff --git a/examples/085/config/01/config.yml b/examples/096/config/01/config.yml
similarity index 100%
rename from examples/085/config/01/config.yml
rename to examples/096/config/01/config.yml
diff --git a/examples/086/config/02/config.yml b/examples/096/config/02/config.yml
similarity index 100%
rename from examples/086/config/02/config.yml
rename to examples/096/config/02/config.yml
diff --git a/examples/086/config/03/config.yml b/examples/096/config/03/config.yml
similarity index 100%
rename from examples/086/config/03/config.yml
rename to examples/096/config/03/config.yml
diff --git a/examples/086/config/04/config.yml b/examples/096/config/04/config.yml
similarity index 100%
rename from examples/086/config/04/config.yml
rename to examples/096/config/04/config.yml
diff --git a/examples/086/structural_files/firefox/55-proxy_dns_socks5.yml b/examples/096/structural_files/firefox/55-proxy_dns_socks5.yml
similarity index 100%
rename from examples/086/structural_files/firefox/55-proxy_dns_socks5.yml
rename to examples/096/structural_files/firefox/55-proxy_dns_socks5.yml
diff --git a/examples/087/README.md b/examples/097/README.md
similarity index 100%
rename from examples/087/README.md
rename to examples/097/README.md
diff --git a/examples/086/config/01/config.yml b/examples/097/config/01/config.yml
similarity index 100%
rename from examples/086/config/01/config.yml
rename to examples/097/config/01/config.yml
diff --git a/examples/087/config/02/config.yml b/examples/097/config/02/config.yml
similarity index 100%
rename from examples/087/config/02/config.yml
rename to examples/097/config/02/config.yml
diff --git a/examples/087/config/03/config.yml b/examples/097/config/03/config.yml
similarity index 100%
rename from examples/087/config/03/config.yml
rename to examples/097/config/03/config.yml
diff --git a/examples/087/config/04/config.yml b/examples/097/config/04/config.yml
similarity index 100%
rename from examples/087/config/04/config.yml
rename to examples/097/config/04/config.yml
diff --git a/examples/087/structural_files/firefox/55-proxy_dns_socks5.yml b/examples/097/structural_files/firefox/55-proxy_dns_socks5.yml
similarity index 100%
rename from examples/087/structural_files/firefox/55-proxy_dns_socks5.yml
rename to examples/097/structural_files/firefox/55-proxy_dns_socks5.yml
diff --git a/examples/088/README.md b/examples/098/README.md
similarity index 100%
rename from examples/088/README.md
rename to examples/098/README.md
diff --git a/examples/088/TITLE.md b/examples/098/TITLE.md
similarity index 100%
rename from examples/088/TITLE.md
rename to examples/098/TITLE.md
diff --git a/examples/087/config/01/config.yml b/examples/098/config/01/config.yml
similarity index 100%
rename from examples/087/config/01/config.yml
rename to examples/098/config/01/config.yml
diff --git a/examples/088/config/02/config.yml b/examples/098/config/02/config.yml
similarity index 100%
rename from examples/088/config/02/config.yml
rename to examples/098/config/02/config.yml
diff --git a/examples/088/config/03/config.yml b/examples/098/config/03/config.yml
similarity index 100%
rename from examples/088/config/03/config.yml
rename to examples/098/config/03/config.yml
diff --git a/examples/088/config/04/config.yml b/examples/098/config/04/config.yml
similarity index 100%
rename from examples/088/config/04/config.yml
rename to examples/098/config/04/config.yml
diff --git a/examples/100/structural_files/firefox/empty b/examples/098/config/mode
similarity index 100%
rename from examples/100/structural_files/firefox/empty
rename to examples/098/config/mode
diff --git a/examples/088/structural_files/firefox/55-proxy_dns_socks5.yml b/examples/098/structural_files/firefox/55-proxy_dns_socks5.yml
similarity index 100%
rename from examples/088/structural_files/firefox/55-proxy_dns_socks5.yml
rename to examples/098/structural_files/firefox/55-proxy_dns_socks5.yml
diff --git a/examples/100/README.md b/examples/100/README.md
index 86ff802..4207bc8 100644
--- a/examples/100/README.md
+++ b/examples/100/README.md
@@ -1 +1 @@
-Namespace
+A boolean variable
diff --git a/examples/100/TITLE.md b/examples/100/TITLE.md
index 86ff802..f8bc264 100644
--- a/examples/100/TITLE.md
+++ b/examples/100/TITLE.md
@@ -1 +1 @@
-Namespace
+Various variables
diff --git a/examples/088/config/01/config.yml b/examples/100/config/01/config.yml
similarity index 100%
rename from examples/088/config/01/config.yml
rename to examples/100/config/01/config.yml
diff --git a/examples/100/firefox.png b/examples/100/firefox.png
new file mode 100644
index 0000000..d368003
Binary files /dev/null and b/examples/100/firefox.png differ
diff --git a/examples/080/firefox.xcf b/examples/100/firefox.xcf
similarity index 74%
rename from examples/080/firefox.xcf
rename to examples/100/firefox.xcf
index 5cc54d7..c362607 100644
Binary files a/examples/080/firefox.xcf and b/examples/100/firefox.xcf differ
diff --git a/examples/090/structural_files/firefox/60-dns_over_https.yml b/examples/100/structural_files/firefox/60-dns_over_https.yml
similarity index 100%
rename from examples/090/structural_files/firefox/60-dns_over_https.yml
rename to examples/100/structural_files/firefox/60-dns_over_https.yml
diff --git a/examples/101/README.md b/examples/101/README.md
index d6459e0..9215d09 100644
--- a/examples/101/README.md
+++ b/examples/101/README.md
@@ -1 +1 @@
-xxx
+A choice variable
diff --git a/examples/101/config b/examples/101/config
deleted file mode 120000
index 52cae7a..0000000
--- a/examples/101/config
+++ /dev/null
@@ -1 +0,0 @@
-../100/config
\ No newline at end of file
diff --git a/examples/101/100/config/01/config.yml b/examples/101/config/01/config.yml
similarity index 100%
rename from examples/101/100/config/01/config.yml
rename to examples/101/config/01/config.yml
diff --git a/examples/101/config/02/config.yml b/examples/101/config/02/config.yml
new file mode 100644
index 0000000..aee4796
--- /dev/null
+++ b/examples/101/config/02/config.yml
@@ -0,0 +1,3 @@
+---
+dns_over_https:
+  enable_dns_over_https: true
diff --git a/examples/091/structural_files/firefox/60-dns_over_https.yml b/examples/101/structural_files/firefox/60-dns_over_https.yml
similarity index 100%
rename from examples/091/structural_files/firefox/60-dns_over_https.yml
rename to examples/101/structural_files/firefox/60-dns_over_https.yml
diff --git a/examples/102/README.md b/examples/102/README.md
new file mode 100644
index 0000000..972da98
--- /dev/null
+++ b/examples/102/README.md
@@ -0,0 +1 @@
+A web_address variable 
diff --git a/examples/102/config/01/config.yml b/examples/102/config/01/config.yml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/examples/102/config/01/config.yml
@@ -0,0 +1 @@
+---
diff --git a/examples/102/config/02/config.yml b/examples/102/config/02/config.yml
new file mode 100644
index 0000000..aee4796
--- /dev/null
+++ b/examples/102/config/02/config.yml
@@ -0,0 +1,3 @@
+---
+dns_over_https:
+  enable_dns_over_https: true
diff --git a/examples/102/config/03/config.yml b/examples/102/config/03/config.yml
new file mode 100644
index 0000000..2497fc1
--- /dev/null
+++ b/examples/102/config/03/config.yml
@@ -0,0 +1,5 @@
+---
+dns_over_https:
+  enable_dns_over_https: true
+  provider: Custom
+  custom_dns_url: http://dns.net
diff --git a/examples/092/config/04/config.yml b/examples/102/config/04/config.yml
similarity index 100%
rename from examples/092/config/04/config.yml
rename to examples/102/config/04/config.yml
diff --git a/examples/092/structural_files/firefox/60-dns_over_https.yml b/examples/102/structural_files/firefox/60-dns_over_https.yml
similarity index 100%
rename from examples/092/structural_files/firefox/60-dns_over_https.yml
rename to examples/102/structural_files/firefox/60-dns_over_https.yml
diff --git a/examples/103/README.md b/examples/103/README.md
index d6459e0..c11c818 100644
--- a/examples/103/README.md
+++ b/examples/103/README.md
@@ -1 +1 @@
-xxx
+A variable with custom validation
diff --git a/examples/103/TITLE.md b/examples/103/TITLE.md
new file mode 100644
index 0000000..11c2e41
--- /dev/null
+++ b/examples/103/TITLE.md
@@ -0,0 +1 @@
+Validators
diff --git a/examples/103/config b/examples/103/config
deleted file mode 120000
index 52cae7a..0000000
--- a/examples/103/config
+++ /dev/null
@@ -1 +0,0 @@
-../100/config
\ No newline at end of file
diff --git a/examples/103/config/01/config.yml b/examples/103/config/01/config.yml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/examples/103/config/01/config.yml
@@ -0,0 +1 @@
+---
diff --git a/examples/103/config/02/config.yml b/examples/103/config/02/config.yml
new file mode 100644
index 0000000..aee4796
--- /dev/null
+++ b/examples/103/config/02/config.yml
@@ -0,0 +1,3 @@
+---
+dns_over_https:
+  enable_dns_over_https: true
diff --git a/examples/103/config/03/config.yml b/examples/103/config/03/config.yml
new file mode 100644
index 0000000..2497fc1
--- /dev/null
+++ b/examples/103/config/03/config.yml
@@ -0,0 +1,5 @@
+---
+dns_over_https:
+  enable_dns_over_https: true
+  provider: Custom
+  custom_dns_url: http://dns.net
diff --git a/examples/093/config/04/config.yml b/examples/103/config/04/config.yml
similarity index 100%
rename from examples/093/config/04/config.yml
rename to examples/103/config/04/config.yml
diff --git a/examples/093/structural_files/firefox/60-dns_over_https.yml b/examples/103/structural_files/firefox/60-dns_over_https.yml
similarity index 100%
rename from examples/093/structural_files/firefox/60-dns_over_https.yml
rename to examples/103/structural_files/firefox/60-dns_over_https.yml
diff --git a/examples/104/config b/examples/104/config
deleted file mode 120000
index 52cae7a..0000000
--- a/examples/104/config
+++ /dev/null
@@ -1 +0,0 @@
-../100/config
\ No newline at end of file
diff --git a/examples/105/config b/examples/105/config
deleted file mode 120000
index 52cae7a..0000000
--- a/examples/105/config
+++ /dev/null
@@ -1 +0,0 @@
-../100/config
\ No newline at end of file
diff --git a/examples/110/README.md b/examples/110/README.md
index d6459e0..86ff802 100644
--- a/examples/110/README.md
+++ b/examples/110/README.md
@@ -1 +1 @@
-xxx
+Namespace
diff --git a/examples/110/TITLE.md b/examples/110/TITLE.md
new file mode 100644
index 0000000..86ff802
--- /dev/null
+++ b/examples/110/TITLE.md
@@ -0,0 +1 @@
+Namespace
diff --git a/examples/110/namespace b/examples/110/namespace
new file mode 100644
index 0000000..e69de29
diff --git a/examples/110/structural_files/firefox/empty b/examples/110/structural_files/firefox/empty
new file mode 100644
index 0000000..e69de29
diff --git a/examples/100/structural_files/firefox/empty.yml b/examples/110/structural_files/firefox/empty.yml
similarity index 100%
rename from examples/100/structural_files/firefox/empty.yml
rename to examples/110/structural_files/firefox/empty.yml
diff --git a/examples/101/100/README.md b/examples/111/100/README.md
similarity index 100%
rename from examples/101/100/README.md
rename to examples/111/100/README.md
diff --git a/examples/111/100/config/01/config.yml b/examples/111/100/config/01/config.yml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/examples/111/100/config/01/config.yml
@@ -0,0 +1 @@
+---
diff --git a/examples/101/100/config/02/config.yml b/examples/111/100/config/02/config.yml
similarity index 100%
rename from examples/101/100/config/02/config.yml
rename to examples/111/100/config/02/config.yml
diff --git a/examples/101/100/config/03/config.yml b/examples/111/100/config/03/config.yml
similarity index 100%
rename from examples/101/100/config/03/config.yml
rename to examples/111/100/config/03/config.yml
diff --git a/examples/101/100/structural_files/foxyproxy/00-foxyproxy.yml b/examples/111/100/structural_files/foxyproxy/00-foxyproxy.yml
similarity index 100%
rename from examples/101/100/structural_files/foxyproxy/00-foxyproxy.yml
rename to examples/111/100/structural_files/foxyproxy/00-foxyproxy.yml
diff --git a/examples/104/README.md b/examples/111/README.md
similarity index 100%
rename from examples/104/README.md
rename to examples/111/README.md
diff --git a/examples/111/config/01/config.yml b/examples/111/config/01/config.yml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/examples/111/config/01/config.yml
@@ -0,0 +1 @@
+---
diff --git a/examples/101/structural_files/foxyproxy/00-foxyproxy.yml b/examples/111/structural_files/foxyproxy/00-foxyproxy.yml
similarity index 100%
rename from examples/101/structural_files/foxyproxy/00-foxyproxy.yml
rename to examples/111/structural_files/foxyproxy/00-foxyproxy.yml
diff --git a/examples/105/README.md b/examples/112/README.md
similarity index 100%
rename from examples/105/README.md
rename to examples/112/README.md
diff --git a/examples/112/config/01/config.yml b/examples/112/config/01/config.yml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/examples/112/config/01/config.yml
@@ -0,0 +1 @@
+---
diff --git a/examples/103/structural_files/foxyproxy/00-foxyproxy.yml b/examples/112/structural_files/foxyproxy/00-foxyproxy.yml
similarity index 100%
rename from examples/103/structural_files/foxyproxy/00-foxyproxy.yml
rename to examples/112/structural_files/foxyproxy/00-foxyproxy.yml
diff --git a/examples/113/README.md b/examples/113/README.md
new file mode 100644
index 0000000..d6459e0
--- /dev/null
+++ b/examples/113/README.md
@@ -0,0 +1 @@
+xxx
diff --git a/examples/113/config/01/config.yml b/examples/113/config/01/config.yml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/examples/113/config/01/config.yml
@@ -0,0 +1 @@
+---
diff --git a/examples/104/structural_files/foxyproxy/00-foxyproxy.yml b/examples/113/structural_files/foxyproxy/00-foxyproxy.yml
similarity index 100%
rename from examples/104/structural_files/foxyproxy/00-foxyproxy.yml
rename to examples/113/structural_files/foxyproxy/00-foxyproxy.yml
diff --git a/examples/114/README.md b/examples/114/README.md
new file mode 100644
index 0000000..d6459e0
--- /dev/null
+++ b/examples/114/README.md
@@ -0,0 +1 @@
+xxx
diff --git a/examples/114/config/01/config.yml b/examples/114/config/01/config.yml
new file mode 100644
index 0000000..ed97d53
--- /dev/null
+++ b/examples/114/config/01/config.yml
@@ -0,0 +1 @@
+---
diff --git a/examples/105/structural_files/foxyproxy/00-foxyproxy.yml b/examples/114/structural_files/foxyproxy/00-foxyproxy.yml
similarity index 100%
rename from examples/105/structural_files/foxyproxy/00-foxyproxy.yml
rename to examples/114/structural_files/foxyproxy/00-foxyproxy.yml
diff --git a/examples/120/README.md b/examples/120/README.md
new file mode 100644
index 0000000..d6459e0
--- /dev/null
+++ b/examples/120/README.md
@@ -0,0 +1 @@
+xxx
diff --git a/examples/110/structural_files/foxyproxy/10-redefine.yml b/examples/120/structural_files/foxyproxy/10-redefine.yml
similarity index 100%
rename from examples/110/structural_files/foxyproxy/10-redefine.yml
rename to examples/120/structural_files/foxyproxy/10-redefine.yml