diff --git a/source/content/glossar/bibliothek/dcat-ap-ch.rst b/source/content/glossar/bibliothek/dcat-ap-ch.rst
index 97e1a9ff..0db65490 100644
--- a/source/content/glossar/bibliothek/dcat-ap-ch.rst
+++ b/source/content/glossar/bibliothek/dcat-ap-ch.rst
@@ -209,7 +209,7 @@ Translatable elements are marked as such under usage notes.
 
     * - property
       - URI
-      - usage notes
+      - usage notes 
     * - :ref:`dataset <dcat-catalog-dataset>`
       - dcat:dataset
       - **mandatory**
@@ -246,9 +246,9 @@ Translatable elements are marked as such under usage notes.
     * - :ref:`modified <dcat-dataset-modified>`
       - dct:modified
       - conditional
-    * - :ref:`theme <dcat-dataset-theme>`
+    * - :fa:`exclamation` :ref:`theme <dcat-dataset-theme>`
       - dcat:theme
-      - conditional
+      - conditional, :fa:`exclamation` new vocabulary to use
     * - :fa:`exclamation` :ref:`landing page <dcat-dataset-landing-page>`
       - dcat:landingPage
       - conditional,  :fa:`exclamation` import format changed
@@ -272,10 +272,16 @@ Translatable elements are marked as such under usage notes.
       - optional, :fa:`exclamation` import format changed
     * - :ref:`related resource <dcat-dataset-relation>`
       - dct:relation
-      - optional
-    * - :ref:`see also <dcat-dataset-see-also>`
-      - rdfs:seeAlso
-      - optional
+      - :fa:`exclamation` optional, **mandatory** for federal level, the legal basis must be indicated here
+    * - :fa:`exclamation` :ref:`qualifiedRelation <dcat-dataset-qualified-relation>`
+      - dcat:qualifiedRelation
+      - optional :fa:`exclamation` replaces the property rdfs:seeAlso
+    * - :fa:`exclamation` :ref:`documentation <dcat-dataset-documentation>`
+      - foaf:page
+      - optional, :fa:`exclamation` new property
+    * - :fa:`exclamation` :ref:`conforms to <dcat-dataset-conforms-to>`
+      - dct:conformsTo
+      - optional, :fa:`exclamation` new property
 
 
 .. list-table:: Properties of dcat:Distribution
@@ -292,9 +298,9 @@ Translatable elements are marked as such under usage notes.
     * - :ref:`access url <dcat-distribution-access-url>`
       - dcat:accessURL
       - **mandatory**
-    * - :ref:`rights <dcat-distribution-rights>`
-      - dct:rights
-      - **mandatory**
+    * - :fa:`exclamation` :ref:`license <dcat-distribution-license>`
+      - dct:license
+      - **mandatory**, replaces dct:rights
     * - :ref:`title <dcat-distribution-title>`
       - dct:title
       - conditional, multilingual
@@ -305,20 +311,20 @@ Translatable elements are marked as such under usage notes.
       - dct:byteSize
       - conditional
     * - :ref:`media type <dcat-distribution-media-type>`
-      - dct:mediaType
+      - dcat:mediaType
       - conditional
-    * - :ref:`format <dcat-distribution-format>`
+    * - :fa:`exclamation` :ref:`format <dcat-distribution-format>`
       - dct:format
-      - conditional
+      - conditional, :fa:`exclamation` use a Controlled Vocabulary (CV)
+    * - :fa:`exclamation` :ref:`rights <dcat-distribution-rights>`
+      - dct:rights
+      - optional, :fa:`exclamation` for exceptional use only
     * - :ref:`language <dcat-distribution-language>`
       - dct:language
       - conditional
     * - :ref:`modified <dcat-distribution-modified>`
       - dct:modified
       - conditional
-    * - :ref:`license <dcat-distribution-license>`
-      - dcat:license
-      - optional
     * - :ref:`identifier <dcat-distribution-identifier>`
       - dct:identifier
       - optional
@@ -328,6 +334,9 @@ Translatable elements are marked as such under usage notes.
     * - :ref:`coverage <dcat-distribution-coverage>`
       - dct:coverage
       - optional
+    * - :fa:`exclamation` :ref:`documentation <dcat-distribution-documentation>`
+      - foaf:page
+      - optional, :fa:`exclamation` new property
 
 .. _dcat-ap-ch-catalog:
 
@@ -577,6 +586,16 @@ dcat:theme (DCAT)
 
     .. include:: dcat-examples/dataset-theme-rdf.rst
 
