diff --git a/datasets.py b/datasets.py
index 9a805695a..cfa70de36 100644
--- a/datasets.py
+++ b/datasets.py
@@ -191,6 +191,12 @@ def enumterms():
 
     return "/term/enum/", "2018-05-29T12:36:01.337Z", graph
 
+@compiler.dataset
+def a11yenumterms():
+    graph = Graph().parse(str(compiler.path('source/a11y-enums.ttl')), format='turtle')
+
+    return "/term/enum/a11y/", "2018-05-29T12:36:01.337Z", graph
+
 @compiler.dataset
 def musnotationterms():
     graph = Graph().parse(str(compiler.path('source/musicnotation.ttl')), format='turtle')
diff --git a/source/a11y-enums.ttl b/source/a11y-enums.ttl
new file mode 100644
index 000000000..096e05a7d
--- /dev/null
+++ b/source/a11y-enums.ttl
@@ -0,0 +1,167 @@
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix sdo: <http://schema.org/> .
+@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
+@prefix : <https://id.kb.se/vocab/> .
+@base <https://id.kb.se/term/enum/a11y/> .
+
+# accessMode
+
+<accessMode/auditory> a :AccessModeType ;
+    skos:notation "auditory" .
+
+<accessMode/tactile> a :AccessModeType ;
+    skos:notation "tactile" .
+
+<accessMode/textual> a :AccessModeType ;
+    skos:notation "textual" .
+
+<accessMode/visual> a :AccessModeType ;
+    skos:notation "visual" .
+
+<accessMode/colorDependent> a :AccessModeType ;
+    skos:notation "colorDependent" .
+
+<accessMode/chartOnVisual> a :AccessModeType ;
+    skos:notation "chartOnVisual" .
+
+<accessMode/chemOnVisual> a :AccessModeType ;
+    skos:notation "chemOnVisual" .
+
+<accessMode/diagramOnVisual> a :AccessModeType ;
+    skos:notation "diagramOnVisual" .
+
+<accessMode/mathOnVisual> a :AccessModeType ;
+    skos:notation "mathOnVisual" .
+
+<accessMode/musicOnVisual> a :AccessModeType ;
+    skos:notation "musicOnVisual" .
+
+<accessMode/textOnVisual> a :AccessModeType ;
+    skos:notation "textOnVisual" .
+
+
+# accessibilityHazard
+
+<accessibilityHazard/flashing> a :AccessibilityHazardType ;
+    skos:notation "flashing" .
+
+<accessibilityHazard/noFlashingHazard> a :AccessibilityHazardType ;
+    skos:notation "noFlashingHazard" .
+
+<accessibilityHazard/motionSimulation> a :AccessibilityHazardType ;
+    skos:notation "motionSimulation" .
+
+<accessibilityHazard/noMotionSimulationHazard> a :AccessibilityHazardType ;
+    skos:notation "noMotionSimulationHazard" .
+
+<accessibilityHazard/noMotionSimulationHazard> a :AccessibilityHazardType ;
+    skos:notation "noMotionSimulationHazard" .
+
+<accessibilityHazard/sound> a :AccessibilityHazardType ;
+    skos:notation "sound" .
+
+<accessibilityHazard/noSoundHazard> a :AccessibilityHazardType ;
+    skos:notation "noSoundHazard" .
+
+<accessibilityHazard/unknown> a :AccessibilityHazardType ;
+    skos:notation "unknown" .
+
+<accessibilityHazard/none> a :AccessibilityHazardType ;
+    skos:notation "none" .
+
+
+# accessibilityFeature
+
+<accessibilityFeature/alternativeText> a :AccessFeatureType ;
+    skos:notation "alternativeText" .
+
+<accessibilityFeature/annotations> a :AccessFeatureType ;
+    skos:notation "annotations" .
+
+<accessibilityFeature/audioDescription> a :AccessFeatureType ;
+    skos:notation "audioDescription" .
+
+<accessibilityFeature/bookmarks> a :AccessFeatureType ;
+    skos:notation "bookmarks" .
+
+<accessibilityFeature/braille> a :AccessFeatureType ;
+    skos:notation "braille" .
+
+<accessibilityFeature/captions> a :AccessFeatureType ;
+    skos:notation "captions" .
+
+<accessibilityFeature/ChemML> a :AccessFeatureType ;
+    skos:notation "ChemML" .
+
+<accessibilityFeature/describedMath> a :AccessFeatureType ;
+    skos:notation "describedMath" .
+
+<accessibilityFeature/displayTransformability> a :AccessFeatureType ;
+    skos:notation "displayTransformability" .
+
+<accessibilityFeature/highContrastAudio> a :AccessFeatureType ;
+    skos:notation "highContrastAudio" .
+
+<accessibilityFeature/highContrastDisplay> a :AccessFeatureType ;
+    skos:notation "highContrastDisplay" .
+
+<accessibilityFeature/index> a :AccessFeatureType ;
+    skos:notation "index" .
+
+<accessibilityFeature/largePrint> a :AccessFeatureType ;
+    skos:notation "largePrint" .
+
+<accessibilityFeature/latex> a :AccessFeatureType ;
+    skos:notation "latex" .
+
+<accessibilityFeature/longDescription> a :AccessFeatureType ;
+    skos:notation "longDescription" .
+
+<accessibilityFeature/MathML> a :AccessFeatureType ;
+    skos:notation "MathML" .
+
+<accessibilityFeature/none> a :AccessFeatureType ;
+    skos:notation "none" .
+
+<accessibilityFeature/printPageNumbers> a :AccessFeatureType ;
+    skos:notation "printPageNumbers" .
+
+<accessibilityFeature/readingOrder> a :AccessFeatureType ;
+    skos:notation "readingOrder" .
+
+<accessibilityFeature/rubyAnnotations> a :AccessFeatureType ;
+    skos:notation "rubyAnnotations" .
+
+<accessibilityFeature/signLanguage> a :AccessFeatureType ;
+    skos:notation "signLanguage" .
+
+<accessibilityFeature/structuralNavigation> a :AccessFeatureType ;
+    skos:notation "structuralNavigation" .
+
+<accessibilityFeature/synchronizedAudioText> a :AccessFeatureType ;
+    skos:notation "synchronizedAudioText" .
+
+<accessibilityFeature/tableOfContents> a :AccessFeatureType ;
+    skos:notation "tableOfContents" .
+
+<accessibilityFeature/taggedPDF> a :AccessFeatureType ;
+    skos:notation "taggedPDF" .
+
+<accessibilityFeature/tactileGraphic> a :AccessFeatureType ;
+    skos:notation "tactileGraphic" .
+
+<accessibilityFeature/tactileObject> a :AccessFeatureType ;
+    skos:notation "tactileObject" .
+
+<accessibilityFeature/timingControl> a :AccessFeatureType ;
+    skos:notation "timingControl" .
+
+<accessibilityFeature/transcript> a :AccessFeatureType ;
+    skos:notation "transcript" .
+
+<accessibilityFeature/ttsMarkup> a :AccessFeatureType ;
+    skos:notation "ttsMarkup" .
+
+<accessibilityFeature/unlocked> a :AccessFeatureType ;
+    skos:notation "unlocked" .
diff --git a/source/vocab/accessibility.ttl b/source/vocab/accessibility.ttl
index 0b410305d..102887979 100644
--- a/source/vocab/accessibility.ttl
+++ b/source/vocab/accessibility.ttl
@@ -55,57 +55,49 @@
 #     owl:equivalentProperty sdo:accessibilityControl .
 
 :accessibilityFeature a owl:ObjectProperty ;
