diff --git a/themes/wilma/templates/individual-openSocial.ftl b/productMods/templates/freemarker/body/individual/individual-openSocial.ftl
similarity index 100%
rename from themes/wilma/templates/individual-openSocial.ftl
rename to productMods/templates/freemarker/body/individual/individual-openSocial.ftl
diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index 49bdfced..47f25725 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -725,6 +725,20 @@ local:eventLocationConfig a :ObjectPropertyDisplayConfig ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> .
 
+local:hasRoomContext a :ConfigContext ;
+    :hasConfiguration local:hasRoomConfig ;
+    :configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
+    :qualifiedByDomain      vivo:Building ;
+    :qualifiedBy      vivo:Room .
+
+local:hasRoomConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+    :displayName "has room" ;
+    vitro:displayRankAnnot 2;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
+
 local:courseOfferedByContext a :ConfigContext ;
     :hasConfiguration local:courseOfferedByConfig ;
     :configContextFor vivo:offeredBy ;
@@ -768,7 +782,7 @@ local:collegeOffersDegreeConfig a :ObjectPropertyDisplayConfig ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
 
 local:deptOffersDegreeContext a :ConfigContext ;
-    :hasConfiguration local:debtOffersDegreeConfig ;
+    :hasConfiguration local:deptOffersDegreeConfig ;
     :configContextFor vivo:offers ;
     :qualifiedByDomain      vivo:AcademicDepartment ;
     :qualifiedBy      vivo:AcademicDegree .
@@ -795,6 +809,21 @@ local:uniOffersDegreeConfig a :ObjectPropertyDisplayConfig ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
 
+local:labOffersServiceContext a :ConfigContext ;
+    :hasConfiguration local:labOffersServiceConfig ;
+    :configContextFor vivo:offers ;
+    :qualifiedByDomain      vivo:Laboratory ;
+    :qualifiedBy      <http://purl.obolibrary.org/obo/ERO_0000005> .
+
+local:labOffersServiceConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+    :displayName "offers service" ;
+    vitro:displayRankAnnot 2;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
+
 local:grantAwardedByContext a :ConfigContext ;
     :hasConfiguration local:grantAwardedByConfig ;
     :configContextFor vivo:assignedBy ;
diff --git a/rdf/display/everytime/vivoSearchProhibited.n3 b/rdf/display/everytime/vivoSearchProhibited.n3
index 17985305..8e7b7063 100644
--- a/rdf/display/everytime/vivoSearchProhibited.n3
+++ b/rdf/display/everytime/vivoSearchProhibited.n3
@@ -27,7 +27,7 @@
     vitroDisplay:excludeClass core:DateTimeValuePrecision ;
 	vitroDisplay:excludeClass core:DateTimeInterval ;
 	vitroDisplay:excludeClass core:AcademicDegree ;
-	vitroDisplay:excludeClass core:URLLink ;
+	vitroDisplay:excludeClass vcard:URL ;
 	vitroDisplay:excludeClass vcard:Communication ;
 	vitroDisplay:excludeClass vcard:Code ;
 	vitroDisplay:excludeClass vcard:Explanatory ;
diff --git a/rdf/tbox/filegraph/classes-additional.owl b/rdf/tbox/filegraph/classes-additional.owl
index ebe04e37..8bc74eed 100644
--- a/rdf/tbox/filegraph/classes-additional.owl
+++ b/rdf/tbox/filegraph/classes-additional.owl
@@ -559,27 +559,6 @@
     
 
 
-    <!-- http://vivoweb.org/ontology/core#AcademicDepartment -->
-
-    <owl:Class rdf:about="http://vivoweb.org/ontology/core#AcademicDepartment">
-
-        <rdfs:subClassOf>
-            <owl:Restriction>
-                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#offers"/>
-                <owl:someValuesFrom rdf:resource="http://vivoweb.org/ontology/core#AcademicDegree"/>
-            </owl:Restriction>
-        </rdfs:subClassOf>
-        <rdfs:subClassOf>
-            <owl:Restriction>
-                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#offers"/>
-                <owl:someValuesFrom rdf:resource="http://vivoweb.org/ontology/core#Course"/>
-            </owl:Restriction>
-        </rdfs:subClassOf>
-    </owl:Class>
-    
-
-
-
 
     <!-- http://vivoweb.org/ontology/core#AdvisingRelationship -->
 