+.. toggle-header::
+    :header: Deprecated: Property ``dcat:theme`` of ``dcat:Dataset`` in Turtle
+
+    .. include:: dcat-examples/deprecated/dataset-theme-ttl.rst
+
+.. toggle-header::
+    :header: Deprecated: Property ``dcat:theme`` of ``dcat:Dataset`` in Rdf/xml
+
+    .. include:: dcat-examples/deprecated/dataset-theme-rdf.rst
+
 .. _dcat-dataset-language:
 
 dct:language (DCAT)
@@ -645,6 +664,44 @@ dct:relation (DCAT)
 
     .. include:: dcat-examples/dataset-relation-rdf.rst
 
+.. _dcat-dataset-documentation:
+
+foaf:page (DCAT)
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. container:: Mapping
+
+    .. include:: dcat-definitions/dataset-documentation.rst
+
+.. toggle-header::
+    :header: Property ``foaf:page`` of ``dcat:Dataset`` in Turtle
+
+    .. include:: dcat-examples/dataset-documentation-ttl.rst
+
+.. toggle-header::
+    :header: Property ``foaf:page`` of ``dcat:Dataset`` in Rdf/xml
+
+    .. include:: dcat-examples/dataset-documentation-rdf.rst
+        
+.. _dcat-dataset-conforms-to:
+
+dct:conformsTo (DCAT)
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. container:: Mapping
+
+    .. include:: dcat-definitions/dataset-conforms-to.rst
+
+.. toggle-header::
+    :header: Property ``dct:conformsTo`` of ``dcat:Dataset`` in Turtle
+
+    .. include:: dcat-examples/dataset-conforms-to-ttl.rst
+
+.. toggle-header::
+    :header: Property ``dct:conformsTo`` of ``dcat:Dataset`` in Rdf/xml
+
+    .. include:: dcat-examples/dataset-conforms-to-rdf.rst
+        
 .. _dcat-dataset-keyword:
 
 dcat:keyword (DCAT)
@@ -750,24 +807,34 @@ dct:accrual-periodicity (DCAT)
 
     .. include:: dcat-examples/deprecated/dataset-accrual-periodicity-rdf.rst
 
-.. _dcat-dataset-see-also:
+.. _dcat-dataset-qualified-relation:
 
-dcat:seeAlso (DCAT)
+dcat:qualifiedRelation (DCAT)
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. container:: Mapping
 
-   .. include:: dcat-definitions/dataset-see-also.rst
+   .. include:: dcat-definitions/dataset-qualified-relation.rst
 
 .. toggle-header::
-    :header: Property ``rdfs:seeAlso`` of ``dcat:Dataset`` in Turtle
+    :header: :fa:`exclamation` Property ``dcat:qualifiedRelation`` of ``dcat:Dataset`` in Turtle
 
-    .. include:: dcat-examples/dataset-see-also-ttl.rst
+    .. include:: dcat-examples/dataset-qualified-relation-ttl.rst
 
 .. toggle-header::
-    :header: Property ``rdfs:seeAlso`` of ``dcat:Dataset`` in Rdf/xml
+    :header: :fa:`exclamation` Property ``dcat:qualifiedRelation`` of ``dcat:Dataset`` in Rdf/xml
 
-    .. include:: dcat-examples/dataset-see-also-rdf.rst
+    .. include:: dcat-examples/dataset-qualified-relation-rdf.rst
+
+.. toggle-header::
+    :header: Deprecated: Property ``rdfs:seeAlso`` of ``dcat:Dataset`` in Turtle
+
+    .. include:: dcat-examples//deprecated/dataset-see-also-ttl.rst
+
+.. toggle-header::
+    :header: Deprecated: Property ``rdfs:seeAlso`` of ``dcat:Dataset`` in Rdf/xml
+
+    .. include:: dcat-examples//deprecated/dataset-see-also-rdf.rst
 
 .. _dcat-ap-ch-distribution:
 
@@ -872,7 +939,7 @@ dct:rights (DCAT)
 
 .. _dcat-distribution-media-type:
 
-dct:mediaType (DCAT)
+dcat:mediaType (DCAT)
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. container:: Mapping
@@ -1049,3 +1116,32 @@ dct:license (DCAT)
 .. container:: Mapping
 
    .. include:: dcat-definitions/distribution-license.rst