-    :category :pending ;
-    sdo:rangeIncludes :AccessibilityFeatureType ;
-    owl:equivalentProperty sdo:accessibilityFeature . # TODO: subClassOf ?
+    :subPropertyOf :contentAccessibility, sdo:accessibilityFeature  ;
+    sdo:rangeIncludes :AccessibilityFeatureType .
 
-:AccessibilityFeatureType a owl:Class ; # TODO: Make a :EnumerationClass ; ?
-    :notation :accessibilityFeature ;
-    :category :pending .
+:AccessibilityFeatureType a owl:Class ;
+    :subClassOf :ContentAccessibility .
 
 :accessibilityHazard a owl:ObjectProperty ;
-    :category :pending ;
-    sdo:rangeIncludes :AccessibilityHazardType ;
-    owl:equivalentProperty sdo:accessibilityHazard . # TODO: subPropertyOf ?
-
-:AccessibilityHazardType a owl:Class ; # TODO: Make a :EnumerationClass ; ?
-    :notation :accessibilityHazard ;
-    :category :pending .
-
-:accessibilitySummary a owl:DatatypeProperty ; # TODO: Connected to bf:contentAccessibility ? Use as base/superProperty ?
-    :category :pending ;
-    owl:equivalentProperty sdo:accessibilitySummary . # TODO: subPropertyOf ?
-
-:accessMode a owl:ObjectProperty ; 
-    :category :pending ;
-    sdo:rangeIncludes :AccessModeType ;
-    owl:equivalentProperty sdo:accessMode . # TODO: subPropertyOf ?
-
-:AccessModeType a owl:Class ; # TODO: Make a :EnumerationClass ; ? # NOTE: exactMatch/closeMatch :MediaType (in RDA-sense) ?
-    :notation :accessMode ;
-    :category :pending .
+    :subPropertyOf :contentAccessibility, sdo:accessibilityHazard ;
+    sdo:rangeIncludes :AccessibilityHazardType .
+
+:AccessibilityHazardType a owl:Class ;
+    :subClassOf :ContentAccessibility .
+
+:accessibilitySummary a owl:DatatypeProperty ;
+    :subPropertyOf :contentAccessibility ;
+    owl:equivalentProperty sdo:accessibilitySummary . 
+
+:accessMode a owl:ObjectProperty ;
+    :subPropertyOf :contentAccessibility, sdo:accessMode  ;
+    sdo:rangeIncludes :AccessModeType .
+
+:AccessModeType a owl:Class ;
+    :subClassOf :ContentAccessibility .
     
 :accessModeSufficient a owl:ObjectProperty ;