@@ -687,23 +666,6 @@
     
 
 
-
-    <!-- http://vivoweb.org/ontology/core#College -->
-
-    <owl:Class rdf:about="http://vivoweb.org/ontology/core#College">
-
-        <rdfs:subClassOf>
-            <owl:Restriction>
-                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#offers"/>
-                <owl:someValuesFrom rdf:resource="http://vivoweb.org/ontology/core#AcademicDegree"/>
-            </owl:Restriction>
-        </rdfs:subClassOf>
-    </owl:Class>
-    
-
-
-
-
     <!-- http://vivoweb.org/ontology/core#ConferencePaper -->
 
     <owl:Class rdf:about="http://vivoweb.org/ontology/core#ConferencePaper">
@@ -947,21 +909,6 @@
     </owl:Class>
     
 
-
-    <!-- http://vivoweb.org/ontology/core#Laboratory -->
-
-    <owl:Class rdf:about="http://vivoweb.org/ontology/core#Laboratory">
-
-        <rdfs:subClassOf>
-            <owl:Restriction>
-                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#offers"/>
-                <owl:someValuesFrom rdf:resource="http://purl.obolibrary.org/obo/ERO_0000005"/>
-            </owl:Restriction>
-        </rdfs:subClassOf>
-    </owl:Class>
-    
-
-
     <!-- http://vivoweb.org/ontology/core#Position -->
 
     <owl:Class rdf:about="http://vivoweb.org/ontology/core#Position">
@@ -1040,19 +987,6 @@
     
 
 
-    <!-- http://vivoweb.org/ontology/core#University -->
-
-    <owl:Class rdf:about="http://vivoweb.org/ontology/core#University">
-
-        <rdfs:subClassOf>
-            <owl:Restriction>
-                <owl:onProperty rdf:resource="http://vivoweb.org/ontology/core#offers"/>
-                <owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#AcademicDegree"/>
-            </owl:Restriction>
-        </rdfs:subClassOf>
-    </owl:Class>
-    
-
 
     <!-- http://vivoweb.org/ontology/core#WorkingPaper -->
 
diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
index b41d98c9..d1586c88 100644
--- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3
+++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
@@ -65,13 +65,13 @@ vivo:dateTimeValue
       vitro:displayRankAnnot
               "5"^^xsd:int ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
+              <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGrouptime> ;
       vitro:offerCreateNewOptionAnnot
               "true"^^xsd:boolean ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
+              <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
       vitro:selectFromExistingAnnot
               "false"^^xsd:boolean .
 
@@ -660,6 +660,8 @@ vivo:reproduces
               <http://vivoweb.org/ontology#vitroPropertyGroupbibobscure> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
               <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
+      vitro:offerCreateNewOptionAnnot
+              "true"^^xsd:boolean ;
       vitro:selectFromExistingAnnot
               "true"^^xsd:boolean .
 
@@ -2054,7 +2056,9 @@ bibo:number
               "A generic item or document number. Not to be confused with issue number. A barcode, perhaps?"^^xsd:string .
 
 obo:RO_0001025
-      rdfs:label "located in"@en-US .
+      rdfs:label "located in"@en-US ;
+      vitro:offerCreateNewOptionAnnot
+              "true"^^xsd:boolean .
 
 vivo:Location
       rdfs:label "Location"@en-US ;
@@ -6176,7 +6180,9 @@ obo:ERO_0000789
       rdfs:label "Staff Role"@en-US .
 
 obo:BFO_0000050
-      rdfs:label "part of"@en-US .
+      rdfs:label "part of"@en-US ;
+      vitro:offerCreateNewOptionAnnot
+              "true"^^xsd:boolean .
 
 bibo:Letter
       rdfs:label "Letter"@en-US ;
@@ -6264,7 +6270,9 @@ obo:RO_0002351
       rdfs:label "has member"@en-US .
 
 obo:BFO_0000051
-      rdfs:label "has part"@en-US .
+      rdfs:label "has part"@en-US ;
+      vitro:offerCreateNewOptionAnnot
+              "true"^^xsd:boolean .
 
 obo:ARG_2000008
       rdfs:label "Topic Weight Measurement"@en-US .