+
+.. toggle-header::
+    :header: Property ``dct:license`` of ``dcat:Distribution`` in Turtle
+
+    .. include:: dcat-examples/distribution-license-ttl.rst
+
+.. toggle-header::
+    :header: Property ``dct:license`` of ``dcat:Distribution`` in Rdf/xml
+
+    .. include:: dcat-examples/distribution-license-rdf.rst
+
+.. _dcat-distribution-documentation:
+
+foaf:page (DCAT)
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. container:: Mapping
+
+    .. include:: dcat-definitions/distribution-documentation.rst
+
+.. toggle-header::
+    :header: Property ``foaf:page`` of ``dcat:Distribution`` in Turtle
+
+    .. include:: dcat-examples/distribution-documentation-ttl.rst
+
+.. toggle-header::
+    :header: Property ``foaf:page`` of ``dcat:Distribution`` in Rdf/xml
+
+    .. include:: dcat-examples/distribution-documentation-rdf.rst
diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-conforms-to.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-conforms-to.rst
new file mode 100644
index 00000000..d86a007b
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-conforms-to.rst
@@ -0,0 +1,7 @@
+:DCAT URI: dct:conformsTo
+:Domain: dcat:Dataset
+:Value: ``dct:Standard``
+:Requirement Level: Optional
+:Cardinality: 0..n
+:Description: This property refers to an implementing rule or other specification.
+:Usage Notes: This property SHOULD be used to indicate the model, schema, ontology, view or profile that this representation of a dataset conforms to. This is (generally) a complementary concern to the format or media-type.
diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst
new file mode 100644
index 00000000..cd85f963
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-documentation.rst
@@ -0,0 +1,7 @@
+:DCAT URI: foaf:page
+:Domain: dcat:Dataset
+:Value: ``foaf:Document``
+:Requirement Level: Optional
+:Cardinality: 0..n
+:Description: documentation
+:Usage Notes: This property refers to a page or document about this Dataset
diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-qualified-relation.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-qualified-relation.rst
new file mode 100644
index 00000000..05d07aae
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-qualified-relation.rst
@@ -0,0 +1,9 @@
+:DCAT URI: `dcat:qualifiedRelation <https://www.w3.org/TR/vocab-dcat/#Property:resource_qualified_relation>`__
+:Domain: dcat:Dataset
+:Value: `rdfs:Resource <https://www.w3.org/TR/vocab-dcat/#Class:Relationship>`__
+:Requirement Level: Optional
+:Cardinality: 0..n
+:Description: Link to related datasets on opendata.swiss.
+:Usage Notes: Contains the identifier of the related dataset. The perma link must be used: 
+            
+            ``https://ogdch-abnahme.clients.liip.ch/perma/adb280a9-381d-4fb3-ae43-b40ace826dc7@stadt-zurich"``
diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also copy.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also copy.rst
new file mode 100644
index 00000000..95cba734
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also copy.rst	
@@ -0,0 +1,10 @@
+:DCAT URI: dcat:qualifiedRelation
+:Domain: dcat:Dataset
+:Value: `rdfs:Resource <https://www.w3.org/TR/vocab-dcat/#Class:Relationship>`__
+:Requirement Level: Optional
+:Cardinality: 0..n
+:Description: Link to related datasets on opendata.swiss.
+:Usage Notes: Contains the identifier of the linked dataset. You have to used
+            the perma link for this: 
+            
+            ``https://ogdch-abnahme.clients.liip.ch/perma/adb280a9-381d-4fb3-ae43-b40ace826dc7@stadt-zurich"``
diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also.rst
deleted file mode 100644
index 99530c9b..00000000
--- a/source/content/glossar/bibliothek/dcat-definitions/dataset-see-also.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-:DCAT URI: rdfs:seeAlso
-:Domain: dcat:Dataset
-:Value: ``rdfs:Resource``
-:Requirement Level: optional
-:Cardinality: 0..n
-:Description: Link to related datasets.
-:Usage Notes: Contains the identifier of the linked dataset.
diff --git a/source/content/glossar/bibliothek/dcat-definitions/dataset-theme.rst b/source/content/glossar/bibliothek/dcat-definitions/dataset-theme.rst
index ba149c46..8c634614 100644
--- a/source/content/glossar/bibliothek/dcat-definitions/dataset-theme.rst
+++ b/source/content/glossar/bibliothek/dcat-definitions/dataset-theme.rst
@@ -1,7 +1,7 @@
 :DCAT URI: dcat:theme
 :Domain: dcat:Dataset
-:Value: DCAT-AP-CH has its own
-        `controlled vocabulary for the themes <https://dcat-ap.ch/vocabulary/themes>`__
+:Value: skos:Concept
 :Requirement Level: optional
 :Cardinality: 0..n
-:Description: Categories that match the topic of the dataset
+:Description: This property refers to a theme/category of the dataset. A dataset can be associated 
+        with multiple themes. CV to be used: `[VOCAB-EU-THEME] <https://publications.europa.eu/resource/authority/data-theme>`__
diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-documentation.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-documentation.rst
new file mode 100644
index 00000000..42b2fc83
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-documentation.rst
@@ -0,0 +1,7 @@
+:DCAT URI: foaf:page
+:Domain: dcat:Distribution
+:Value: ``foaf:Document``
+:Requirement Level: Optional
+:Cardinality: 0..n
+:Description: documentation
+:Usage Notes: This property refers to a page or document about this Distribution.
diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-format.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-format.rst
index e0278050..dbb9bf70 100644
--- a/source/content/glossar/bibliothek/dcat-definitions/distribution-format.rst
+++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-format.rst
@@ -1,8 +1,13 @@
 :DCAT URI: dct:format
 :Domain: dcat:Distribution