-    :category :pending ;
-    sdo:rangeIncludes :AccessModeSufficient ;
-    owl:equivalentProperty sdo:accessModeSufficient . # TODO: subPropertyOf ?
+    :subPropertyOf :contentAccessibility, sdo:accessModeSufficient ;
+    sdo:rangeIncludes :AccessModeSufficient .
 
 :AccessModeSufficient a owl:Class ; # TODO: Qualified list-type of thing? Combination of values from AccessMode. Restrictions?
-    :category :pending .
+    :subClassOf :ContentAccessibility .
 
 ##
 # ADDITIONAL TERMS
 
 :certifiedBy a owl:ObjectProperty ;
-    :category :pending ;
+    rdfs:domain :Resource;
     rdfs:range :Agent ;
     :seeAlso <https://www.w3.org/TR/epub-a11y-11/#certifiedBy> .
 
 :conformsTo a owl:ObjectProperty ;
-    :category :pending ;
+    rdfs:domain :Resource;
     sdo:rangeIncludes :Standard ;
     owl:equivalentProperty dc:conformsTo .
 
 :Standard a owl:Class ;
-    :category :pending ;
     owl:equivalentClass dc:Standard .
diff --git a/source/vocab/details.ttl b/source/vocab/details.ttl
index b6abbca34..46c82231d 100644
--- a/source/vocab/details.ttl
+++ b/source/vocab/details.ttl
@@ -1097,11 +1097,11 @@
     rdfs:label "Anmärkning om medverkan"@sv .
 
 :ContentAccessibility a owl:Class;
-    rdfs:label "Content accessibility information"@en, "Anmärkning om komplement för ökad tillgänglighet"@sv;
+    rdfs:label "Content accessibility information"@en, "Information om innehållets tillgänglighet"@sv;
     owl:equivalentClass bf2:ContentAccessibility .
 
 :contentAccessibility a owl:ObjectProperty;
-    rdfs:label "Content accessibility information"@en, "Anmärkning om komplement för ökad tillgänglighet"@sv;
+    rdfs:label "Content accessibility information"@en, "Information om innehållets tillgänglighet"@sv;
     rdfs:range :ContentAccessibility;
     owl:equivalentProperty bf2:contentAccessibility .
 
diff --git a/source/vocab/display.jsonld b/source/vocab/display.jsonld
index f61bd3f93..9e773a9af 100644
--- a/source/vocab/display.jsonld
+++ b/source/vocab/display.jsonld
@@ -97,7 +97,7 @@
           "@id": "AccessModeType-chips",
           "@type": "fresnel:Lens",
           "classLensDomain": "AccessModeType",
-          "showProperties": [ "code" ]
+          "showProperties": [ "notation" ]
         },
         "Record": {
           "@id": "Record-chips",
@@ -436,6 +436,7 @@
             "intendedAudience",
             "associatedMedia",
             "usageAndAccessPolicy",
+            "contentAccessibility",
             "accessMode",
             "relatedTo",
             {"inverseOf": "itemOf"},
@@ -608,6 +609,7 @@
           "@id": "AccessModeType-cards",
           "@type": "fresnel:Lens",
           "classLensDomain": "AccessModeType",
+          "fresnel:extends": {"@id": "AccessModeType-chips"},
           "showProperties": [ "fresnel:super", "label" ]
         },
         "Publication": {