-:Value: ``dct:MediaTypeOrExtent`` http://www.iana.org/assignments/media-types/media-types.xhtml
-:Requirement Level: conditional, required if the distribution is accessible by a ``dcat:downloadURL``
+:Value: `dct:MediaTypeOrExtent <https://www.dublincore.org/specifications/dublin-core/dcmi-terms/#http://purl.org/dc/terms/MediaTypeOrExtent>`__
+:Requirement Level: Recommended, required if the distribution is accessible by a ``dcat:downloadURL``
 :Cardinality: 0..1
-:Description: Format of the distribution
-:Usage Notes: If neither the ``downloadURL`` nor the ``mediaType`` provide a
-              valid format, this value is used to display the format of the distribution.
+:Description: This property refers to the file format of the distribution
+:Usage Notes: CV to be used: [`VOCAB-EU-FILE-TYPE <https://dcat-ap.ch/releases/2.0/dcat-ap-ch.html#bib-vocab-eu-file-type>`__]
+            
+             If a format is not available:
+
+                #. media type [`IANA-MEDIA-TYPES <https://dcat-ap.ch/releases/2.0/dcat-ap-ch.html#bib-iana-media-types>`__] should be used
+            
+                #. if required, please contact `Geschäftsstelle OGD <mailto:opendata@bfs.admin.ch>`__.  
diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst
index 900c1062..545cd045 100644
--- a/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst
+++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-license.rst
@@ -1,7 +1,40 @@
-:DCAT URI: dct:license
+:DCAT URI: `dct:license <https://www.w3.org/TR/vocab-dcat/#Property:distribution_license>`__
 :Domain: dcat:Distribution
-:Value: ``dct:LicenseDocument``
-:Requirement Level: optional
-:Cardinality: 0..1
-:Description: Rights statement of this distribution. It relates to the ``dcat:accessURL``
-:Usage Notes: Not used, see ``dct:rights``. This field ensures compatibility to other metadata standards.
+:Value: `dct:LicenseDocument <https://www.dublincore.org/specifications/dublin-core/dcmi-terms/#LicenseDocument>`__
+:Requirement Level: Mandatory
+:Cardinality: 1..1
+:Description: The `rights statement / terms of use <https://opendata.swiss/de/terms-of-use>`__ indicates for what purpose and in what context
+              the data of a distribution can be used: for commercial or for non commercial purposes. 
+              Does it need to be referenced, when it is used? Must permission be obtained for commercial use. 
+              These conditions are included in the rights statements. See the list below for the exact values.
+
+:Usage Notes: Terms of use are no longer referenced under ``dct:rights``, but under ``dct:license``. 
+            
+            Exception: If other licenses, such as CC-licenses, are used for the dataset besides the terms of use, the 
+            terms of use are referenced under dct:rights. Only the terms of use are displayed on opendata.swiss. If other
+            licenses are included, they are passed on to the portal data.europa.eu.
+
+            CV to be used: `DCAT-AP CH license vocabulary <https://dcat-ap.ch/vocabulary/licenses/20210623.html>`__
+
+            This field ensures compatibility to other metadata standards such as DCAT-AP.
+
+.. code-block::
+    :caption: Values **acceptable** for opendata.swiss
+    :emphasize-lines: 1,2,3,4
+
+    NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired
+    NonCommercialAllowed-CommercialAllowed-ReferenceRequired
+    NonCommercialAllowed-CommercialWithPermission-ReferenceNotRequired
+    NonCommercialAllowed-CommercialWithPermission-ReferenceRequired
+
+.. code-block::
+    :caption: Values **not acceptable** for opendata.swiss
+
+    NonCommercialAllowed-CommercialNotAllowed-ReferenceNotRequired
+    NonCommercialAllowed-CommercialNotAllowed-ReferenceRequired
+    NonCommercialNotAllowed-CommercialNotAllowed-ReferenceNotRequired
+    NonCommercialNotAllowed-CommercialNotAllowed-ReferenceRequired
+    NonCommercialNotAllowed-CommercialAllowed-ReferenceNotRequired
+    NonCommercialNotAllowed-CommercialAllowed-ReferenceRequired
+    NonCommercialNotAllowed-CommercialWithPermission-ReferenceNotRequired
+    NonCommercialNotAllowed-CommercialWithPermission-ReferenceRequired
diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-media-type.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-media-type.rst
index 22ea74d4..80697123 100644
--- a/source/content/glossar/bibliothek/dcat-definitions/distribution-media-type.rst
+++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-media-type.rst
@@ -1,6 +1,6 @@
-:DCAT URI: dct:mediaType
+:DCAT URI: dcat:mediaType
 :Domain: dcat:Distribution
-:Value: `dct:MediaTypeOrExtent`` must be a MIME type of http://www.iana.org/assignments/media-types/media-types.xhtml
+:Value: ``dct:MediaType`` must be a MIME type of `[IANA-MEDIA-TYPES] <http://www.iana.org/assignments/media-types/media-types.xhtml>`_
 :Requirement Level: conditional, required if the distribution is  a file accessible by a ``dcat:downloadURL``
 :Cardinality: 0..1
 :Description: Resource format of the data provided by the ``dcat:downloadURL``
diff --git a/source/content/glossar/bibliothek/dcat-definitions/distribution-rights.rst b/source/content/glossar/bibliothek/dcat-definitions/distribution-rights.rst
index bde3914b..28c8cfdb 100644
--- a/source/content/glossar/bibliothek/dcat-definitions/distribution-rights.rst
+++ b/source/content/glossar/bibliothek/dcat-definitions/distribution-rights.rst
@@ -1,17 +1,15 @@
 :DCAT URI: dct:rights
 :Domain: dcat:Distribution
 :Value: ``rdfs:Literal`` http://www.w3.org/TR/rdf-schema/#ch_literal
-:Requirement Level: mandatory
-:Cardinality: 1..1
-:Description: Rights statement that is relevant for the dcat:accessURL of this distribution.
-:Usage Notes: The `rights statement / terms of use <https://opendata.swiss/de/terms-of-use>`__ declares for which purpose and in which context
-              the data of a distribution can be used: for commercial purposes or only for
-              non commercial purposes. Does it need to be referenced, when it is used? These
-              conditions are all captured in the right statements. For the exact values,
-              see the list below.
+:Requirement Level: Recommended
+:Description: This property refers to a statement that specifies rights associated with the Distribution. Only used in exceptional cases (see usage notes below).
+:Usage notes: Imporant: The property `dct:license <https://handbook.opendata.swiss/de/content/glossar/bibliothek/dcat-ap-ch.html#dct-license-dcat>`__ with the values accepted for opendata.swiss is now 
+            requiered for the `terms of use <https://opendata.swiss/de/terms-of-use>`__. 
+            Exception: If someone uses datasets with CC-licenses in their catalogue, these can be kept under
+            dct:license, but in this case the terms of use must be entered under dct:rights. 
 
 .. code-block::
-    :caption: Values acceptable for opendata.swiss
+    :caption: Values **acceptable** for opendata.swiss
     :emphasize-lines: 1,2,3,4
 
     NonCommercialAllowed-CommercialAllowed-ReferenceNotRequired
@@ -20,7 +18,7 @@
     NonCommercialAllowed-CommercialWithPermission-ReferenceRequired
 
 .. code-block::
-    :caption: Values not acceptable for opendata.swiss
+    :caption: Values **not acceptable** for opendata.swiss
 
     NonCommercialAllowed-CommercialNotAllowed-ReferenceNotRequired
     NonCommercialAllowed-CommercialNotAllowed-ReferenceRequired
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-rdf.rst
new file mode 100644
index 00000000..a3872162
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-rdf.rst
@@ -0,0 +1,13 @@
+.. code-block:: xml
+    :emphasize-lines: 7
+
+    <?xml version="1.0" encoding="utf-8" ?>
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+             xmlns:dcat="http://www.w3.org/ns/dcat#"
+             xmlns:dct="http://purl.org/dc/terms/">
+
+      <dcat:Dataset rdf:about="https://fr.ch/strassenverkehr">
+        <dct:conformsTo rdf:resource="http://models.geo.admin.ch/ASTRA"/>    
+      </dcat:Dataset>
+
+    </rdf:RDF>
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-ttl.rst
new file mode 100644
index 00000000..777319de
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/dataset-conforms-to-ttl.rst
@@ -0,0 +1,12 @@
+.. code-block:: Turtle
+    :emphasize-lines: 6,7,8,9,10
+
+    @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+    @prefix dcat: <http://www.w3.org/ns/dcat#> .
+    @prefix dct: <http://purl.org/dc/terms/> .
+    
+    <https://fr.ch/strassenverkehr>
+        a dcat:Dataset ;
+        dct:conformsTo <http://models.geo.admin.ch/ASTRA> .
+
+
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst
new file mode 100644
index 00000000..e4772c9b
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-rdf.rst
@@ -0,0 +1,15 @@
+.. code-block:: xml
+    :emphasize-lines: 8,9
+
+    <?xml version="1.0" encoding="utf-8" ?>
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+             xmlns:dcat="http://www.w3.org/ns/dcat#"
+             xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+             xmlns:foaf="http://xmlns.com/foaf/0.1/">
+
+      <dcat:Dataset rdf:about="https://bag/covid-19">
+        <foaf:Document rdf:about="https://www.covid19.admin.ch/api/data/documentation"/>
+        <foaf:Document rdf:about="https://de.wikipedia.org/wiki/Datenmanagement"/>    
+      </dcat:Dataset>
+
+    </rdf:RDF>
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-ttl.rst
new file mode 100644
index 00000000..e46e9367
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/dataset-documentation-ttl.rst
@@ -0,0 +1,15 @@
+.. code-block:: Turtle
+    :emphasize-lines: 6,7,8,9,10
+
+    @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+    @prefix dcat: <http://www.w3.org/ns/dcat#> .
+    @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+    
+    <https://bag/covid-19> a dcat:Dataset ;
+	      foaf:Document [
+		        rdf:about "https://www.covid19.admin.ch/api/data/documentation" ;
+	      ], [
+		        rdf:about "https://de.wikipedia.org/wiki/Datenmanagement" ;
+	      ] .
+
+
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-rdf.rst
new file mode 100644
index 00000000..8fcd6b3b
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-rdf.rst
@@ -0,0 +1,17 @@
+.. code-block:: xml
+    :caption: A ``dcat:Dataset`` with a ``dcat:qualifiedRelation`` in RDF
+    :emphasize-lines:  7,8,9,10,11
+
+    <?xml version="1.0" encoding="utf-8"?>
+    <rdf:RDF  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	      xmlns:dcat="http://www.w3.org/ns/dcat#"
+	      xmlns:dct="http://purl.org/dc/terms/">
+
+      <dcat:Dataset rdf:about="https://example-dataset-stadt-zurich">
+         <dcat:qualifiedRelation>
+            <dcat:Relationship>
+               <dct:relation rdf:resource="https://opendata.swiss/perma/adb280a9-381d-4fb3-ae43-b40ace826dc7@stadt-zurich"/>
+            </dcat:Relationship>
+         </dcat:qualifiedRelation>
+      </dcat:Dataset>
+    </rdf:RDF>
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-ttl.rst
new file mode 100644
index 00000000..4b8b7fa2
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/dataset-qualified-relation-ttl.rst
@@ -0,0 +1,13 @@
+.. code-block:: Turtle
+    :caption: A ``dcat:Dataset`` with a ``rdfs:seeAlso`` in Turtle
+    :emphasize-lines:  6,7,8
+
+    @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+    @prefix dcat: <http://www.w3.org/ns/dcat#> .
+    @prefix dcterms: <http://purl.org/dc/terms/> .
+
+    <https://example-dataset-stadt-zurich> a dcat:Dataset ;
+	    dcat:qualifiedRelation [
+		     rdf:type dcat:Relationship ;
+		     dcterms:relation <https://opendata.swiss/perma/adb280a9-381d-4fb3-ae43-b40ace826dc7@stadt-zurich> ;
+	    ] .
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-theme-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-theme-rdf.rst
index 3e425950..8b6f7c5d 100644
--- a/source/content/glossar/bibliothek/dcat-examples/dataset-theme-rdf.rst
+++ b/source/content/glossar/bibliothek/dcat-examples/dataset-theme-rdf.rst
@@ -1,5 +1,5 @@
 .. code-block:: xml
-    :caption: The categories are selected from a Swiss controlled vocabulary
+    :caption: The categories are selected from the EU theme vocabulary
     :emphasize-lines: 6,7
 
     <?xml version="1.0" encoding="utf-8" ?>
@@ -7,8 +7,8 @@
              xmlns:dcat="http://www.w3.org/ns/dcat#">
 
       <dcat:Dataset rdf:about="https://swisstopo/123">
-        <dcat:theme rdf:resource="http://opendata.swiss/themes/population"/>
-        <dcat:theme rdf:resource="http://opendata.swiss/themes/territory"/>
+        <dcat:theme rdf:resource="http://publications.europa.eu/resource/authority/data-theme/REGI"/>
+        <dcat:theme rdf:resource="http://publications.europa.eu/resource/authority/data-theme/ENVI"/>
       </dcat:Dataset>
 
     </rdf:RDF>
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-theme-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/dataset-theme-ttl.rst
index fac9d2f5..a6c22209 100644
--- a/source/content/glossar/bibliothek/dcat-examples/dataset-theme-ttl.rst
+++ b/source/content/glossar/bibliothek/dcat-examples/dataset-theme-ttl.rst
@@ -1,5 +1,5 @@
 .. code-block:: Turtle
-    :caption: The categories are selected from a Swiss controlled vocabulary
+    :caption: The categories are selected from the EU theme vocabulary
     :emphasize-lines: 6,7
 
     @prefix dcat: <http://www.w3.org/ns/dcat#> .
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-see-also-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-see-also-rdf.rst
similarity index 100%
rename from source/content/glossar/bibliothek/dcat-examples/dataset-see-also-rdf.rst
rename to source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-see-also-rdf.rst
diff --git a/source/content/glossar/bibliothek/dcat-examples/dataset-see-also-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-see-also-ttl.rst
similarity index 100%
rename from source/content/glossar/bibliothek/dcat-examples/dataset-see-also-ttl.rst
rename to source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-see-also-ttl.rst
diff --git a/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-rdf.rst
new file mode 100644
index 00000000..3e425950
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-rdf.rst
@@ -0,0 +1,14 @@
+.. code-block:: xml
+    :caption: The categories are selected from a Swiss controlled vocabulary
+    :emphasize-lines: 6,7
+
+    <?xml version="1.0" encoding="utf-8" ?>
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+             xmlns:dcat="http://www.w3.org/ns/dcat#">
+
+      <dcat:Dataset rdf:about="https://swisstopo/123">
+        <dcat:theme rdf:resource="http://opendata.swiss/themes/population"/>
+        <dcat:theme rdf:resource="http://opendata.swiss/themes/territory"/>
+      </dcat:Dataset>
+
+    </rdf:RDF>
diff --git a/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-ttl.rst
new file mode 100644
index 00000000..591912a8
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/deprecated/dataset-theme-ttl.rst
@@ -0,0 +1,11 @@
+.. code-block:: Turtle
+    :caption: The categories are selected from a Swiss controlled vocabulary
+    :emphasize-lines: 6,7
+
+    @prefix dcat: <http://www.w3.org/ns/dcat#> .
+    @prefix dct: <http://purl.org/dc/terms/> .
+
+    <https://swisstopo/123>
+      a dcat:Dataset ;
+      dcat:theme <http://opendata.swiss/themes/population> ;
+                 <http://opendata.swiss/themes/territory> .
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-access-url-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-access-url-ttl.rst
index 1a8d4874..3d1a8cfc 100644
--- a/source/content/glossar/bibliothek/dcat-examples/distribution-access-url-ttl.rst
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-access-url-ttl.rst
@@ -4,7 +4,6 @@
 
     @prefix dcat: <http://www.w3.org/ns/dcat#> .
     @prefix dct: <http://purl.org/dc/terms/> .
-    @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
     <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg>
        a dcat:Distribution ;
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-rdf.rst
new file mode 100644
index 00000000..e879d0df
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-rdf.rst
@@ -0,0 +1,14 @@
+.. code-block:: xml
+    :emphasize-lines: 8,9
+
+    <?xml version="1.0" encoding="utf-8" ?>
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+             xmlns:dcat="http://www.w3.org/ns/dcat#"
+             xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+             xmlns:foaf="http://xmlns.com/foaf/0.1/">
+
+      <dcat:Distribution rdf:about="https://bag/covid-19">
+        <foaf:Document rdf:about="https://www.covid19.admin.ch/api/data/documentation#data-context-api"/>    
+      </dcat:Distribution>
+
+    </rdf:RDF>
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-ttl.rst
new file mode 100644
index 00000000..cb1e9667
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-documentation-ttl.rst
@@ -0,0 +1,13 @@
+.. code-block:: Turtle
+    :emphasize-lines: 6,7,8,9,10
+
+    @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+    @prefix dcat: <http://www.w3.org/ns/dcat#> .
+    @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+    
+    <https://bag/covid-19> a dcat:Distribution ;
+	      foaf:Document [
+		        rdf:about "https://www.covid19.admin.ch/api/data/documentation#data-context-api" 
+	      ] .
+
+
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-download-url-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-download-url-ttl.rst
index 843c2266..a42eb27a 100644
--- a/source/content/glossar/bibliothek/dcat-examples/distribution-download-url-ttl.rst
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-download-url-ttl.rst
@@ -4,7 +4,6 @@
 
     @prefix dcat: <http://www.w3.org/ns/dcat#> .
     @prefix dct: <http://purl.org/dc/terms/> .
-    @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
     <https://swisstopo/123>
       a dcat:Distribution ;
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-format-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-format-rdf.rst
index 7a3d496f..4c8ae43d 100644
--- a/source/content/glossar/bibliothek/dcat-examples/distribution-format-rdf.rst
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-format-rdf.rst
@@ -7,9 +7,9 @@
              xmlns:dcat="http://www.w3.org/ns/dcat#"
              xmlns:dc="http://purl.org/dc/terms/">
 
-      <dcat:Distribution rdf:about="http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg">
-        <dcat:accessURL rdf:resource="http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg"/>
-        <dct:format rdf:resource="https://www.iana.org/assignments/media-types/img/jpeg"/>
+      <dcat:Distribution rdf:about=""https://data.tg.ch/api/v2/catalog/datasets/sk-stat-47/exports/csv"">
+        <dcat:accessURL rdf:resource=""https://data.tg.ch/api/v2/catalog/datasets/sk-stat-47/exports/csv""/>
+        <dct:format rdf:resource="http://publications.europa.eu/resource/authority/file-type/CSV"/>
       </dcat:Distribution>
 
     </rdf:RDF>
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-format-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-format-ttl.rst
index 0754ef45..b8a01c14 100644
--- a/source/content/glossar/bibliothek/dcat-examples/distribution-format-ttl.rst
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-format-ttl.rst
@@ -6,7 +6,7 @@
     @prefix dct: <http://purl.org/dc/terms/> .
     @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-    <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg>
+    <https://data.tg.ch/api/v2/catalog/datasets/sk-stat-47/exports/csv>
        a dcat:Distribution ;
-       dcat:accessURL <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg> ;
-       dct:format  <https://www.iana.org/assignments/media-types/img/jpeg> .
+       dcat:accessURL <https://data.tg.ch/api/v2/catalog/datasets/sk-stat-47/exports/csv> ;
+       dct:format  <http://publications.europa.eu/resource/authority/file-type/CSV> .
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst
new file mode 100644
index 00000000..ec647845
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-license-rdf.rst
@@ -0,0 +1,17 @@
+.. code-block:: xml
+    :caption: the license statement comes from a controlled vocabulary
+    :emphasize-lines: 8,9,10
+
+    <?xml version="1.0" encoding="utf-8" ?>
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+             xmlns:dcat="http://www.w3.org/ns/dcat#"
+             xmlns:dct="http://purl.org/dc/terms/">
+
+      <dcat:Distribution rdf:about="http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg">
+        <dcat:accessURL rdf:resource="http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg"/>
+        <dct:license rdf:about="http://dcat-ap.ch/vocabulary/licenses/terms_by">
+          <rdf:type rdf:resource="http://purl.org/dc/terms/RightsStatement"/>
+        </dct:license>
+      </dcat:Distribution>
+
+    </rdf:RDF>
\ No newline at end of file
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst
new file mode 100644
index 00000000..1075e470
--- /dev/null
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-license-ttl.rst
@@ -0,0 +1,15 @@
+.. code-block:: Turtle
+    :caption: the license statement comes from a controlled vocabulary
+    :emphasize-lines: 7,8,9,10
+
+    @prefix dcat: <http://www.w3.org/ns/dcat#> .
+    @prefix dct: <http://purl.org/dc/terms/> .
+
+    <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg>
+       a dcat:Distribution ;
+       dcat:accessURL <http://stratigraphy.org/ICSchart/ChronostratChart2017-02.jpg> ;
+       dct:license [
+		rdf:type dct:LicenseDocument ;
+		rdf:about <http://dcat-ap.ch/vocabulary/licenses/terms_by> ;
+		rdf:resource <http://purl.org/dc/terms/RightsStatement> ;
+	] .
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst
index a788d51b..97fb3f49 100644
--- a/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-media-type-ttl.rst
@@ -1,10 +1,9 @@
 .. code-block:: Turtle
     :caption: The mediaType is used to specify the file format of a download url
-    :emphasize-lines: 8
+    :emphasize-lines: 7
 
     @prefix dcat: <http://www.w3.org/ns/dcat#> .
     @prefix dct: <http://purl.org/dc/terms/> .
-    @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
     <https://swisstopo/123>
       a dcat:Distribution ;
diff --git a/source/content/glossar/bibliothek/dcat-examples/distribution-modified-rdf.rst b/source/content/glossar/bibliothek/dcat-examples/distribution-modified-rdf.rst
index 272a7993..01429d16 100644
--- a/source/content/glossar/bibliothek/dcat-examples/distribution-modified-rdf.rst
+++ b/source/content/glossar/bibliothek/dcat-examples/distribution-modified-rdf.rst
@@ -5,7 +5,7 @@
     <?xml version="1.0" encoding="utf-8" ?>
     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
              xmlns:dcat="http://www.w3.org/ns/dcat#"
-             xmlns:dc="http://purl.org/dc/terms/">
+             xmlns:dct="http://purl.org/dc/terms/">
 
       <dcat:Distribution rdf:about="https://swisstopo/123">
         <dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2013-04-26T01:00:00Z</dct:modified>